From c8b8b59c508a371aa4cfc68a52ecfaff8bcdeac3 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 18 Aug 2026 15:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnacos=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-auth/src/main/resources/application.yml               | 6 +++---
 blade-service/blade-file/src/main/resources/application.yml | 6 +++---
 .../blade-openapi/src/main/resources/application.yml        | 6 +++---
 .../blade-system/src/main/resources/application.yml         | 6 +++---
 script/docker/app/docker-compose.yml                        | 3 +++
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/blade-auth/src/main/resources/application.yml b/blade-auth/src/main/resources/application.yml
index 1cbfc4b..ae6f2c9 100644
--- a/blade-auth/src/main/resources/application.yml
+++ b/blade-auth/src/main/resources/application.yml
@@ -11,9 +11,9 @@ spring:
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
   cloud:
     nacos:
-      username: ${NACOS_USERNAME:nacos}
-      password: ${NACOS_PASSWORD:nacos}
-      server-addr: ${NACOS_HOST:127.0.0.1:8848}
+      username: ${NACOS_USERNAME:${NACOS_PROD_USERNAME:nacos}}
+      password: ${NACOS_PASSWORD:${NACOS_PROD_PASSWORD:nacos}}
+      server-addr: ${NACOS_HOST:${NACOS_PROD_HOST:127.0.0.1:8848}}
       discovery:
         namespace: "${NACOS_NAMESPACE:}"
       config:
diff --git a/blade-service/blade-file/src/main/resources/application.yml b/blade-service/blade-file/src/main/resources/application.yml
index 53557ba..c182e2a 100644
--- a/blade-service/blade-file/src/main/resources/application.yml
+++ b/blade-service/blade-file/src/main/resources/application.yml
@@ -11,9 +11,9 @@ spring:
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
   cloud:
     nacos:
-      username: ${NACOS_USERNAME:nacos}
-      password: ${NACOS_PASSWORD:nacos}
-      server-addr: ${NACOS_HOST:127.0.0.1:8848}
+      username: ${NACOS_USERNAME:${NACOS_PROD_USERNAME:nacos}}
+      password: ${NACOS_PASSWORD:${NACOS_PROD_PASSWORD:nacos}}
+      server-addr: ${NACOS_HOST:${NACOS_PROD_HOST:127.0.0.1:8848}}
       discovery:
         namespace: "${NACOS_NAMESPACE:}"
       config:
diff --git a/blade-service/blade-openapi/src/main/resources/application.yml b/blade-service/blade-openapi/src/main/resources/application.yml
index af16a12..be5d93f 100644
--- a/blade-service/blade-openapi/src/main/resources/application.yml
+++ b/blade-service/blade-openapi/src/main/resources/application.yml
@@ -12,9 +12,9 @@ spring:
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
   cloud:
     nacos:
-      username: ${NACOS_USERNAME:nacos}
-      password: ${NACOS_PASSWORD:nacos}
-      server-addr: ${NACOS_HOST:127.0.0.1:8848}
+      username: ${NACOS_USERNAME:${NACOS_PROD_USERNAME:nacos}}
+      password: ${NACOS_PASSWORD:${NACOS_PROD_PASSWORD:nacos}}
+      server-addr: ${NACOS_HOST:${NACOS_PROD_HOST:127.0.0.1:8848}}
       discovery:
         namespace: "${NACOS_NAMESPACE:}"
       config:
diff --git a/blade-service/blade-system/src/main/resources/application.yml b/blade-service/blade-system/src/main/resources/application.yml
index 36bd4ce..28509cf 100644
--- a/blade-service/blade-system/src/main/resources/application.yml
+++ b/blade-service/blade-system/src/main/resources/application.yml
@@ -11,9 +11,9 @@ spring:
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
   cloud:
     nacos:
-      username: ${NACOS_USERNAME:nacos}
-      password: ${NACOS_PASSWORD:nacos}
-      server-addr: ${NACOS_HOST:127.0.0.1:8848}
+      username: ${NACOS_USERNAME:${NACOS_PROD_USERNAME:nacos}}
+      password: ${NACOS_PASSWORD:${NACOS_PROD_PASSWORD:nacos}}
+      server-addr: ${NACOS_HOST:${NACOS_PROD_HOST:127.0.0.1:8848}}
       discovery:
         namespace: "${NACOS_NAMESPACE:}"
       config:
diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml
index 2f1cdb0..aab823c 100644
--- a/script/docker/app/docker-compose.yml
+++ b/script/docker/app/docker-compose.yml
@@ -3,6 +3,9 @@ version: '3'
 x-blade-environment: &blade-environment
   - TZ=Asia/Shanghai
   - SPRING_PROFILES_ACTIVE=prod
+  - NACOS_HOST=${NACOS_PROD_HOST:?NACOS_PROD_HOST must be set}
+  - NACOS_USERNAME=${NACOS_PROD_USERNAME:-admin}
+  - NACOS_PASSWORD=${NACOS_PROD_PASSWORD:-nacosTMS}
   - NACOS_PROD_HOST=${NACOS_PROD_HOST:?NACOS_PROD_HOST must be set}
   - NACOS_PROD_USERNAME=${NACOS_PROD_USERNAME:-admin}
   - NACOS_PROD_PASSWORD=${NACOS_PROD_PASSWORD:-nacosTMS}