diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml index 3ec7ad289..d1fd48aed 100644 --- a/yudao-gateway/src/main/resources/application.yaml +++ b/yudao-gateway/src/main/resources/application.yaml @@ -1,21 +1,23 @@ spring: application: - name: gateway-server + name: ${APP_NAME:gateway-server} profiles: - active: dev + active: ${SPRING_PROFILES_ACTIVE:dev} config: import: + - optional:nacos:common.yaml - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml cloud: nacos: - server-addr: nacos:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:nacos:8848} + namespace: ${NACOS_NAMESPACE:dev} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} config: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} file-extension: yaml diff --git a/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/application.yaml b/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/application.yaml index 2b62fa627..9a4772eb3 100644 --- a/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/application.yaml +++ b/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/application.yaml @@ -1,21 +1,23 @@ spring: application: - name: bpm-server + name: ${APP_NAME:bpm-server} profiles: - active: dev + active: ${SPRING_PROFILES_ACTIVE:dev} config: import: + - optional:nacos:common.yaml - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml cloud: nacos: - server-addr: nacos:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:nacos:8848} + namespace: ${NACOS_NAMESPACE:dev} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} config: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} file-extension: yaml diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/application.yaml b/yudao-module-infra/yudao-module-infra-server/src/main/resources/application.yaml index 613eb883f..67d09be3e 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/main/resources/application.yaml +++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/application.yaml @@ -1,21 +1,23 @@ spring: application: - name: infra-server + name: ${APP_NAME:infra-server} profiles: - active: dev + active: ${SPRING_PROFILES_ACTIVE:dev} config: import: + - optional:nacos:common.yaml - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml cloud: nacos: - server-addr: nacos:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:nacos:8848} + namespace: ${NACOS_NAMESPACE:dev} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} config: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} file-extension: yaml diff --git a/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml b/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml index 7f0ee93e1..38b14beb8 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml +++ b/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml @@ -1,21 +1,23 @@ spring: application: - name: system-server + name: ${APP_NAME:system-server} profiles: - active: dev + active: ${SPRING_PROFILES_ACTIVE:dev} config: import: + - optional:nacos:common.yaml - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml cloud: nacos: - server-addr: nacos:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:nacos:8848} + namespace: ${NACOS_NAMESPACE:dev} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} config: - namespace: dev + namespace: ${NACOS_NAMESPACE:dev} file-extension: yaml