Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

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

@@ -9,7 +9,7 @@ shuzhihua:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/dsk/uploadPath，Linux配置 /home/server/dsk-operate-sys/uploadPath）
-#  profile: D:/dsk-operate-sys/uploadPath/
+  #  profile: D:/dsk-operate-sys/uploadPath/
   profile: /home/server/dsk-operate-sys/uploadPath/
   # 获取ip地址开关
   addressEnabled: false
@@ -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:
       #                # 从数据源开关/默认关闭
@@ -113,8 +113,8 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-#  profiles:
-#    active: druid
+  #  profiles:
+  #    active: druid
   # 文件上传
   servlet:
     multipart:
@@ -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
     # 数据库索引
@@ -194,10 +195,10 @@ xss:
 
 dsk:
   open:
-#    endPoint: 120.27.13.145:8865
-#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: http
+    #    endPoint: 120.27.13.145:8865
+    #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    #    protocol: http
     endPoint: openapi.jiansheku.com
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b