Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/resources/application-druid.yml

@@ -5,7 +5,7 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             master:
-                url: jdbc:mysql://124.70.58.209:18806/purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://127.0.0.1:3306/purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 123.asd
             # 从库数据源

purchase-admin/src/main/resources/application.yml

@@ -10,4 +10,4 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid,test
+    active: prod