Merge branch 'master' of hyq/kmall-pt into master

kmall-manager/src/main/resources/conf/db.properties

@@ -1,10 +1,10 @@
-########## 数据库配置 ##########
+########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 
-#========== 开发环境 ==========
+#========== \u5F00\u53D1\u73AF\u5883 ==========
 jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 jdbc.username=tuser
 jdbc.password=Qq!123
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/kmall_pt?serverTimezone=GMT%2B8&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=root
 #jdbc.password=root
 
@@ -16,7 +16,8 @@ jdbc.maxIdleTime=30000
 jdbc.idleConnectionTestPeriod=100
 
 #---------- for hikari
-jdbc.driver=org.mariadb.jdbc.Driver
+jdbc.driver=com.mysql.jdbc.Driver
+#jdbc.driver=org.mariadb.jdbc.Driver
 jdbc.idleTimeout=400000
 jdbc.maxLifetime=500000
 jdbc.connectionTimeout=5000
@@ -25,10 +26,10 @@ jdbc.validationTimeout=4000
 
 
 
-##========== 生产环境 ==========
-#阿里云内网地址
+####========== \u751F\u4EA7\u73AF\u5883 ==========
+##\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
 ####jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-#阿里云外网地址
+##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
 #jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=kmall_pt
 #jdbc.password=AFnwRBu!3q
@@ -47,9 +48,9 @@ jdbc.validationTimeout=4000
 #jdbc.connectionTimeout=5000
 #jdbc.maximumPoolSize=5
 #jdbc.validationTimeout=4000
-
-
-###========== 中网国际数据库开发环境 ==========
+#
+#
+###========== \u4E2D\u7F51\u56FD\u9645\u6570\u636E\u5E93\u5F00\u53D1\u73AF\u5883 ==========
 #jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=tuser
 #jdbc.password=Qq!123
@@ -70,8 +71,8 @@ jdbc.validationTimeout=4000
 #jdbc.validationTimeout=4000
 
 
-###========== 中网国际数据库生产环境 ==========
-##阿里云外网地址
+###========== \u4E2D\u7F51\u56FD\u9645\u6570\u636E\u5E93\u751F\u4EA7\u73AF\u5883 ==========
+##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
 #jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=kmall_pt
 #jdbc.password=AFnwRBu!3q
@@ -89,4 +90,4 @@ jdbc.validationTimeout=4000
 #jdbc.maxLifetime=500000
 #jdbc.connectionTimeout=5000
 #jdbc.maximumPoolSize=5
-#jdbc.validationTimeout=4000
+#jdbc.validationTimeout=4000