Merge remote-tracking branch 'origin/developer' into developer

src/main/resources/config/beta/application-beta.yml

@@ -3,9 +3,9 @@ spring:
     cache: true  #是否使用缓存
   #数据源连接--start
   datasource:
-    url: jdbc:mysql://10.104.50.235:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://10.104.59.165:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: J5p";~OVazNl%y)?
+    password: 05bZ/OxTB:X+yd%1
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari:

src/main/resources/config/dev/application-dev.yml

@@ -4,7 +4,7 @@ spring:
   #数据源连接--start
   datasource:
     #driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.2.101:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
     password: 05bZ/OxTB:X+yd%1
 #    url: jdbc:mysql://119.29.0.46:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai