更新国际服配置文件

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

@@ -1,3 +1,5 @@
+domain:
+    4dkk: https://eur.4dkankan.com
 logging:
     config: classpath:logback-spring.xml
     fdkk:
@@ -45,14 +47,40 @@ spring:
                 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
+        host: ${service.ip}
+        port: 5672
         username: guest
-        virtual-host: /
+        password: guest
+        virtual-host: 4dkankan
+        connection-timeout: 0
+        listener:
+            simple:
+                prefetch: 1
+                max-concurrency: 10
+                acknowledge-mode: manual #开启消费者手动确认
+            direct:
+                acknowledge-mode: manual #开启消费者手动确认
+        #开启消息投递确认机制
+        publisher-confirm-type: correlated
+    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
 tlog:
     enable-invoke-time-print: true
+queue:
+    scene-queue: queue-pano-scene
+    do-slice-queue: queue-do-slice
+    relics-init-queue: relics-init-queue
+    relics-update-name-queue: relics-update-name-queue
+    pano-migrate-scene-queue: pano-migrate-scene-queue
+    pano-paystatus-scene-queue: pano-paystatus-scene-queue
+    scene-queue-work: queue-pano-scene-work

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

@@ -1,3 +1,5 @@
+domain:
+    4dkk: https://testeur.4dkankan.com
 logging:
     config: classpath:logback-spring.xml
     fdkk:
@@ -43,15 +45,40 @@ spring:
                 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
+        host: 127.0.0.1
+        port: 5672
         username: admin
-        virtual-host: /
+        password: 123456
+        virtual-host: 4dkankan
+        connection-timeout: 0
+        listener:
+            simple:
+                prefetch: 1
+                max-concurrency: 2
+                acknowledge-mode: manual #开启消费者手动确认
+        #开启消息投递确认机制
+        publisher-confirm-type: correlated
+    redis:
+        database: 0
+        host: 127.0.0.1
+        jedis:
+            pool:
+                max-active: 8
+                max-idle: 8
+                max-wait: -1ms
+                min-idle: 0
+        password: 'redis123ROOT.'
+        port: 6379
+        timeout: 3000ms
 tlog:
     enable-invoke-time-print: true
     pano-migrate-scene-queue: pano-migrate-scene-queue
+queue:
+    scene-queue: queue-pano-scene
+    do-slice-queue: queue-do-slice
+    relics-init-queue: relics-init-queue
+    relics-update-name-queue: relics-update-name-queue
+    pano-migrate-scene-queue: pano-migrate-scene-queue
+    pano-paystatus-scene-queue: pano-paystatus-scene-queue
+    scene-queue-work: queue-pano-scene-work
+

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

@@ -49,15 +49,19 @@ spring:
                 enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
     rabbitmq:
-        address: ${service.ip}:5672
-        connection-timeout: 15000
+        host: ${service.ip}
+        port: 5672
+        username: guest
         password: guest
+        virtual-host: 4dkankan
+        connection-timeout: 0
+        listener:
+            simple:
+                prefetch: 1
+                max-concurrency: 2
+                acknowledge-mode: manual #开启消费者手动确认
+        #开启消息投递确认机制
         publisher-confirm-type: correlated
-        publisher-returns: true
-        template:
-            mandatory: true
-        username: guest
-        virtual-host: /
     redis:
         database: 0
         host: ${service.ip}
@@ -75,3 +79,22 @@ spring:
             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: eur.4dkankan.com
+queue:
+    scene-queue: queue-pano-scene
+    do-slice-queue: queue-do-slice
+    relics-update-name-queue: relics-update-name-queue

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

@@ -47,15 +47,19 @@ spring:
                 enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
     rabbitmq:
-        address: 127.0.0.1:5672
-        connection-timeout: 15000
+        host: 127.0.0.1
+        port: 5672
+        username: admin
         password: 123456
+        virtual-host: 4dkankan
+        connection-timeout: 0
+        listener:
+            simple:
+                prefetch: 1
+                max-concurrency: 2
+                acknowledge-mode: manual #开启消费者手动确认
+        #开启消息投递确认机制
         publisher-confirm-type: correlated
-        publisher-returns: true
-        template:
-            mandatory: true
-        username: admin
-        virtual-host: /
     redis:
         database: 0
         host: 127.0.0.1
@@ -73,3 +77,22 @@ spring:
             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: testeur.4dkankan.com
+queue:
+    scene-queue: queue-pano-scene
+    do-slice-queue: queue-do-slice
+    relics-update-name-queue: relics-update-name-queue

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

@@ -144,8 +144,8 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
         try {
             if (type.equals("pano")) {
 
-                if ((size / 1024) >= 120) {
-                    return Result.failure(ErrorEnum.FAILURE_CODE_3022.code(),"全景图文件不能超过120MB");
+                if ((size / 1024) >= 300) {
+                    return Result.failure(ErrorEnum.FAILURE_CODE_3022.code(),"全景图文件不能超过300MB");
                 }
 
                 // 此方法可以读取到图片内部结构, 可以检验非全景图