Merge remote-tracking branch 'origin/main'

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

@@ -6,12 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.36.58.109:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.122.6.3:6001/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: haiwei@123
-#                url: jdbc:mysql://47.122.6.3:6001/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false
-#                username: root
-#                password: jrmRoot
+                password: jrmRoot
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