From e64a88942aca1596ed3a84cffdd2606d63b27e2a Mon Sep 17 00:00:00 2001
From: k kfluous <kkfluous@kdeMacBook-Air.local>
Date: Wed, 11 Mar 2026 20:00:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE=20Nacos=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20common.yaml=20=E5=85=B1=E4=BA=AB=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yaml          | 16 +++++++++-------
 .../src/main/resources/application.yaml          | 16 +++++++++-------
 .../src/main/resources/application.yaml          | 16 +++++++++-------
 .../src/main/resources/application.yaml          | 16 +++++++++-------
 4 files changed, 36 insertions(+), 28 deletions(-)

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