Browse Source

Merge branch 'hotfix-版本bug创建空的临时目录-dsx' into test

dsx 2 năm trước cách đây
mục cha
commit
e0ad1f0092
2 tập tin đã thay đổi với 10 bổ sung26 xóa
  1. 6 5
      pom.xml
  2. 4 21
      src/main/resources/bootstrap-prod-eur.yml

+ 6 - 5
pom.xml

@@ -79,6 +79,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
+
         </dependency>
 
         <dependency>
@@ -109,11 +110,11 @@
             <version>1.3.6</version>
         </dependency>
 
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-client</artifactId>
-            <version>2.3.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>de.codecentric</groupId>-->
+<!--            <artifactId>spring-boot-admin-client</artifactId>-->
+<!--            <version>2.3.1</version>-->
+<!--        </dependency>-->
 
 
     </dependencies>

+ 4 - 21
src/main/resources/bootstrap-prod-eur.yml

@@ -3,31 +3,14 @@ spring:
     name: 4dkankan-gateway
   cloud:
     nacos:
+      server-addr: 172.31.47.163:8848
+      namespace: 4dkankan-v4-prod-eur
       config:
-        server-addr: 172.31.42.151:8848
         file-extension: yaml
-        namespace: 4dkankan-pro-eur
-        extension-configs:
-          - data-id: 4dkankan-gateway.yaml
-            group: DEFAULT_GROUP
-            refresh: true
+        namespace: ${spring.cloud.nacos.namespace}
         shared-configs:
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
-
-          - data-id: common-mongodb-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
       discovery:
-        server-addr: 172.31.42.151:8848
-        namespace: 4dkankan-pro-eur
-
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include: '*'
-#  endpoint:
-#    health:
-#      show-details: ALWAYS
+        namespace: ${spring.cloud.nacos.namespace}