xiewj 6 月之前
父节点
当前提交
fafd381f99

+ 13 - 10
720yun_fd_consumer/gis_consumer/src/main/resources/application-sit.yml

@@ -9,15 +9,17 @@ logging:
         com:
         com:
             gis: info
             gis: info
     path: /root/data/${project.name}_log
     path: /root/data/${project.name}_log
-oss:
-    bucket: oss-xiaoan
-    domain: https://ossxiaoan.4dage.com/
-    file:
-        path: 720yun_fd_manage/
-    key: LTAI5tJwboCj3r4vUNkSmbyX
-    point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
-    type: oss
+filestorage:
+    active: oss
+    oss:
+        endpoint: http://oss-cn-shenzhen.aliyuncs.com
+        internal-endpoint: http://oss-cn-shenzhen-internal.aliyuncs.com
+        access-key: LTAI5tJwboCj3r4vUNkSmbyX
+        access-key-secret: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
+        bucket: oss-xiaoan
+        bucket-custom-domain:
+            qjkankan: https://ossxiaoan.4dage.com/
+        full-path: true
 server:
 server:
     file:
     file:
         path: /mnt/720yun_fd_manage_data/
         path: /mnt/720yun_fd_manage_data/
@@ -68,4 +70,5 @@ queue:
     pano-migrate-scene-queue: pano-migrate-scene-queue
     pano-migrate-scene-queue: pano-migrate-scene-queue
     pano-paystatus-scene-queue: pano-paystatus-scene-queue
     pano-paystatus-scene-queue: pano-paystatus-scene-queue
     scene-queue-work: queue-pano-scene-work
     scene-queue-work: queue-pano-scene-work
-
+config:
+    bashPath: ${project.name}/

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

@@ -64,7 +64,6 @@ spring:
         publisher-confirm-type: correlated
         publisher-confirm-type: correlated
 tlog:
 tlog:
     enable-invoke-time-print: true
     enable-invoke-time-print: true
-    pano-migrate-scene-queue: pano-migrate-scene-queue
 config:
 config:
     bashPath: 720yun_fd_manage/
     bashPath: 720yun_fd_manage/
 queue:
 queue:

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

@@ -10,15 +10,17 @@ logging:
     level:
     level:
         com:
         com:
             gis: debug
             gis: debug
-oss:
-    bucket: oss-xiaoan
-    domain: https://ossxiaoan.4dage.com/
-    file:
-        path: ${project.name}/
-    key: LTAI5tJwboCj3r4vUNkSmbyX
-    point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
-    type: oss
+filestorage:
+    active: oss
+    oss:
+        endpoint: http://oss-cn-shenzhen.aliyuncs.com
+        internal-endpoint: http://oss-cn-shenzhen-internal.aliyuncs.com
+        access-key: LTAI5tJwboCj3r4vUNkSmbyX
+        access-key-secret: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
+        bucket: oss-xiaoan
+        bucket-custom-domain:
+            qjkankan: https://ossxiaoan.4dage.com/
+        full-path: true
 server:
 server:
     domain: ''
     domain: ''
     file:
     file:
@@ -96,3 +98,5 @@ queue:
     scene-queue: queue-pano-scene
     scene-queue: queue-pano-scene
     do-slice-queue: queue-do-slice
     do-slice-queue: queue-do-slice
     relics-update-name-queue: relics-update-name-queue
     relics-update-name-queue: relics-update-name-queue
+config:
+    bashPath: ${project.name}/