From f5f28631950152ec619f00c5bb9875126b7719b6 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Mon, 18 Dec 2023 10:43:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A7=E5=B7=9E=E7=9F=BF=E7=9F=B3=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.properties | 54 +++++--------------
 .../resources/application-master.properties   | 41 +++++++-------
 2 files changed, 34 insertions(+), 61 deletions(-)

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index c66f8fd1..fccbbe4d 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -8,19 +8,14 @@ datasource.no2.username=root
 datasource.no2.password=Mysql@zcloud88888
 
 
-#druid???
+
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
-#?????
+
 spring.datasource.maxActive: 20
-#?????
 spring.datasource.initialSize: 1
-#??????????
 spring.datasource.maxWait: 60000
-#??PSCache?????????PSCache???
 spring.datasource.poolPreparedStatements: true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
-#??connectionProperties?????mergeSql????SQL??
-#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 spring.datasource.minIdle: 1
 spring.datasource.timeBetweenEvictionRunsMillis: 60000
 spring.datasource.minEvictableIdleTimeMillis: 300000
@@ -28,36 +23,18 @@ spring.datasource.validationQuery: select 1 from dual
 spring.datasource.testWhileIdle: true
 spring.datasource.testOnBorrow: false
 spring.datasource.testOnReturn: false
-#?????????filters????????sql?????,'wall'?????
 filters: stat, wall, log4j
 
-#????????
 spring.cache.ehcache.cofnig=ehcache.xml
-
-#?????,?????sql??
 logging.level.com.zcloud.mapper=debug
-
-#????????
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
-
-#activiti????
 spring.activiti.check-process-definitions=false
 
-#??
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.force=true
 spring.http.encoding.enabled=true
-# ??springboot????banner
 spring.main.banner-mode=off
-#jar????????
-#web.upload-path=h:/
-#web.front-path=h:/
-#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
-
-#preventionxgf.api.url=http://192.168.0.79:8088
-#
-#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
 
 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/
@@ -68,20 +45,16 @@ smb.user=root
 smb.password=Zcloud@zcloud88888
 smb.basePath=/mnt/qgfile/file/
 
-# 沧州矿石用户标识
+#????????
 czks-useridentity=CZKS
 czks-baseimgpath=https://qgqy.qhdsafety.com/file/
 czks-backendaddr=http://192.168.0.31:7811/qa-prevention-gwj/
-# 港务局用户标识
+#???????
 gwj-useridentity=GWJ
 gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
 gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/
 
-#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
+#mq ???????????
 rocketmq.name-server=192.168.0.31:9876
 rocketmq.producer.group=libmiddle
 rocketmq.producer.send-message-timeout=3000
@@ -90,19 +63,18 @@ 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
+## ????
 mq.topic.info=info
 mq.topic.eightWork=eightWork
 mq.group.info=scheduled_tasks
 mq.group.eightWork=scheduled_tasks_eightWork
-#对接人员定位
-perLoc.url=http://192.168.210.32:8084
-perLoc.userName=qaaqadmin
-perLoc.pwd=Cfd2023@
-#数据同步
+
+#????
 mq.topic.docking=docking
 mq.group.docking=scheduled_tasks_docking
 
-base.info.USER_IDENTITY=GWJ
-base.info.baseImgPath=https://qgqy.qhdsafety.com/file/
-base.info.BACKENDADDR=http://192.168.0.31:8992/qa-regulatory-gwj/
+#??????
+perLoc.url=http://192.168.210.32:8084
+perLoc.userName=qaaqadmin
+perLoc.pwd=Cfd2023@
+
diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties
index 931a7e2f..751f7dc0 100644
--- a/src/main/resources/application-master.properties
+++ b/src/main/resources/application-master.properties
@@ -1,4 +1,4 @@
-# ??????
+#???
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
 datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
@@ -8,18 +8,18 @@ datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTi
 datasource.no2.username=root
 datasource.no2.password=gwjsjkzcloud888888
 
-#druid连接池
+#druid???
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
-#最大活跃数
+#?????
 spring.datasource.maxActive: 20
-#初始化数量
+#?????
 spring.datasource.initialSize: 1
-#最大连接等待超时时间
+#??????????
 spring.datasource.maxWait: 60000
-#打开PSCache，并且指定每个连接PSCache的大小
+#??PSCache?????????PSCache???
 spring.datasource.poolPreparedStatements: true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
-#通过connectionProperties属性来打开mergeSql功能；慢SQL记录
+#??connectionProperties?????mergeSql????SQL??
 #connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 spring.datasource.minIdle: 1
 spring.datasource.timeBetweenEvictionRunsMillis: 60000
@@ -28,34 +28,35 @@ spring.datasource.validationQuery: select 1 from dual
 spring.datasource.testWhileIdle: true
 spring.datasource.testOnBorrow: false
 spring.datasource.testOnReturn: false
-#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
+#?????????filters????????sql?????,'wall'?????
 filters: stat, wall, log4j
 
-#缓存配置文件位置
+#????????
 spring.cache.ehcache.cofnig=ehcache.xml
 
-#配置这句话,控制台输出sql语句
+#?????,?????sql??
 logging.level.com.zcloud.mapper=debug
 
-#上传文件大小限制
+#????????
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 
-#activiti模型检测
+#activiti????
 spring.activiti.check-process-definitions=false
 
-#字符
+#??
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.force=true
 spring.http.encoding.enabled=true
-# 关闭springboot启动时的banner
+# ??springboot????banner
 spring.main.banner-mode=off
-#jar包部署时去掉注释
+#jar????????
 #web.upload-path=h:/
 #web.front-path=h:/
 #spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
-
+#???
 preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/
+#???
 qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/
 
 #?????
@@ -65,19 +66,19 @@ smb.user=root
 smb.password=SJSKAQHBGLXT@20220311
 smb.basePath=/mnt/qask/file/
 
-# 沧州矿石用户标识
+# ????????
 czks-useridentity=CZKS
 czks-baseimgpath=https://qgqy.qhdsafety.com/file/
 czks-backendaddr=http://192.168.0.31:7811/qa-regulatory-czks/
-# 港务局用户标识
+# ???????
 gwj-useridentity=GWJ
 gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
 gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/
-#对接人员定位
+#??????
 perLoc.url=http://192.168.210.32:8084
 perLoc.userName=qaaqadmin
 perLoc.pwd=Cfd2023@
-#数据同步
+#????
 mq.topic.docking=docking
 mq.group.docking=scheduled_tasks_docking