Merge branch 'refs/heads/master' into dev-zenas-20241018

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

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

@@ -166,7 +166,8 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://adweb3-prod.c0stwhsmuvxv.rds.cn-northwest-1.amazonaws.com.cn/adweb_v3?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          # TODO: 待切换生产RDS
+          url: jdbc:mysql://adweb3-prod.c0stwhsmuvxv.rds.cn-northwest-1.amazonaws.com.cn:3306/adweb_v3?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: xZjenmZAvKJCBDCTrWIb
           driver-class-name: com.mysql.cj.jdbc.Driver