raojiang 6 mesi fa
parent
commit
dccb0a9ec3

+ 3 - 5
services/load-transfer-bf/src/main/resources/config/dev/bootstrap-dev.yml → services/load-transfer-bf/src/main/resources/bootstrap-dev.yaml

@@ -2,7 +2,7 @@
 NACOS_HOST: 192.168.10.176
 NACOS_PORT: 18848
 NACOS_PWD: FHZG@nacos2025
-NAMESPACE: 682eb787-7279-47d8-8516-79b521f96690
+NAMESPACE: 88b0baca-b7b1-496c-8ebd-bbfea7959c49
 
 server:
   servlet:
@@ -30,9 +30,7 @@ spring:
         username: ${spring.cloud.nacos.discovery.username}
         password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
-        file-extension: yml
+        file-extension: yaml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置
-          - hussar-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
-          - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置
+          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置

+ 1 - 1
services/load-transfer-bf/src/main/resources/config/local/bootstrap-local.yml → services/load-transfer-bf/src/main/resources/bootstrap-local.yaml

@@ -32,5 +32,5 @@ spring:
         namespace: ${spring.cloud.nacos.discovery.namespace}
         file-extension: yaml
         shared-configs:
-          - application.${spring.cloud.nacos.config.file-extension} #公共配置
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
           - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置

+ 0 - 0
services/load-transfer-bf/src/main/resources/config/uat/bootstrap-uat.yml → services/load-transfer-bf/src/main/resources/bootstrap-uat.yaml


+ 3 - 5
services/load-transfer-mq/src/main/resources/config/dev/bootstrap-dev.yml → services/load-transfer-mq/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@
 NACOS_HOST: 192.168.10.176
 NACOS_PORT: 18848
 NACOS_PWD: FHZG@nacos2025
-NAMESPACE: 682eb787-7279-47d8-8516-79b521f96690
+NAMESPACE: 88b0baca-b7b1-496c-8ebd-bbfea7959c49
 
 server:
   servlet:
@@ -32,9 +32,7 @@ spring:
         username: ${spring.cloud.nacos.discovery.username}
         password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
-        file-extension: yml
+        file-extension: yaml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置
-          - hussar-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
-          - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置
+          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置

+ 1 - 1
services/load-transfer-mq/src/main/resources/config/local/bootstrap-local.yml → services/load-transfer-mq/src/main/resources/bootstrap-local.yml

@@ -35,4 +35,4 @@ spring:
         file-extension: yaml
         shared-configs:
           - application.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置
+          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置

+ 2 - 4
services/load-transfer-mq/src/main/resources/config/uat/bootstrap-uat.yml → services/load-transfer-mq/src/main/resources/bootstrap-uat.yml

@@ -28,9 +28,7 @@ spring:
         username: ${spring.cloud.nacos.discovery.username}
         password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
-        file-extension: yml
+        file-extension: yaml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置
-          - hussar-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
-          - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置
+          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置