[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

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

@@ -6,9 +6,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.110.199:3306/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.110.199:13386/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: drone
-        password: WDDAELfaZaNZNYtP
+        password: X2J5DSD25ykn8Hii
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

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

@@ -69,13 +69,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.110.126
+    host: 192.168.110.2
     # 端口，默认为6379
-    port: 6379
+    port: 9287
     # 数据库索引
-    database: 2
+    database: 7
     # 密码
-    password: 123456
+    password: syar23rdsaagdrsa
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -131,9 +131,9 @@ xss:
   urlPatterns: /system/*,/monitor/*,/tool/*
 
 mqtt:
-  broker: tcp://zmkg.cqet.top:9995
-  username: cory18600000000
-  password: cory18600000000
+  broker: tcp://192.168.110.2:1883
+  username: atiandon
+  password: atiandon
   topics:
     # 设备 > 云平台
     - thing/product/+/osd # 设备定频上报的属性
@@ -174,13 +174,15 @@ deploy:
 #  duration-seconds: 3600
 
 minio:
-  endpoint: "http://192.168.110.126:9000"
-  access-key: "root"
-  secret-key: "root123456"
-  role-arn: "arn:aws:s3:::drone-?/*"
-  role-session-name: "anysession"
+  endpoint: "xny.yj-3d.com:9000"
+  accessKeyID: "minioadmin"
+  secretAccessKey: "CQyj20200808!"
+  bucketName: "cory-create"
+  roleARN: "arn:aws:s3:::cory-create/*"
+  roleSessionName: "anysession"
   region: "cn-chengdu"
-  duration-seconds: 3600
+  useSSL: true
+  durationSeconds: 3600
 
 
 ai: