From 7848d39d309056ac1a13d40d99f9108e5f6a0584 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期一, 24 七月 2023 12:03:06 +0800
Subject: [PATCH] file文件-部分

---
 src/main/resources/application-dev.yml |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e1df3f3..ff33d53 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -10,17 +10,17 @@
 spring:
   datasource:
     one:
-      url: jdbc:mysql://192.168.0.52:3306/hazad_investigation?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-      username: root
-      password: gkhymysql
+      url: jdbc:mysql://124.221.143.185:23306/hazad?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      username: hazad
+      password: c26207f1e6
       type: com.alibaba.druid.pool.DruidDataSource
 
   #redis
   redis:
-    database: 0
+    database: 14
     host: 127.0.0.1
     port: 6379
-    password: root
+    password: gkhy@202306
     jedis:
       pool:
         max-idle: 8
@@ -115,3 +115,26 @@
       key:
       url:
 
+rocketmq:
+  name-server: 192.168.30.107:9876
+  producer: 
+    group: gkhy-safeplatform-dev-ZIS
+    sendMessageTimeout: 300000
+  consumers:
+    #group: gkhy-safeplatform-dev-s
+    CreateGroup: gkhy-safeplatform-CreateConsumer-ZIS
+    NoticeGroup: gkhy-safeplatform-NoticeConsumer-ZIS
+    TimeOutGroup: gkhy-safeplatform-TimeOutConsumer-ZIS
+    WaitWorkGroup: gkhy-safeplatform-WaitWorkConsumer-ZIS
+    applySpecialWorkGroup: gkhy-safeplatform-applySpecialWorkConsumer-ZIS
+    approvalSpecialWorkGroup: gkhy-safeplatform-topic-approvalSpecialWorkConsumer-ZIS
+  topic:
+    #demoTopic: gkhy-safeplatform-topic-demo-s
+    preventCreateTaskTopic: gkhy-safeplatform-topic-preventCreateTask-ZIS
+    preventNoticeTaskTopic: gkhy-safeplatform-topic-preventNoticeTask-ZIS
+    preventTimeOutTaskTopic: gkhy-safeplatform-topic-preventTimeOutTask-ZIS
+    preventWaitWorkTopic: gkhy-safeplatform-topic-preventWaitWork-ZIS
+    applySpecialWorkTopic: gkhy-safeplatform-topic-applySpecialWork-ZIS
+    approvalSpecialWorkTopic: gkhy-safeplatform-topic-approvalSpecialWork-ZIS
+=======
+>>>>>>> branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem.git

--
Gitblit v1.9.2