From c2fb4127d2cf264ca6861e7c586186f77f74e9a9 Mon Sep 17 00:00:00 2001
From: kale <seg_yinzy@seginfo.com>
Date: Sat, 3 Jun 2023 06:38:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/config/config.properties   | 26 ++++++++++---------
 .../resources/config/sms.config.properties    |  5 +---
 .../resources/config/weixin.config.properties | 20 +++++++-------
 src/main/resources/log4j.properties           | 22 ++++++++--------
 4 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties
index 56b31ad..1f4f285 100644
--- a/src/main/resources/config/config.properties
+++ b/src/main/resources/config/config.properties
@@ -1,32 +1,34 @@
 #------------------------- jdbc config -------------------------
-jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.driverClassName=com.mysql.cj.jdbc.Driver
 jdbc.maxActive=200
 jdbc.maxWait=500
 jdbc.defaultAutoCommit=true
 
-#\u6D4B\u8BD5 1
-jdbc.url=jdbc:mysql://192.168.3.5:35007/easyiot?characterEncoding=utf8&serverTimezone=Asia/Shanghai
+#测试 1
+jdbc.url=jdbc:mysql://192.168.3.5:35007/easyiot?characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
 
 jdbc.username=easyiot
 
-# \u6D4B\u8BD5 1
+# 测试 1
 jdbc.password=easyiot
 
-#\u8FDE\u63A5\u521D\u59CB\u503C\uFF0C\u8FDE\u63A5\u6C60\u542F\u52A8\u65F6\u521B\u5EFA\u7684\u8FDE\u63A5\u6570\u91CF\u7684\u521D\u59CB\u503C \u9ED8\u8BA4\u503C\u662F0
+#连接初始值，连接池启动时创建的连接数量的初始值 默认值是0
 jdbc.initialSize=10
-#\u6700\u5C0F\u7A7A\u95F2\u503C.\u5F53\u7A7A\u95F2\u7684\u8FDE\u63A5\u6570\u5C11\u4E8E\u9600\u503C\u65F6\uFF0C\u8FDE\u63A5\u6C60\u5C31\u4F1A\u9884\u7533\u8BF7\u53BB\u4E00\u4E9B\u8FDE\u63A5\uFF0C
-#\u4EE5\u514D\u6D2A\u5CF0\u6765\u65F6\u6765\u4E0D\u53CA\u7533\u8BF7 \u9ED8\u8BA4\u503C\u662F0
+
+#最小空闲值.当空闲的连接数少于阀值时，连接池就会预申请去一些连接，以免洪峰来时来不及申请 默认值是0
+
 jdbc.minIdle=5
-#\u6700\u5927\u7A7A\u95F2\u503C.\u5F53\u7ECF\u8FC7\u4E00\u4E2A\u9AD8\u5CF0\u65F6\u95F4\u540E\uFF0C\u8FDE\u63A5\u6C60\u53EF\u4EE5\u6162\u6162\u5C06\u5DF2\u7ECF\u7528\u4E0D\u5230\u7684\u8FDE\u63A5\u6162\u6162\u91CA\u653E\u4E00\u90E8\u5206\uFF0C
-#\u4E00\u76F4\u51CF\u5C11\u5230maxIdle\u4E3A\u6B62 \uFF0C0\u65F6\u65E0\u9650\u5236 \u9ED8\u8BA4\u503C\u662F8
+#最大空闲值.当经过一个高峰时间后，连接池可以慢慢将已经用不到的连接慢慢释放一部分，一直减少到maxIdle为止 ，0时无限制 默认值是8
+
 jdbc.maxIdle=10
-#\u8FDE\u63A5\u6C60\u7684\u6700\u5927\u503C\uFF0C\u540C\u4E00\u65F6\u95F4\u53EF\u4EE5\u4ECE\u6C60\u5206\u914D\u7684\u6700\u591A\u8FDE\u63A5\u6570\u91CF\uFF0C0\u65F6\u65E0\u9650\u5236 \u9ED8\u8BA4\u503C\u662F8 
+
+#连接池的最大值，同一时间可以从池分配的最多连接数量，0时无限制 默认值是8
 jdbc.maxTotal=30
 
-#\u6BCF\u9875\u5BB9\u91CF
+#每页容量
 page.size=10
 
-#\u6A21\u5F0F debug | deploy
+#模式 debug | deploy
 dev.mode=debug
 
 bd.api.geocoder=https://api.map.baidu.com/geocoder
diff --git a/src/main/resources/config/sms.config.properties b/src/main/resources/config/sms.config.properties
index 29fdedd..bfe11a8 100644
--- a/src/main/resources/config/sms.config.properties
+++ b/src/main/resources/config/sms.config.properties
@@ -22,7 +22,4 @@ aliyun.voice.templatecode4=TTS_183760534
 aliyun.validate.code=SMS_204105285
 
 #验证码登录
-aliyun.validate.login.code=SMS_204105285
-
-
-
+aliyun.validate.login.code=SMS_204105285
\ No newline at end of file
diff --git a/src/main/resources/config/weixin.config.properties b/src/main/resources/config/weixin.config.properties
index 431fd64..cf9b85d 100644
--- a/src/main/resources/config/weixin.config.properties
+++ b/src/main/resources/config/weixin.config.properties
@@ -1,32 +1,30 @@
 #------------------------- mp config -------------------------
 
