Browse Source

更新为yml

xiewj 2 years ago
parent
commit
288ad23b00

+ 0 - 80
720yun_fd_consumer/gis_consumer/src/main/resources/application-dev.properties

@@ -1,80 +0,0 @@
-
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkk2021testproject%
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-
-
-#rabbit MQ
-#spring.rabbitmq.host=10.1.30.120
-#spring.rabbitmq.port=5672
-#spring.rabbitmq.username=root
-#spring.rabbitmq.password=root
-
-#rabbit MQ\uFFFD\uFFFD\u023A
-spring.rabbitmq.address=127.0.0.1:5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=admin123
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-# confirm\u0123\u02BD
-spring.rabbitmq.publisher-confirms=true
-# return\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.publisher-returns=true
-# \uFFFD\uFFFDreturn\uFFFD\uFFFD\uFFFD\u01BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.template.mandatory=true
-
-
-# oss info
-#oss.point=http://oss-cn-shenzhen.aliyuncs.com
-# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\u38EC\u05BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B0\uFFFD\uFFFD\uFFFD\uFFFD\u01B5\u0137\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDoss\uFFFD\uFFFD\uFFFD\uFFFD\u0427\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0637\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\uFFFD\uFFFD\uFFFD
-oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=oss-xiaoan
-oss.type=oss
-oss.file.path=720yun_fd_manage/
-oss.domain=https://ossxiaoan.4dage.com/
-
-
-#log
-logging.path=/root/data/${project.name}_log
-logging.config=classpath:logback-spring.xml
-logging.level.com.gis=info
-logging.fdkk.level=INFO
-logging.fdkk.maxHistory=180
-tlog.enable-invoke-time-print=true
-
-# \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-server.file.path=/mnt/720yun_fd_manage_data/
-
-
-
-

+ 56 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application-dev.yml

@@ -0,0 +1,56 @@
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    level:
+        com:
+            gis: info
+    path: /root/data/${project.name}_log
+oss:
+    bucket: oss-xiaoan
+    domain: https://ossxiaoan.4dage.com/
+    file:
+        path: 720yun_fd_manage/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    file:
+        path: /mnt/720yun_fd_manage_data/
+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: 4dkk2021testproject%
+            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://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&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
+    rabbitmq:
+        address: 127.0.0.1:5672
+        connection-timeout: 15000
+        password: admin123
+        publisher-confirms: true
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: admin
+        virtual-host: /
+tlog:
+    enable-invoke-time-print: true

+ 0 - 78
720yun_fd_consumer/gis_consumer/src/main/resources/application-loc.properties

@@ -1,78 +0,0 @@
-
-
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://localhost:3306/cms_pano_manage_fd?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=root
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-#rabbit MQ
-#spring.rabbitmq.host=localhost
-#spring.rabbitmq.port=5672
-#spring.rabbitmq.username=guest
-#spring.rabbitmq.password=guest
-
-# rabbitmq \uFFFD\uFFFD\u023A\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.address=127.0.0.1:5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-# confirm\u0123\u02BD
-spring.rabbitmq.publisher-confirms=true
-# return\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.publisher-returns=true
-# \uFFFD\uFFFDreturn\uFFFD\uFFFD\uFFFD\u01BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.template.mandatory=true
-
-# oss info
-oss.point=http://oss-cn-shenzhen.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=oss-xiaoan
-oss.type=oss
-oss.file.path=cms_pano_fcb//
-oss.domain=http://ossxiaoan.4dage.com/
-
-
-
-#log
-logging.path=E:/javaProject/${project.name}_log
-logging.config=classpath:logback-spring.xml
-logging.level.com.gis=debug
-logging.fdkk.level=INFO
-logging.fdkk.maxHistory=180
-tlog.enable-invoke-time-print=true
-
-# \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-server.file.path=F:\\test\\ngin\\${project.name}_data\\
-#server.domain=192
-
-
-
-

+ 56 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application-loc.yml

@@ -0,0 +1,56 @@
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    level:
+        com:
+            gis: debug
+    path: E:/javaProject/${project.name}_log
+oss:
+    bucket: oss-xiaoan
+    domain: http://ossxiaoan.4dage.com/
+    file:
+        path: cms_pano_fcb//
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    file:
+        path: F:\test\ngin\${project.name}_data\
+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: root
+            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://localhost:3306/cms_pano_manage_fd?serverTimezone=GMT%2B8&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
+    rabbitmq:
+        address: 127.0.0.1:5672
+        connection-timeout: 15000
+        password: guest
+        publisher-confirms: true
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+tlog:
+    enable-invoke-time-print: true

+ 0 - 79
720yun_fd_consumer/gis_consumer/src/main/resources/application-locSitAws.properties

