From 1830f4eb81e4d2a3afd899b5e1855a57f280fce2 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 11 Jan 2024 10:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.properties |  4 +--
 .../resources/application-master.properties   | 36 +++++++++----------
 src/main/resources/application.properties     |  4 +--
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index b25d48d6..6d3e7a79 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -69,9 +69,9 @@ rocketmq.consumer.group2=edu-admin-edit
 rocketmq.consumer.group1=edu-admin-add
 #rocketmq.name-server=10.0.140.141:9876
 #rocketmq.name-server=192.168.0.70:9876
-rocketmq.name-server=192.168.110.184:9876
+rocketmq.name-server=39.101.130.96:9876
 rocketmq.producer.group=libmiddle
-rocketmq.producer.send-message-timeout=3000
+rocketmq.producer.send-message-timeout=300000
 rocketmq.producer.compress-message-body-threshold=4096
 rocketmq.producer.max-message-size=4194304
 rocketmq.producer.retry-times-when-send-failed=3
diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties
index 6d3e7a79..8372a9b8 100644
--- a/src/main/resources/application-master.properties
+++ b/src/main/resources/application-master.properties
@@ -1,13 +1,11 @@
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
-datasource.no1.password=Mysql@zcloud88888
-
-
+datasource.no1.password=Zcloud@888888
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
-datasource.no2.password=Mysql@zcloud88888
+datasource.no2.password=Zcloud@888888
 
 #druid???
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
@@ -52,24 +50,18 @@ spring.http.encoding.enabled=true
 # ??springboot????banner
 spring.main.banner-mode=off
 
+#????????????
 preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
 qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
 
-#preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
-#qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
-#?????
 smb.host=39.101.130.96
 smb.port=22
 smb.user=root
 smb.password=Zcloud@zcloud88888
 smb.basePath=/mnt/wwag/file/
 
-#Mq\u914D\u7F6E
-rocketmq.consumer.group2=edu-admin-edit
-rocketmq.consumer.group1=edu-admin-add
-#rocketmq.name-server=10.0.140.141:9876
-#rocketmq.name-server=192.168.0.70:9876
-rocketmq.name-server=39.101.130.96:9876
+#mq???????????
+rocketmq.name-server=172.16.130.91:9876
 rocketmq.producer.group=libmiddle
 rocketmq.producer.send-message-timeout=300000
 rocketmq.producer.compress-message-body-threshold=4096
@@ -77,24 +69,28 @@ rocketmq.producer.max-message-size=4194304
 rocketmq.producer.retry-times-when-send-failed=3
 rocketmq.producer.retry-next-server=true
 rocketmq.producer.retry-times-when-send-async-failed=3
-## topic \u524D\u7F00
+## topic ????
 
 mq.topic.info=info
 mq.topic.eightWork=eightWork
 mq.group.info=scheduled_tasks
 mq.group.eightWork=scheduled_tasks_eightWork
 
-#????
+# topic ????
 mq.topic.docking=docking
 mq.topic.dockingPicture=dockingPicture
 mq.group.docking=scheduled_tasks_docking
 
+#???? ??????
 perLoc.url=http://172.16.130.86/gateway-service
 perLoc.userName=qaaqadmin
 perLoc.pwd=Cfd2023@
+
+#????? ??????
 corp.default.pic-path=https://qgqy.qhdsafety.com/
 corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
 
-http.file.url=https://qgqy.qhdsafety.com/file/
-#????????????
-baseimgpath =https://wwag.qhdsafety.com/file/
+#??????
+http.file.url=http://172.16.130.91:9004/file/
+#??????
+baseimgpath =http://172.16.130.91:9004/file/
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e819eccf..b385417c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,9 +4,9 @@ server.port=8091
 #??
 #spring.profiles.active=local
 #����31ʱʹ��
-#spring.profiles.active=dev
+spring.profiles.active=dev
 #??
-spring.profiles.active=master
+#spring.profiles.active=master