[update] 合并代码

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

@@ -10,9 +10,9 @@ spring:
 #        username: drone
 #        password: JXL@zzx79
       master:
-        url: jdbc:mysql://192.168.110.126:3306/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://192.168.110.2:13386/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: drone
+        password: X2J5DSD25ykn8Hii
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -64,11 +64,11 @@ spring:
           config:
             multi-statement-allow: true
 
-minio:
-  endpoint: "http://zmkg.cqet.top:9999"
-  access-key: "admin"
-  secret-key: "12345678"
-  role-arn: "arn:aws:s3:::drone-?/*"
-  role-session-name: "anysession"
-  region: "cn-chengdu"
-  duration-seconds: 3600
+#minio:
+#  endpoint: "http://zmkg.cqet.top:9999"
+#  access-key: "admin"
+#  secret-key: "12345678"
+#  role-arn: "arn:aws:s3:::drone-?/*"
+#  role-session-name: "anysession"
+#  region: "cn-chengdu"
+#  duration-seconds: 3600