@@ -1,79 +0,0 @@
-
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=4dkk2020test%
-
-spring.datasource.druid.username=root
-spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-spring.datasource.druid.password=4dkk2021testproject%
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-
-#rabbit MQ\uFFFD\uFFFD\u023A
-spring.rabbitmq.address=127.0.0.1:5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=4dagecui2019$
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-# confirm\u0123\u02BD
-spring.rabbitmq.publisher-confirms=true
-# return\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.publisher-returns=true
-# \uFFFD\uFFFDreturn\uFFFD\uFFFD\uFFFD\u01BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.template.mandatory=true
-
-
-# oss info
-#oss.point=http://oss-cn-shenzhen.aliyuncs.com
-oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-
-
-# oss-base
-oss.type=aws
-oss.bucket=test-4dkankan
-oss.file.path=720yun_fd_manage/
-oss.domain=https://testeurs3.4dkankan.com/
-
-
-#log
-logging.path=/root/data/${project.name}_log
-logging.config=classpath:logback-spring.xml
-logging.level.com.gis=info
-logging.fdkk.level=INFO
-logging.fdkk.maxHistory=180
-tlog.enable-invoke-time-print=true
-
-# \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-server.file.path=/mnt/720yun_fd_manage_data/
-
-
-
-

+ 56 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application-locSitAws.yml

@@ -0,0 +1,56 @@
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    level:
+        com:
+            gis: info
+    path: /root/data/${project.name}_log
+oss:
+    bucket: test-4dkankan
+    domain: https://testeurs3.4dkankan.com/
+    file:
+        path: 720yun_fd_manage/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: aws
+server:
+    file:
+        path: /mnt/720yun_fd_manage_data/
+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: 4dkk2021testproject%
+            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://8.135.106.227:3306/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
+    rabbitmq:
+        address: 127.0.0.1:5672
+        connection-timeout: 15000
+        password: 4dagecui2019$
+        publisher-confirms: true
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+tlog:
+    enable-invoke-time-print: true

+ 0 - 105
720yun_fd_consumer/gis_consumer/src/main/resources/application-pro.properties

@@ -1,105 +0,0 @@
-
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.username=root
-
-# 8.129.209.131\u4F7F\u7528local
-#spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.password=4dkk2020cuikuan%
-
-# \u7F16\u8F91\u7B97\u6CD5\u670D\u52A1\u5668-47.106.173.174
-spring.datasource.druid.url=jdbc:mysql://172.18.157.42:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.password=4dkk2020cuikuan%
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-# \u5185\u7F51
-spring.redis.host=r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com
-spring.redis.password=3oo19bgh0cae2406&
-
-spring.redis.database=0
-spring.redis.port=6379
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout=3000ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
-spring.redis.jedis.pool.max-idle=8
-#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
-spring.redis.jedis.pool.min-idle=0
-# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
-spring.redis.jedis.pool.max-active=8
-# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
-spring.redis.jedis.pool.max-wait=-1ms
-
-#rabbit MQ
-#spring.rabbitmq.host=10.1.30.120
-#spring.rabbitmq.port=5672
-#spring.rabbitmq.username=root
-#spring.rabbitmq.password=root
-
-#rabbit MQ\uFFFD\uFFFD\u023A
-#spring.rabbitmq.address=127.0.0.1:5672
-
-# \u7F16\u8F91\u7B97\u6CD5\u670D\u52A1\u5668-47.106.173.174
-spring.rabbitmq.address=172.18.157.42:5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-# confirm\u0123\u02BD
-spring.rabbitmq.publisher-confirms=true
-# return\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.publisher-returns=true
-# \uFFFD\uFFFDreturn\uFFFD\uFFFD\uFFFD\u01BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.template.mandatory=true
-
-
-# oss info
-#oss.point=http://oss-cn-shenzhen.aliyuncs.com
-# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\u38EC\u05BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B0\uFFFD\uFFFD\uFFFD\uFFFD\u01B5\u0137\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDoss\uFFFD\uFFFD\uFFFD\uFFFD\u0427\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0637\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\uFFFD\uFFFD\uFFFD
-oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=4dkankan
-oss.type=oss
-oss.file.path=720yun_fd_manage/
-# \u56DB\u7EF4\u770B\u770Boss cdn\u57DF\u540D
-oss.domain=https://4dkk.4dage.com/
-
-
-#log
-logging.path=/root/log/${project.name}_log
-logging.config=classpath:logback-spring.xml
-logging.level.com.gis=info
-logging.fdkk.level=INFO
-logging.fdkk.maxHistory=180
-tlog.enable-invoke-time-print=true
-
-# \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-server.file.path=/mnt/720yun_fd_manage_data/
-
-
-
-

+ 68 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application-pro.yml

