Merge branch 'dev-api' into dev

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

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://qdhome.iot321.top:33003/pla-chem-sim-dev-1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://qdhome.iot321.top:33103/pla-chem-sim-dev-1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 46d525e39f6de932
+                password: 8M6ahN7BXsXXDccR
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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

@@ -70,11 +70,11 @@ spring:
     # 地址
     host: qdhome.iot321.top
     # 端口，默认为6379
-    port: 33004
+    port: 33104
     # 数据库索引
     database: 0
     # 密码
-    password: UQAM@8wCaXcwAfBv
+    password: 6w2C%6BzjRG3dY%3
     # 连接超时时间
     timeout: 10s
     lettuce: