浏览代码

配置修改

lyhzzz 3 年之前
父节点
当前提交
fef2ec4a13

+ 3 - 3
pom.xml

@@ -17,19 +17,19 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>ZJ-2.0.0-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
-            <version>ZJ-2.0.0-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-db</artifactId>
-            <version>ZJ-2.0.0-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fdkankan</groupId>

+ 0 - 40
src/main/resources/bootstrap-dev-eur.yml

@@ -1,40 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-user
-  cloud:
-    nacos:
-      config:
-        server-addr: 192.168.0.47:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-user.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-rabbitmq-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
-
-
-
-

+ 0 - 40
src/main/resources/bootstrap-pro-eur.yml

@@ -1,40 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-user
-  cloud:
-    nacos:
-      config:
-        server-addr: 172.31.42.151:8848
-        file-extension: yaml
-        namespace: 4dkankan-pro-eur
-        extension-configs:
-          - data-id: 4dkankan-center-user.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-rabbitmq-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: 172.31.42.151:8848
-        namespace: 4dkankan-pro-eur
-
-
-
-

+ 10 - 10
src/main/resources/bootstrap-dev.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-test
         extension-configs:
           - data-id: 4dkankan-center-app.yaml
             group: DEFAULT_GROUP
@@ -20,24 +20,24 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
+          - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-mongodb-config.yaml
+          - data-id: other-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-satoken-config.yaml
+          - data-id: common-upload-config.yaml
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-dev
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: 4dkankan-test
+
+
+
+
 
 
 

+ 2 - 40
src/main/resources/bootstrap.yml

@@ -1,43 +1,5 @@
 spring:
-  application:
-    name: 4dkankan-center-app
-  cloud:
-    nacos:
-      config:
-        server-addr: 120.24.144.164:8848
-        file-extension: yaml
-        namespace: 4dkankan-qczj
-        extension-configs:
-          - data-id: 4dkankan-center-app.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config-52.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-rabbitmq-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: ${spring.cloud.nacos.config.server-addr}
-        namespace: 4dkankan-qczj
-
-
-
-
-
+  profiles:
+    active: test