@@ -0,0 +1,68 @@
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    level:
+        com:
+            gis: info
+    path: /root/log/${project.name}_log
+oss:
+    bucket: 4dkankan
+    domain: https://4dkk.4dage.com/
+    file:
+        path: 720yun_fd_manage/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    file:
+        path: /mnt/720yun_fd_manage_data/
+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: 4dkk2020cuikuan%
+            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://172.18.157.42:3306/720yun_fd_manage?serverTimezone=GMT%2B8&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
+    rabbitmq:
+        address: 172.18.157.42:5672
+        connection-timeout: 15000
+        password: guest
+        publisher-confirms: true
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+    redis:
+        database: 0
+        host: r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: 3oo19bgh0cae2406&
+        port: 6379
+        timeout: 3000ms
+tlog:
+    enable-invoke-time-print: true

+ 0 - 79
720yun_fd_consumer/gis_consumer/src/main/resources/application-proAws.properties

@@ -1,79 +0,0 @@
-
-#DB
-# \u5916\u7F51ip: 3.120.132.91
-# \u5185\u7F51ip: 172.31.42.151
-service.ip=172.31.47.163
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.datasource.druid.username=root
-spring.datasource.druid.url=jdbc:mysql://${service.ip}:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-spring.datasource.druid.password=JK20220120%JIK
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-
-#rabbit MQ\uFFFD\uFFFD\u023A
-spring.rabbitmq.address=${service.ip}:5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-# confirm\u0123\u02BD
-spring.rabbitmq.publisher-confirms=true
-# return\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.publisher-returns=true
-# \uFFFD\uFFFDreturn\uFFFD\uFFFD\uFFFD\u01BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.template.mandatory=true
-
-
-# oss info
-#oss.point=http://oss-cn-shenzhen.aliyuncs.com
-oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-
-
-# oss-base
-oss.type=aws
-oss.bucket=4dkankan
-oss.file.path=720yun_fd_manage/
-oss.domain=https://eurs3.4dkankan.com/
-
-
-#log
-logging.path=/root/data/${project.name}_log
-logging.config=classpath:logback-spring.xml
-logging.level.com.gis=info
-logging.fdkk.level=INFO
-logging.fdkk.maxHistory=180
-tlog.enable-invoke-time-print=true
-
-# \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-server.file.path=/mnt/720yun_fd_manage_data/
-
-
-
-

+ 58 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application-proAws.yml

@@ -0,0 +1,58 @@
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    level:
+        com:
+            gis: info
+    path: /root/data/${project.name}_log
+oss:
+    bucket: 4dkankan
+    domain: https://eurs3.4dkankan.com/
+    file:
+        path: 720yun_fd_manage/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: aws
+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
+    rabbitmq:
+        address: ${service.ip}:5672
+        connection-timeout: 15000
+        password: guest
+        publisher-confirms: true
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+tlog:
+    enable-invoke-time-print: true

+ 0 - 80
720yun_fd_consumer/gis_consumer/src/main/resources/application-sit.properties

@@ -1,80 +0,0 @@
-
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkk2020test%
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-
-
-#rabbit MQ
-#spring.rabbitmq.host=10.1.30.120
-#spring.rabbitmq.port=5672
-#spring.rabbitmq.username=root
-#spring.rabbitmq.password=root
-
-#rabbit MQ\uFFFD\uFFFD\u023A
-spring.rabbitmq.address=127.0.0.1:5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=4dagecui2019$
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-# confirm\u0123\u02BD
-spring.rabbitmq.publisher-confirms=true
-# return\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.publisher-returns=true
-# \uFFFD\uFFFDreturn\uFFFD\uFFFD\uFFFD\u01BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.template.mandatory=true
-
-
-# oss info
-#oss.point=http://oss-cn-shenzhen.aliyuncs.com
-# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\u38EC\u05BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B0\uFFFD\uFFFD\uFFFD\uFFFD\u01B5\u0137\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDoss\uFFFD\uFFFD\uFFFD\uFFFD\u0427\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0637\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\uFFFD\uFFFD\uFFFD
-oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=oss-xiaoan
-oss.type=oss
-oss.file.path=720yun_fd_manage/
-oss.domain=https://ossxiaoan.4dage.com/
-
-
-#log
-logging.path=/root/data/${project.name}_log
-logging.config=classpath:logback-spring.xml
-logging.level.com.gis=info
-logging.fdkk.level=INFO
-logging.fdkk.maxHistory=180
-tlog.enable-invoke-time-print=true
-
-# \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-server.file.path=/mnt/720yun_fd_manage_data/
-
-
-
-

+ 56 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application-sit.yml

