当前分支代码合并到主干

dsk-admin/src/main/resources/application-pre.yml

@@ -56,9 +56,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://47.104.91.229:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.0.79:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: dev
-        password: zfTFIJjaN#6xB83r
+        password: 8AXjjCHZ666!
       # 从库数据源
       #            slave:
       #                # 从数据源开关/默认关闭
@@ -130,7 +130,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 47.104.91.229
+#    host: 139.9.157.49
+    host: 192.168.0.79
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

 spring:
   profiles:
-    active: test
+    active: pre
 
 # MyBatisPlus配置
 # https://baomidou.com/config/