-#mp \u516C\u4F17\u53F7\u914D\u7F6E
+#mp 公众号配置
 weixin.mp.appid=wxcda55f09127119f9
 weixin.mp.secret=f126999b83b902b697aaee8c7128839c
 weixin.mp.token=iotadmin
 weixin.mp.aesKey=71AJPXUTBFje7YctbndixEoNrUfQxyHH56EWoRlY8Cd
 
-#mch \u5546\u6237 \u4FE1\u606F
+#mch 商户 信息
 weixin.mp.mch.id=1523933151
 weixin.mp.mch.key=
 
-#\u8BF7\u6C42URL
+#请求URL
 local.domain=https://iotadmin.segsvip.com
-#
-# local.domain=http://127.0.0.1:8080/lpro
 
-#\u5FAE\u4FE1\u652F\u4ED8\u7ED3\u679C\u901A\u77E5 URI
+#local.domain=http://127.0.0.1:8080/iot_war_exploded
+
+#微信支付结果通知 URI
 weixin.pay.notify_url=/service/pay/wx/notify.xml
 
-#\u5FAE\u4FE1\u7F51\u9875\u6388\u6743\u91CD\u5B9A\u5411url
+#微信网页授权重定向url
 weixin.mp.oauth2.redirect_uri=/service/oauth2/authorize/weixin/mp
 
-#----------------------\u5FAE\u4FE1\u6D88\u606F\u6A21\u677F\u53F7----------------------------
+#----------------------微信消息模板号----------------------------
 weixin.msg.tpl.NOTICE_1=2xuSdxuFrfJidejIEYSVA7nXDC0PYU2bwow0Gm90pnU
 weixin.msg.tpl.NOTICE_2=
 weixin.msg.tpl.NOTICE_3=
 weixin.msg.tpl.NOTICE_4=
 weixin.msg.tpl.NOTICE_5=
-weixin.msg.tpl.NOTICE_6=
-
-
+weixin.msg.tpl.NOTICE_6=
\ No newline at end of file
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index c91cc7c..575eb82 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -14,21 +14,21 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #############################################################################
-log4j.rootLogger=INFO,LOG_FILE
+log4j.rootLogger=INFO,LOG_FILE,CONSOLE
 log4j.additivity.org.apache=true
 
-#spring \u53EA\u6253 INFO \u4FE1\u606F
+#spring 只打 INFO 信息
 log4j.logger.org.springframework=ERROR
 log4j.logger.freemarker.cache=ERROR
-#\u5168\u5C40\u7684\u65E5\u5FD7\u7EA7\u522B(\u6253\u5370sql\u5FC5\u987B\u8981\u8BE5\u5C5E\u6027)
-log4j.appender.Threshold=DEBUG
+#全局的日志级别(打印sql必须要该属性)
+log4j.appender.Threshold=WARN
 
 
 #JDBC config
-log4j.logger.com.mybatis=ERROR
-log4j.logger.com.mybatis.common.jdbc.SimpleDataSource=ERROR 
-log4j.logger.com.mybatis.common.jdbc.ScriptRunner=ERROR 
-log4j.logger.com.mybatis.sqlmap.engine.impl.SqlMapClientDelegate=ERROR
+log4j.logger.com.ibatis=OFF
+log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=ERROR 
+log4j.logger.com.ibatis.common.jdbc.ScriptRunner=ERROR 
+log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=ERROR
 log4j.logger.java.sql=ERROR
 log4j.logger.java.sql.ResultSet=ERROR
 log4j.logger.java.sql.Connection=ERROR
@@ -56,7 +56,7 @@ log4j.appender.LOG_FILE.layout=org.apache.log4j.PatternLayout
 log4j.appender.LOG_FILE.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
 
 
-# SQL\u65E5\u5FD7
+# SQL日志
 log4j.logger.sql=DEBUG,sql
 log4j.appender.sql=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.sql.File=/data/lpro/logs/sql.log
@@ -65,7 +65,7 @@ log4j.appender.sql.layout=org.apache.log4j.PatternLayout
 log4j.appender.sql.layout.ConversionPattern=%d %p [%c %L %l] - %m%n
 log4j.additivity.sql=false
 
-#\u5176\u4ED6\u884C\u4E3A\u7684\u65E5\u5FD7\u6587\u4EF6\uFF0C\u5982\u652F\u4ED8\u8BB0\u5F55\u7B49
+#其他行为的日志文件，如支付记录等
 log4j.logger.other=DEBUG,other
 log4j.appender.other=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.other.File=/data/lpro/logs/other.log
@@ -76,7 +76,7 @@ log4j.additivity.other=false
 
 
 
-#\u5176\u4ED6\u884C\u4E3A\u7684\u65E5\u5FD7\u6587\u4EF6\uFF0C\u5982\u652F\u4ED8\u8BB0\u5F55\u7B49
+#其他行为的日志文件，如支付记录等
 log4j.logger.debug=DEBUG, debug
 log4j.appender.debug=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.debug.File=/data/lpro/logs/debug.log