add aws

720yun_fd_consumer/src/main/resources/application-pro.yml

@@ -5,11 +5,11 @@ logging:
     fdkk:
         level: INFO
         maxHistory: 180
-    level:
-        com:
-            gis: info
     file:
         path: /root/log/${project.name}_log
+    level:
+        com:
+            gis: debug
 filestorage:
     active: oss
     oss:

720yun_fd_consumer/src/main/resources/application-proAws.yml

@@ -5,10 +5,11 @@ logging:
     fdkk:
         level: INFO
         maxHistory: 180
+    file:
+        path: /root/log/${project.name}_log
     level:
         com:
-            gis: info
-    path: /root/data/${project.name}_log
+            gis: debug
 filestorage:
     active: aws
     aws:
@@ -22,33 +23,25 @@ filestorage:
 server:
     file:
         path: /mnt/720yun_fd_manage_data/
-service:
-    ip: 172.31.47.163
 spring:
     datasource:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        druid:
-            initial-size: 5
-            max-active: 20
-            max-evictable-idle-time-millis: 90000
-            max-wait: 60000
-            min-evictable-idle-time-millis: 30000
-            min-idle: 10
-            password: JK20220120%JIK
-            stat-view-servlet:
-                enabled: true
-            test-on-borrow: false
-            test-on-return: false
-            test-while-idle: true
-            time-between-eviction-runs-millis: 60000
-            url: jdbc:mysql://${service.ip}:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-            username: root
-            validation-query: SELECT 1 FROM DUAL
-            web-stat-filter:
-                enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
+        dynamic:
+            primary: db1
+            strict: false
+            datasource:
+                db1:
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://172.31.47.163:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+                    username: root
+                    password: JK20220120%JIK
+                db2:
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://172.31.47.163:13306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
+                    username: root
+                    password: JK20220120%JIK
     rabbitmq:
-        host: ${service.ip}
+        host: 172.31.47.163
         port: 5672
         username: guest
         password: guest
@@ -65,7 +58,7 @@ spring:
         publisher-confirm-type: correlated
     redis:
         database: 0
-        host: ${service.ip}
+        host: 172.31.47.163
         jedis:
             pool:
                 max-active: 8

720yun_fd_manage/src/main/resources/application-proAws.yml

@@ -6,10 +6,10 @@ logging:
         level: INFO
         maxHistory: 180
     file:
-        path: /home/log/${project.name}_log
+        path: /root/log/${project.name}_log
     level:
         com:
-            gis: info
+            gis: debug
 filestorage:
     active: aws
     aws:
@@ -25,33 +25,25 @@ server:
     domain: ''
     file:
         path: /mnt/${project.name}_data/
-service:
-    ip: 172.31.47.163
 spring:
     datasource:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        druid:
-            initial-size: 5
-            max-active: 20
-            max-evictable-idle-time-millis: 90000
-            max-wait: 60000
-            min-evictable-idle-time-millis: 30000
-            min-idle: 10
-            password: JK20220120%JIK
-            stat-view-servlet:
-                enabled: true
-            test-on-borrow: false
-            test-on-return: false
-            test-while-idle: true
-            time-between-eviction-runs-millis: 60000
-            url: jdbc:mysql://${service.ip}:13306/${project.name}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-            username: root
-            validation-query: SELECT 1 FROM DUAL
-            web-stat-filter:
-                enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
+        dynamic:
+            primary: db1
+            strict: false
+            datasource:
+                db1:
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://172.31.47.163:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+                    username: root
+                    password: JK20220120%JIK
+                db2:
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://172.31.47.163:13306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
+                    username: root
+                    password: JK20220120%JIK
     rabbitmq:
-        host: ${service.ip}
+        host: 172.31.47.163
         port: 5672
         username: guest
         password: guest
@@ -66,7 +58,7 @@ spring:
         publisher-confirm-type: correlated
     redis:
         database: 0
-        host: ${service.ip}
+        host: 172.31.47.163
         jedis:
             pool:
                 max-active: 8