xiewj 5 månader sedan
förälder
incheckning
8e9609354a

+ 14 - 9
720yun_fd_consumer/gis_consumer/src/main/resources/application-pro.yml

@@ -9,15 +9,18 @@ logging:
         com:
             gis: info
     path: /root/log/${project.name}_log
-oss:
-    bucket: 4dkankan
-    domain: https://4dkk.4dage.com/
-    file:
-        path: 720yun_fd_manage/
-    key: LTAI5tSkKQbEmxxuTbPtHqK6
-    point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: JI21tOnZbJuqt5NDRcQq2qvAUA4KTf
-    type: oss
+filestorage:
+    active: oss
+    oss:
+        endpoint: http://oss-cn-shenzhen.aliyuncs.com
+        internal-endpoint: http://oss-cn-shenzhen-internal.aliyuncs.com
+        access-key: LTAI5tSkKQbEmxxuTbPtHqK6
+        access-key-secret: JI21tOnZbJuqt5NDRcQq2qvAUA4KTf
+        bucket: 4dkankan
+        bucket-custom-domain:
+            oss-xiaoan: https://ossxiaoan.4dage.com/
+            4dkankan: https://4dkk.4dage.com/
+        full-path: true
 server:
     file:
         path: /mnt/720yun_fd_manage_data/
@@ -82,3 +85,5 @@ queue:
     pano-migrate-scene-queue: pano-migrate-scene-queue
     pano-paystatus-scene-queue: pano-paystatus-scene-queue
     scene-queue-work: queue-pano-scene-work
+config:
+    bashPath: 720yun_fd_manage/

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

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