修改为yml，并增加版本更新接口信息查询接口

720yun_fd_manage/gis_application/src/main/java/com/gis/GisApplication.java

@@ -1,11 +1,13 @@
 package com.gis;
 
+import com.dtflys.forest.springboot.annotation.ForestScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
 @SpringBootApplication
+@ForestScan(basePackages = "com.gis.common.httpclient")
 public class GisApplication {
 
     public static void main(String[] args) {

720yun_fd_manage/gis_application/src/main/resources/application-dev.properties

@@ -1,96 +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://8.135.106.227:3306/${project.name}?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
-
-
-# redis \uFFFD\u05B2\uFFFD\u02BD\uFFFD\uFFFD
-spring.redis.cluster.nodes=8.135.106.227:6379
-spring.redis.database=0
-spring.redis.password=bgh0cae240
-spring.redis.timeout=3000ms
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
-spring.redis.jedis.pool.max-active=8
-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
-
-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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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=${project.name}/
-oss.domain=https://ossxiaoan.4dage.com/
-
-
-
-#log
-logging.file.path=/root/data/${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 nas\u013F\u00BC
-server.file.path=/mnt/${project.name}_data/
-server.domain=
-
-domain.4dkk=https://test.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=/mnt
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-dev.yml

@@ -0,0 +1,75 @@
+domain:
+    4dkk: https://test.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: /root/data/${project.name}_log
+    level:
+        com:
+            gis: debug
+oss:
+    bucket: oss-xiaoan
+    domain: https://ossxiaoan.4dage.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    domain: ''
+    file:
+        path: /mnt/${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: 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/${project.name}?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: admin123
+        publisher-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: admin
+        virtual-host: /
+    redis:
+        cluster:
+            nodes: 8.135.106.227:6379
+        database: 0
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: bgh0cae240
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: /mnt
+tlog:
+    enable-invoke-time-print: true

720yun_fd_manage/gis_application/src/main/resources/application-locPro.properties

@@ -1,103 +0,0 @@
-
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-
-#pro
-spring.datasource.druid.url=jdbc:mysql://8.129.209.131:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-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
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-# \u5916\u7F51 \u56DB\u7EF4\u770B\u770B-v4-pro
-spring.redis.host=r-wz9owsphxqwi4ztqlfpd.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
-
-
-# rabbitmq \u96C6\u7FA4\u6A21\u5F0F
-spring.rabbitmq.address=120.25.146.52: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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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
-
-
-# pro oss info
-oss.point=http://oss-cn-shenzhen.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=4dkankan
-oss.type=oss
-oss.file.path=${project.name}/
-# \u56DB\u7EF4\u770B\u770Boss cdn\u57DF\u540D
-oss.domain=https://4dkk.4dage.com/
-
-
-
-
-#log
-logging.file.path=E:/log/${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
-
-# file info
-server.file.path=E:\\data\\${project.name}_data\\
-server.domain=
-
-
-domain.4dkk=https://www.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=F:\\test
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-locPro.yml

@@ -0,0 +1,75 @@
+domain:
+    4dkk: https://www.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: E:/log/${project.name}_log
+    level:
+        com:
+            gis: debug
+oss:
+    bucket: 4dkankan
+    domain: https://4dkk.4dage.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    domain: ''
+    file:
+        path: E:\data\${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: 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://8.129.209.131:3306/${project.name}?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: 120.25.146.52:5672
+        connection-timeout: 15000
+        password: guest
+        publisher-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+    redis:
+        database: 0
+        host: r-wz9owsphxqwi4ztqlfpd.redis.rds.aliyuncs.com
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: 3oo19bgh0cae2406&
+        port: 6379
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: F:\test
+tlog:
+    enable-invoke-time-print: true

720yun_fd_manage/gis_application/src/main/resources/application-locProAws.properties

@@ -1,117 +0,0 @@
-
-
-#DB
-# \u5916\u7F51ip: 3.120.132.91
-# \u5185\u7F51ip: 172.31.42.151
-# \u5185\u7F51ip
-#service.ip=172.31.42.151
-# \u5916\u7F51ip
-service.ip=3.120.132.91
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.datasource.druid.url=jdbc:mysql://${service.ip}:13306/${project.name}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-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
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.host=${service.ip}
-spring.redis.password=
-
-spring.redis.port=6379
-spring.redis.database=0
-# \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.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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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=${project.name}/
-oss.domain=https://eurs3.4dkankan.com/
-
-
-
-
-#log
-logging.file.path=/home/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 nas\u013F\u00BC
-server.file.path=/mnt/${project.name}_data/
-server.domain=
-
-domain.4dkk=https://eur.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=/mnt
-
-#swagger login
-#knife4j.basic.enable=true
-#knife4j.basic.username=owen
-#knife4j.basic.password=owen
-
-
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-locProAws.yml

@@ -0,0 +1,77 @@
+domain:
+    4dkk: https://eur.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: /home/log/${project.name}_log
+    level:
+        com:
+            gis: info
+oss:
+    bucket: 4dkankan
+    domain: https://eurs3.4dkankan.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: aws
+server:
+    domain: ''
+    file:
+        path: /mnt/${project.name}_data/
+service:
+    ip: 3.120.132.91
+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
+    rabbitmq:
+        address: ${service.ip}:5672
+        connection-timeout: 15000
+        password: guest
+        publisher-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+    redis:
+        database: 0
+        host: ${service.ip}
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: ''
+        port: 6379
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: /mnt
+tlog:
+    enable-invoke-time-print: true

720yun_fd_manage/gis_application/src/main/resources/application-locSit.properties

@@ -1,123 +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/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=root
-
-#sit
-#spring.datasource.druid.url=jdbc:mysql://120.25.146.52:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=4dkk2020test%
-
-
-#pro
-spring.datasource.druid.url=jdbc:mysql://8.129.209.131:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-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
-
-
-spring.redis.host=r-wz9owsphxqwi4ztqlfpd.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=localhost
-#spring.rabbitmq.port=5672
-#spring.rabbitmq.username=guest
-#spring.rabbitmq.password=guest
-
-# rabbitmq \u96C6\u7FA4\u6A21\u5F0F
-spring.rabbitmq.address=8.129.209.131: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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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=${project.name}/
-#oss.domain=http://ossxiaoan.4dage.com/
-
-# pro 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=${project.name}/
-oss.domain=https://ossxiaoan.4dage.com/
-
-
-
-
-#log
-logging.file.path=E:/log/${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
-
-
-# file info
-server.file.path=E:\\data\\${project.name}_data\\
-server.domain=
-
-
-domain.4dkk=https://test.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=F:\\test
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-locSit.yml

@@ -0,0 +1,90 @@
+domain:
+    4dkk: https://test.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: E:/log/${project.name}_log
+    level:
+        com:
+            gis: debug
+oss:
+    bucket: oss-xiaoan
+    domain: https://ossxiaoan.4dage.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    domain: ''
+    file:
+        path: E:\data\${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: 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://8.129.209.131:3306/${project.name}?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: 8.129.209.131:5672
+        connection-timeout: 15000
+        password: guest
+        publisher-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+    redis:
+        database: 0
+        host: r-wz9owsphxqwi4ztqlfpd.redis.rds.aliyuncs.com
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: 3oo19bgh0cae2406&
+        port: 6379
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: F:\test
+tlog:
+    enable-invoke-time-print: true
+forest:
+    backend: okhttp3 # 后端HTTP框架（默认为 okhttp3）
+    max-connections: 1000 # 连接池最大连接数（默认为 500）
+    max-route-connections: 500 # 每个路由的最大连接数（默认为 500）
+    timeout: 50000 # 请求超时时间，单位为毫秒（默认为 3000）
+    connect-timeout: 20000 # 连接超时时间，单位为毫秒（默认为 timeout）
+    read-timeout: 50000 # 数据读取超时时间，单位为毫秒（默认为 timeout）
+    max-retry-count: 0 # 请求失败后重试次数（默认为 0 次不重试）
+    ssl-protocol: SSLv3 # 单向验证的HTTPS的默认SSL协议（默认为 SSLv3）
+    logEnabled: true # 打开或关闭日志（默认为 true）
+    log-request: true # 打开/关闭Forest请求日志（默认为 true）
+    log-response-status: true # 打开/关闭Forest响应状态日志（默认为 true）
+    log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
+    base-address-scheme: https
+    base-address-host: test.4dkankan.com

720yun_fd_manage/gis_application/src/main/resources/application-locSitAws.properties

@@ -1,119 +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:13306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=JK20220120%JIK
-
-#spring.datasource.druid.url=jdbc:mysql://120.25.146.52:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=4dkk2020test%
-
-#spring.datasource.druid.url=jdbc:mysql://8.129.209.131:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=4dkk2020cuikuan%
-
-
-#spring.datasource.druid.username=root
-#spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.name}?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
-
-
-
-# v4-sit-4dkankan
-spring.redis.host=127.0.0.1
-spring.redis.password=
-
-spring.redis.port=6379
-spring.redis.database=0
-# \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.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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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-base
-oss.type=aws
-oss.bucket=test-4dkankan
-oss.file.path=${project.name}/
-oss.domain=https://testeurs3.4dkankan.com/
-
-
-
-
-
-
-
-#log
-logging.file.path=E:/log/${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
-# \u670D\u52A1\u5668\u6587\u4EF6\u5B58\u50A8\u5730\u5740
-server.file.path=E:/data/${project.name}_data/
-server.domain=
-
-domain.4dkk=https://testeur.4dkankan.com
-#domain.4dkk=https://v4-uat.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=/mnt
-
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-locSitAws.yml

@@ -0,0 +1,72 @@
+domain:
+    4dkk: https://testeur.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: E:/log/${project.name}_log
+    level:
+        com:
+            gis: debug
+oss:
+    bucket: test-4dkankan
+    domain: https://testeurs3.4dkankan.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: aws
+server:
+    domain: ''
+    file:
+        path: E:/data/${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
+            stat-view-servlet:
+                enabled: true
+            test-on-borrow: false
+            test-on-return: false
+            test-while-idle: true
+            time-between-eviction-runs-millis: 60000
+            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-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: admin
+        virtual-host: /
+    redis:
+        database: 0
+        host: 127.0.0.1
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: ''
+        port: 6379
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: /mnt
+tlog:
+    enable-invoke-time-print: true

720yun_fd_manage/gis_application/src/main/resources/application-pro.properties

@@ -1,114 +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://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
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-#spring.redis.host=127.0.0.1
-#spring.redis.password=
-
-# \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
-
-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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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=${project.name}/
-# \u56DB\u7EF4\u770B\u770Boss cdn\u57DF\u540D
-oss.domain=https://4dkk.4dage.com/
-
-
-
-#log
-logging.file.path=/root/log/${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 nas\u013F\u00BC
-server.file.path=/mnt/${project.name}_data/
-server.domain=
-
-domain.4dkk=https://www.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=/mnt
-
-#swagger login
-knife4j.basic.enable=true
-knife4j.basic.username=owen
-knife4j.basic.password=owen
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-pro.yml

@@ -0,0 +1,95 @@
+domain:
+    4dkk: https://www.4dkankan.com
+knife4j:
+    basic:
+        enable: true
+        password: owen
+        username: owen
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: /root/log/${project.name}_log
+    level:
+        com:
+            gis: debug
+oss:
+    bucket: 4dkankan
+    domain: https://4dkk.4dage.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    domain: ''
+    file:
+        path: /mnt/${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: 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-confirm-type: correlated
+        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
+    servlet:
+        multipart:
+            location: /mnt
+tlog:
+    enable-invoke-time-print: true
+forest:
+    backend: okhttp3 # 后端HTTP框架（默认为 okhttp3）
+    max-connections: 1000 # 连接池最大连接数（默认为 500）
+    max-route-connections: 500 # 每个路由的最大连接数（默认为 500）
+    timeout: 50000 # 请求超时时间，单位为毫秒（默认为 3000）
+    connect-timeout: 20000 # 连接超时时间，单位为毫秒（默认为 timeout）
+    read-timeout: 50000 # 数据读取超时时间，单位为毫秒（默认为 timeout）
+    max-retry-count: 0 # 请求失败后重试次数（默认为 0 次不重试）
+    ssl-protocol: SSLv3 # 单向验证的HTTPS的默认SSL协议（默认为 SSLv3）
+    logEnabled: true # 打开或关闭日志（默认为 true）
+    log-request: true # 打开/关闭Forest请求日志（默认为 true）
+    log-response-status: true # 打开/关闭Forest响应状态日志（默认为 true）
+    log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
+    base-address-scheme: https
+    base-address-host: www.4dkankan.com

720yun_fd_manage/gis_application/src/main/resources/application-proAws.properties

@@ -1,114 +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.url=jdbc:mysql://${service.ip}:13306/${project.name}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-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
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.host=${service.ip}
-spring.redis.password=
-
-spring.redis.port=6379
-spring.redis.database=0
-# \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.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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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=${project.name}/
-oss.domain=https://eurs3.4dkankan.com/
-
-
-
-
-#log
-logging.file.path=/home/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 nas\u013F\u00BC
-server.file.path=/mnt/${project.name}_data/
-server.domain=
-
-domain.4dkk=https://eur.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=/mnt
-
-#swagger login
-#knife4j.basic.enable=true
-#knife4j.basic.username=owen
-#knife4j.basic.password=owen
-
-
-
-
-
-

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

@@ -0,0 +1,77 @@
+domain:
+    4dkk: https://eur.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: /home/log/${project.name}_log
+    level:
+        com:
+            gis: info
+oss:
+    bucket: 4dkankan
+    domain: https://eurs3.4dkankan.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: aws
+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
+    rabbitmq:
+        address: ${service.ip}:5672
+        connection-timeout: 15000
+        password: guest
+        publisher-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+    redis:
+        database: 0
+        host: ${service.ip}
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: ''
+        port: 6379
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: /mnt
+tlog:
+    enable-invoke-time-print: true

720yun_fd_manage/gis_application/src/main/resources/application-sit.properties

@@ -1,119 +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/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkk2020test%
-#spring.datasource.druid.password=JK123456%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
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-# sit-4dkankan
-#spring.redis.host=127.0.0.1
-#spring.redis.password=
-
-# v4-sit-4dkankan
-# \u5185\u7F51ip:172.18.156.39 -> \u516C\u7F51ip:120.24.144.164
-spring.redis.host=172.18.156.39
-spring.redis.password=bgh0cae240
-
-spring.redis.port=6379
-spring.redis.database=0
-# \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
-
-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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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
-# \u4E0A\u4F20\u6587\u4EF6\u4FDD\u5B58\u4F4D\u7F6E\u7C7B\u578B
-oss.type=oss
-oss.file.path=${project.name}/
-oss.domain=https://ossxiaoan.4dage.com/
-
-
-
-
-#log
-logging.file.path=/root/log/${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 nas\u013F\u00BC
-server.file.path=/mnt/${project.name}_data/
-server.domain=
-
-domain.4dkk=https://test.4dkankan.com
-#domain.4dkk=https://v4-uat.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=/mnt
-
-
-
-
-
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-sit.yml

@@ -0,0 +1,90 @@
+domain:
+    4dkk: https://test.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: /root/log/${project.name}_log
+    level:
+        com:
+            gis: debug
+oss:
+    bucket: oss-xiaoan
+    domain: https://ossxiaoan.4dage.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: oss
+server:
+    domain: ''
+    file:
+        path: /mnt/${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: 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/${project.name}?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-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: guest
+        virtual-host: /
+    redis:
+        database: 0
+        host: 172.18.156.39
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: bgh0cae240
+        port: 6379
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: /mnt
+tlog:
+    enable-invoke-time-print: true
+forest:
+    backend: okhttp3 # 后端HTTP框架（默认为 okhttp3）
+    max-connections: 1000 # 连接池最大连接数（默认为 500）
+    max-route-connections: 500 # 每个路由的最大连接数（默认为 500）
+    timeout: 50000 # 请求超时时间，单位为毫秒（默认为 3000）
+    connect-timeout: 20000 # 连接超时时间，单位为毫秒（默认为 timeout）
+    read-timeout: 50000 # 数据读取超时时间，单位为毫秒（默认为 timeout）
+    max-retry-count: 0 # 请求失败后重试次数（默认为 0 次不重试）
+    ssl-protocol: SSLv3 # 单向验证的HTTPS的默认SSL协议（默认为 SSLv3）
+    logEnabled: true # 打开或关闭日志（默认为 true）
+    log-request: true # 打开/关闭Forest请求日志（默认为 true）
+    log-response-status: true # 打开/关闭Forest响应状态日志（默认为 true）
+    log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
+    base-address-scheme: https
+    base-address-host: test.4dkankan.com

720yun_fd_manage/gis_application/src/main/resources/application-sitAws.properties

@@ -1,114 +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/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkk2020test%
-#spring.datasource.druid.password=JK123456%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
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-# sit-4dkankan
-#spring.redis.host=127.0.0.1
-#spring.redis.password=
-
-# v4-sit-4dkankan
-# \u5185\u7F51ip:172.18.156.39
-spring.redis.host=127.0.0.1
-spring.redis.password=
-
-spring.redis.port=6379
-spring.redis.database=0
-# \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.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
-spring.rabbitmq.publisher-confirm-type=correlated
-# 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=${project.name}/
-oss.domain=https://testeurs3.4dkankan.com/
-
-
-
-
-#log
-logging.file.path=/home/log/${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 nas\u013F\u00BC
-server.file.path=/mnt/${project.name}_data/
-server.domain=
-
-domain.4dkk=https://testeur.4dkankan.com
-#domain.4dkk=https://v4-uat.4dkankan.com
-
-# \u6307\u5B9Atomcat\u6587\u4EF6\u4E0A\u4F20\u7684\u4E34\u65F6\u76EE\u5F55,\u4E0A\u4F20\u5B8C\u4F1A\u628A\u6587\u4EF6\u5220\u9664\uFF0C\u4F46\u8FD9\u4E2A\u65B9\u6CD5\u4E0D\u4F1A\u4E3B\u52A8\u521B\u5EFA\u76EE\u5F55, \u9ED8\u8BA4\u5728/tmp/tomcat.XXX, \u8FD9\u4E2A\u76EE\u5F55\u4F1A\u5728\u6E05\u695Atmp\u6587\u4EF6\u65F6\u5220\u9664\uFF0C\u5BFC\u81F4\u51FA\u9519
-spring.servlet.multipart.location=/mnt
-
-
-
-
-
-
-

720yun_fd_manage/gis_application/src/main/resources/application-sitAws.yml

@@ -0,0 +1,75 @@
+domain:
+    4dkk: https://testeur.4dkankan.com
+logging:
+    config: classpath:logback-spring.xml
+    fdkk:
+        level: INFO
+        maxHistory: 180
+    file:
+        path: /home/log/${project.name}_log
+    level:
+        com:
+            gis: debug
+oss:
+    bucket: test-4dkankan
+    domain: https://testeurs3.4dkankan.com/
+    file:
+        path: ${project.name}/
+    key: LTAIUrvuHqj8pvry
+    point: http://oss-cn-shenzhen-internal.aliyuncs.com
+    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    type: aws
+server:
+    domain: ''
+    file:
+        path: /mnt/${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: 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/${project.name}?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: 123456
+        publisher-confirm-type: correlated
+        publisher-returns: true
+        template:
+            mandatory: true
+        username: admin
+        virtual-host: /
+    redis:
+        database: 0
+        host: 127.0.0.1
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: ''
+        port: 6379
+        timeout: 3000ms
+    servlet:
+        multipart:
+            location: /mnt
+tlog:
+    enable-invoke-time-print: true

720yun_fd_manage/gis_common/pom.xml

@@ -166,6 +166,10 @@
             <groupId>com.yomahub</groupId>
             <artifactId>tlog-all-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.dtflys.forest</groupId>
+            <artifactId>forest-spring-boot-starter</artifactId>
+        </dependency>
         <!-- redis-config 需要此包 -->
         <!--<dependency>-->
             <!--<groupId>com.fasterxml.jackson.core</groupId>-->

720yun_fd_manage/gis_common/src/main/java/com/gis/common/httpclient/FdkkClient.java

@@ -0,0 +1,22 @@
+package com.gis.common.httpclient;
+
+
+import com.dtflys.forest.annotation.Get;
+import com.dtflys.forest.annotation.Var;
+import com.dtflys.forest.extensions.DownloadFile;
+import com.gis.common.util.Result;
+
+import java.io.File;
+
+public interface FdkkClient {
+    /**
+    * @description:根据当前时间获取更新提示
+    * @author: 谢文杰
+    * @date: 2023/6/8 10:09
+    * @param:
+    * @return:
+    **/
+    @Get("/service/manage/inner/getServiceUpTip?type=2")
+    Result getServiceUpTip();
+
+}

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkService.java

@@ -53,4 +53,6 @@ public interface WorkService extends IBaseService<WorkEntity, String> {
     Result delOss(String ossPath);
 
     void fixSomeData(String workId,String active);
+
+    Result getServiceUpTip();
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -13,6 +13,7 @@ import com.gis.common.constant.ErrorEnum;
 import com.gis.common.constant.RedisConstant;
 import com.gis.common.constant.SomeDataConstant;
 import com.gis.common.exception.BaseRuntimeException;
+import com.gis.common.httpclient.FdkkClient;
 import com.gis.common.util.*;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.FodderEntity;
@@ -40,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.*;
@@ -79,7 +81,8 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
     @Autowired
     WorkHotsFodderService workHotsFodderService;
 
-
+    @Resource
+    FdkkClient fdkkClient;
 
     @Override
     public IBaseStrMapper<WorkEntity, String> getBaseMapper() {
@@ -1015,5 +1018,13 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         }
     }
 
-
+    @Override
+    public Result getServiceUpTip() {
+        try {
+            Result resultData = fdkkClient.getServiceUpTip();
+            return Result.success(resultData.getData());
+        }catch (Exception e){
+            return Result.success();
+        }
+    }
 }

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkController.java

@@ -66,6 +66,16 @@ public class WorkController extends BaseController {
         return workService.entityAdd();
     }
 
+    /**
+     * 获取编辑器版本信息
+     * @return
+     */
+
+    @ApiOperation(value = "获取版本信息", position = 1)
+    @GetMapping("/getServiceUpTip")
+    public Result getServiceUpTip(){
+        return workService.getServiceUpTip();
+    }
 
 
     @ApiOperation(value = "修改实体", position = 1)

720yun_fd_manage/pom.xml

@@ -55,6 +55,7 @@
 
         <nacos-discovery-spring-boot.version>0.2.1</nacos-discovery-spring-boot.version>
         <tlog-all-spring-boot-starter.version>1.5.0</tlog-all-spring-boot-starter.version>
+        <forest-spring-boot-starter.version>1.5.30</forest-spring-boot-starter.version>
 
         <!-- 打包跳过测试用例 -->
         <skipTests>true</skipTests>
@@ -299,6 +300,11 @@
                 <artifactId>tlog-all-spring-boot-starter</artifactId>
                 <version>${tlog-all-spring-boot-starter.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.dtflys.forest</groupId>
+                <artifactId>forest-spring-boot-starter</artifactId>
+                <version>${forest-spring-boot-starter.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>