Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -190,10 +190,6 @@ spring:
     database: 0
     # 密码
     password: 123qx
-#    database: 0
-#    host: 152.136.206.27
-#    port: 6379
-#    password: ''
 
 #  mongodb配置
   data:
@@ -283,8 +279,8 @@ jeecg:
     logRetentionDays: 30
   #分布式锁配置
   redisson:
-    address: 127.0.0.1:6379
-    password:
+    address: 127.0.0.1:6380
+    password: 123qx
     type: STANDALONE
     enabled: true
 #cas单点登录

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -130,7 +130,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://152.136.206.27:3306/ems?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://119.3.168.55:3306/ems?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: itdm-boot
           password: itdm-boot@2023
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -142,10 +142,14 @@ spring:
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
+    # 地址
+    host: 119.3.168.55
+    # 端口，默认为6379
+    port: 6380
+    # 数据库索引
     database: 0
-    host: 152.136.206.27
-    port: 6379
-    password: ''
+    # 密码
+    password: 123qx
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml