Merge branch 'master' of http://git.caimei365.com/caimei_code/caimei365-cloud-config-files

merge

caimei365-cloud-commodity/commodity-beta.yml

@@ -4,9 +4,9 @@ spring:
     # url: jdbc:mysql://172.31.165.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     # username: developer
     # password: J5p3tgOVazNl4ydf
-    url: jdbc:mysql://119.29.164.246:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.31.165.28:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: 05bZ/OxTB:X+yd%1
+    password: J5p3tgOVazNl4ydf
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari:

caimei365-cloud-user/user-beta.yml

@@ -4,9 +4,9 @@ spring:
     # url: jdbc:mysql://172.31.165.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     # username: developer
     # password: J5p3tgOVazNl4ydf
-    url: jdbc:mysql://119.29.164.246:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.31.165.28:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: 05bZ/OxTB:X+yd%1
+    password: J5p3tgOVazNl4ydf
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari: