From 809636a250fbc24884cfa81121f5aed2021d0d10 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 9 Apr 2025 10:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BC=96=E7=A0=81=E6=9B=B4?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.properties | 32 +++++++++----------
 .../resources/application-local.properties    | 26 +++++++--------
 .../resources/application-master.properties   | 32 +++++++++----------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 0ba57e9..f10c5af 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -4,24 +4,24 @@ datasource.no1.url=jdbc:mysql://39.100.115.58:33080/integrated_whb?allowPublicKe
 datasource.no1.username=root
 datasource.no1.password=Mysql@zcloud33080
 
-#???2(?????????????)
+#数据源2(默认没用，俩地址写一样即可)
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
 datasource.no2.url=jdbc:mysql://39.100.115.58:33080/integrated_admin?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
 datasource.no2.password=Mysql@zcloud33080
 
-#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
@@ -30,29 +30,29 @@ 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.servlet.encoding.charset=UTF-8
 spring.servlet.encoding.force=true
 spring.servlet.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}
@@ -61,7 +61,7 @@ config.basic.url=http://192.168.0.7:8082/zcouldProperty
 
 customer.id=LAZ-20221129-3
 customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2
-#??
+#开发
 #customer.url=https://api.qhdsafety.com/sync/
 #customer.domain=video.qhdsafety.com
 #spring.redis.host=39.100.115.58
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index c6d0a8f..18c304c 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -4,25 +4,25 @@ datasource.no1.url=jdbc:mysql://192.168.0.25:33082/integrated_whb?allowPublicKey
 datasource.no1.username=root
 datasource.no1.password=123456
 
-#???2(?????????????)
+#数据源2(默认没用，俩地址写一样即可)
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
 datasource.no2.url=jdbc:mysql://192.168.0.25:33082/integrated_admin?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
 datasource.no2.password=123456
 
-#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
@@ -31,25 +31,25 @@ 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
 
-# ??springboot????banner
+# 关闭springboot启动时的banner
 spring.main.banner-mode=off
 
 
 customer.id=LAZ-20221129-3
 customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2
-#??
+#开发
 customer.url=https://api.qhdsafety.com/sync/
 customer.domain=video.qhdsafety.com
diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties
index 1241a73..13d6ef8 100644
--- a/src/main/resources/application-master.properties
+++ b/src/main/resources/application-master.properties
@@ -2,24 +2,24 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
 datasource.no1.url=jdbc:mysql://127.0.0.1:33068/integrated_whb?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=ythlocal
 datasource.no1.password=Mysql@mysql88888
-#???2(?????????????)
+#数据源2(默认没用，俩地址写一样即可)
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
 datasource.no2.url=jdbc:mysql://127.0.0.1:33068/integrated_admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=ythlocal
 datasource.no2.password=Mysql@mysql88888
 
-#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,38 +28,38 @@ 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.servlet.encoding.charset=UTF-8
 spring.servlet.encoding.force=true
 spring.servlet.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}
 #???????
 customer.id=LAZ-20221129-3
 customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2
-#??
+#开发
 customer.url=https://api.qhdsafety.com/sync/
 customer.domain=yth.qhdsafety.com
 #redis