Переглянути джерело

多环境配置
场景下载

dengsixing 3 роки тому
батько
коміт
54ec76b730

+ 2 - 43
4dkankan-center-modeling/src/main/resources/bootstrap.yml

@@ -1,44 +1,3 @@
 spring:
-  application:
-    name: 4dkankan-center-modeling
-  cloud:
-    nacos:
-      config:
-        server-addr: 192.168.0.47:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-modeling.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-        metadata:
-          management:
-            context-path: ${server.servlet.context-path}/actuator
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS
+  profiles:
+    active: dev

+ 2 - 56
4dkankan-center-platform/src/main/resources/bootstrap.yml

@@ -1,57 +1,3 @@
 spring:
-  application:
-    name: 4dkankan-center-platform
-  cloud:
-    nacos:
-      config:
-        server-addr: 192.168.0.47:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-platform.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: sms-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-      discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-        metadata:
-          management:
-            context-path: ${server.servlet.context-path}/actuator
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS
+  profiles:
+    active: dev

+ 56 - 0
4dkankan-center-scene-download/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,56 @@
+spring:
+  jackson:
+    serialization:
+      #关闭jackson转换 实体属性空值校验
+      FAIL_ON_EMPTY_BEANS: false
+  application:
+    name: 4dkankan-center-scene-download
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs:
+          - data-id: 4dkankan-center-scene-download.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848
+        namespace: 4dkankan-dev
+path:
+  v3school: /downloads/v3local/
+  zip-root: wwwroot/
+  zip-local: /downloads/scenes/%s.zip
+  zip-oss: downloads/scenes/%s.zip
+
+download:
+  config:
+    server-url: https://test.4dkankan.com/
+    public-url: https://4dkk.4dage.com/
+    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
+#    server-url: https://eur.4dkankan.com/
+#    public-url: https://eurs3.4dkankan.com/
+#    resource-url: https://eurs3.4dkankan.com/
+    exe-name: start-browser.bat
+    exe-content: | # | 表示不转义特殊字符
+      taskkill /f /t /im http.exe
+      start http://127.0.0.1:9000/spc.html?m=%s
+      http.exe -nc -p 9000 -r wwwroot
+
+
+
+

+ 56 - 0
4dkankan-center-scene-download/src/main/resources/bootstrap-pro.yml

@@ -0,0 +1,56 @@
+spring:
+  jackson:
+    serialization:
+      #关闭jackson转换 实体属性空值校验
+      FAIL_ON_EMPTY_BEANS: false
+  application:
+    name: 4dkankan-center-scene-download
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs:
+          - data-id: 4dkankan-center-scene-download.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848
+        namespace: public
+path:
+  v3school: /downloads/v3local/
+  zip-root: wwwroot/
+  zip-local: /downloads/scenes/%s.zip
+  zip-oss: downloads/scenes/%s.zip
+
+download:
+  config:
+    server-url: https://test.4dkankan.com/
+    public-url: https://4dkk.4dage.com/
+    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
+#    server-url: https://eur.4dkankan.com/
+#    public-url: https://eurs3.4dkankan.com/
+#    resource-url: https://eurs3.4dkankan.com/
+    exe-name: start-browser.bat
+    exe-content: | # | 表示不转义特殊字符
+      taskkill /f /t /im http.exe
+      start http://127.0.0.1:9000/spc.html?m=%s
+      http.exe -nc -p 9000 -r wwwroot
+
+
+
+

+ 56 - 0
4dkankan-center-scene-download/src/main/resources/bootstrap-test.yml

@@ -0,0 +1,56 @@
+spring:
+  jackson:
+    serialization:
+      #关闭jackson转换 实体属性空值校验
+      FAIL_ON_EMPTY_BEANS: false
+  application:
+    name: 4dkankan-center-scene-download
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs:
+          - data-id: 4dkankan-center-scene-download.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848
+        namespace: 4dkankan-test
+path:
+  v3school: /downloads/v3local/
+  zip-root: wwwroot/
+  zip-local: /downloads/scenes/%s.zip
+  zip-oss: downloads/scenes/%s.zip
+
+download:
+  config:
+    server-url: https://test.4dkankan.com/
+    public-url: https://4dkk.4dage.com/
+    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
+#    server-url: https://eur.4dkankan.com/
+#    public-url: https://eurs3.4dkankan.com/
+#    resource-url: https://eurs3.4dkankan.com/
+    exe-name: start-browser.bat
+    exe-content: | # | 表示不转义特殊字符
+      taskkill /f /t /im http.exe
+      start http://127.0.0.1:9000/spc.html?m=%s
+      http.exe -nc -p 9000 -r wwwroot
+
+
+
+

+ 2 - 55
4dkankan-center-scene-download/src/main/resources/bootstrap.yml

@@ -1,56 +1,3 @@
 spring:
-  jackson:
-    serialization:
-      #关闭jackson转换 实体属性空值校验
-      FAIL_ON_EMPTY_BEANS: false
-  application:
-    name: 4dkankan-center-scene-download
-  cloud:
-    nacos:
-      config:
-        server-addr: 192.168.0.47:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-scene-download.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-path:
-  v3school: /downloads/v3local/
-  zip-root: wwwroot/
-  zip-local: /downloads/scenes/%s.zip
-  zip-oss: downloads/scenes/%s.zip
-
-download:
-  config:
-    server-url: https://test.4dkankan.com/
-    public-url: https://4dkk.4dage.com/
-    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
-#    server-url: https://eur.4dkankan.com/
-#    public-url: https://eurs3.4dkankan.com/
-#    resource-url: https://eurs3.4dkankan.com/
-    exe-name: start-browser.bat
-    exe-content: | # | 表示不转义特殊字符
-      taskkill /f /t /im http.exe
-      start http://127.0.0.1:9000/spc.html?m=%s
-      http.exe -nc -p 9000 -r wwwroot
-
-
-
-
+  profiles:
+    active: dev

+ 2 - 103
4dkankan-center-scene/src/main/resources/bootstrap.yml

@@ -1,104 +1,3 @@
 spring:
-#  jackson:
-#    serialization:
-#      #关闭jackson转换 实体属性空值校验
-#      FAIL_ON_EMPTY_BEANS: false
-#    date-format: yyyy-MM-dd HH:mm:ss
-#    time-zone: GMT+8
-  application:
-    name: 4dkankan-center-scene
-#  servlet:
-#    multipart:
-#      # 设置单个文件大小
-#      max-file-size: 50MB
-#      # 设置单次请求文件的总大小
-#      max-request-size: 50MB
-#  mvc:
-#    throw-exception-if-no-handler-found: true
-  cloud:
-    nacos:
-      config:
-        server-addr: 192.168.0.47:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-        metadata:
-          management:
-            context-path: ${server.servlet.context-path}/actuator
-    sentinel:
-      transport:
-        dashboard: 192.168.0.47:8888
-#        dashboard: localhost:8888
-        heartbeat-interval-ms: 500
-        port: 8719
-      eager: true #取消sentinel控制台懒加载
-      #sentinel配置持久化nacos
-      datasource:
-        #流控规则
-        flow:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-flow-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: flow
-        #熔断规则
-        degrade:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-degrade-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级,如果没有开启,feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS
-
-
-
-
-
+  profiles:
+    active: dev

+ 1 - 1
pom.xml

@@ -13,7 +13,7 @@
         <module>4dkankan-center-modeling</module>
         <module>4dkankan-center-statistics</module>
         <module>4dkankan-pay</module>
-<!--      <module>4dkankan-center-scene-download</module>-->
+        <module>4dkankan-center-scene-download</module>
     </modules>
 
     <parent>