xiewj 5 months ago
parent
commit
ca1a9cc7d8

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

@@ -9,15 +9,16 @@ logging:
         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
+filestorage:
+    active: aws
+    aws:
+        endpoint: http://testeurs3.4dkankan.com
+        internal-endpoint: http://testeurs3.4dkankan.com
+        access-key: AKIAWCV5QFZ3ZNELKYUY
+        access-key-secret: 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
+        bucket: test-4dkankan
+        bucket-custom-domain:
+            test-4dkankan: https://testeurs3.4dkankan.com
 server:
     file:
         path: /mnt/720yun_fd_manage_data/
@@ -55,8 +56,8 @@ spring:
             simple:
                 prefetch: 1
                 max-concurrency: 2
-                acknowledge-mode: manual #开启消费者手动确认
-        #开启消息投递确认机制
+                acknowledge-mode: manual #锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟街讹拷确锟斤拷
+        #锟斤拷锟斤拷锟斤拷息投锟斤拷确锟较伙拷锟斤拷
         publisher-confirm-type: correlated
     redis:
         database: 0
@@ -81,4 +82,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/

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

@@ -6,19 +6,21 @@ logging:
         level: INFO
         maxHistory: 180
     file:
-        path: /home/log/${project.name}_log
+        path: /root/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
+filestorage:
+    active: aws
+    aws:
+        endpoint: http://testeurs3.4dkankan.com
+        internal-endpoint: http://testeurs3.4dkankan.com
+        access-key: AKIAWCV5QFZ3ZNELKYUY
+        access-key-secret: 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
+        bucket: test-4dkankan
+        bucket-custom-domain:
+            test-4dkankan: https://testeurs3.4dkankan.com
+        full-path: true
 server:
     domain: ''
     file:
@@ -95,4 +97,6 @@ forest:
 queue:
     scene-queue: queue-pano-scene
     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}/