@@ -0,0 +1,56 @@
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    level:
+        com:
+            gis: info
+    path: /root/data/${project.name}_log
+oss:
+    bucket: oss-xiaoan
+    domain: https://ossxiaoan.4dage.com/
+    file:
+        path: 720yun_fd_manage/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    file:
+        path: /mnt/720yun_fd_manage_data/
+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: 4dkk2020test%
+            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://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&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
+    rabbitmq:
+        address: 127.0.0.1:5672
+        connection-timeout: 15000
+        password: 4dagecui2019$
+        publisher-confirms: true
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+tlog:
+    enable-invoke-time-print: true

+ 0 - 77
720yun_fd_consumer/gis_consumer/src/main/resources/application-sitAws.properties

@@ -1,77 +0,0 @@
-
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-
-spring.datasource.druid.username=root
-spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-spring.datasource.druid.password=4dkk2020test%
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-
-#rabbit MQ\uFFFD\uFFFD\u023A
-spring.rabbitmq.address=127.0.0.1:5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=123456
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-# confirm\u0123\u02BD
-spring.rabbitmq.publisher-confirms=true
-# return\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.publisher-returns=true
-# \uFFFD\uFFFDreturn\uFFFD\uFFFD\uFFFD\u01BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-spring.rabbitmq.template.mandatory=true
-
-
-# oss info
-#oss.point=http://oss-cn-shenzhen.aliyuncs.com
-oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-
-
-# oss-base
-oss.type=aws
-oss.bucket=test-4dkankan
-oss.file.path=720yun_fd_manage/
-oss.domain=https://testeurs3.4dkankan.com/
-
-
-#log
-logging.path=/root/data/${project.name}_log
-logging.config=classpath:logback-spring.xml
-logging.level.com.gis=info
-logging.fdkk.level=INFO
-logging.fdkk.maxHistory=180
-tlog.enable-invoke-time-print=true
-
-# \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-server.file.path=/mnt/720yun_fd_manage_data/
-
-
-
-

+ 56 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application-sitAws.yml

@@ -0,0 +1,56 @@
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    level:
+        com:
+            gis: info
+    path: /root/data/${project.name}_log
+oss:
+    bucket: test-4dkankan
+    domain: https://testeurs3.4dkankan.com/
+    file:
+        path: 720yun_fd_manage/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: aws
+server:
+    file:
+        path: /mnt/720yun_fd_manage_data/
+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: 4dkk2020test%
+            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://127.0.0.1:3306/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
+    rabbitmq:
+        address: 127.0.0.1:5672
+        connection-timeout: 15000
+        password: 123456
+        publisher-confirms: true
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: admin
+        virtual-host: /
+tlog:
+    enable-invoke-time-print: true

+ 0 - 35
720yun_fd_consumer/gis_consumer/src/main/resources/application.properties

@@ -1,35 +0,0 @@
-server.port=8002
-spring.profiles.active=locSitAws
-
-
-# \uFFFD\uFFFD\u013F\uFFFD\uFFFD\uFFFD\uFFFD
-project.name=720yun_fd_consumer
-
-# \uFFFD\uFFFD\u032C\uFFFD\uFFFD\u0534\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-spring.resources.static-locations=classpath:templates/,classpath:static/,classpath:web/
-
-# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u013C\uFFFD\uFFFD\u03F4\uFFFD\uFFFD\uFFFD\u0421
-spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-file-size=256MB
-spring.servlet.multipart.max-request-size=256MB
-
-
-
-#\u914D\u7F6E\u81EA\u52A8\u8BC6\u522B\u5B57\u6BB5\u8F6C\u6362
-mybatis.configuration.mapUnderscoreToCamelCase=true
-mapper.identity=MYSQL
-mapper.mappers=tk.mybatis.mapper.common.Mapper
-#pager
-pagehelper.helper-dialect=mysql
-pagehelper.params=count=countSql
-pagehelper.reasonable=false
-pagehelper.support-methods-arguments=true
-
-
-
-
-
-
-
-
-

+ 25 - 0
720yun_fd_consumer/gis_consumer/src/main/resources/application.yml

@@ -0,0 +1,25 @@
+mapper:
+    identity: MYSQL
+    mappers: tk.mybatis.mapper.common.Mapper
+mybatis:
+    configuration:
+        mapUnderscoreToCamelCase: true
+pagehelper:
+    helper-dialect: mysql
+    params: count=countSql
+    reasonable: false
+    support-methods-arguments: true
+project:
+    name: 720yun_fd_consumer
+server:
+    port: 8002
+spring:
+    profiles:
+        active: locSitAws
+    resources:
+        static-locations: classpath:templates/,classpath:static/,classpath:web/
+    servlet:
+        multipart:
+            enabled: true
+            max-file-size: 256MB
+            max-request-size: 256MB