Merge branch 'master' of http://192.168.0.115:3000/xiewenjie/fdkk_meta

src/main/resources/application-dev.yml

@@ -38,9 +38,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://120.25.146.52:13306/fdkk_meta?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://120.24.252.95:13306/fdkk_meta?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: JK123456%JIK
+        password: 4dyjkz%
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