From 570aa77f4e453a761f86a4b3f3ce2800d4fad601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=96=8C=E5=B3=B0?= <bfhuange@isoftstone.com>
Date: Mon, 10 Aug 2026 07:35:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E9=87=8D=E6=9E=84system?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/system/SystemApplication.java |  1 +
 .../src/main/resources/application-dev.yml    | 10 -------
 .../src/main/resources/application-prod.yml   | 10 -------
 .../src/main/resources/application-test.yml   | 10 -------
 .../src/main/resources/application.yml        | 26 +++++++++++++++++++
 5 files changed, 27 insertions(+), 30 deletions(-)
 delete mode 100644 blade-service/blade-system/src/main/resources/application-dev.yml
 delete mode 100644 blade-service/blade-system/src/main/resources/application-prod.yml
 delete mode 100644 blade-service/blade-system/src/main/resources/application-test.yml
 create mode 100644 blade-service/blade-system/src/main/resources/application.yml

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java b/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
index b82811e..bbad903 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
@@ -39,6 +39,7 @@ import org.springframework.context.annotation.ComponentScan;
 public class SystemApplication {
 
 	public static void main(String[] args) {
+		BladeApplication.disableNacosLaunchConfig();
 		BladeApplication.run(AppConstant.APPLICATION_SYSTEM_NAME, SystemApplication.class, args);
 	}
 
diff --git a/blade-service/blade-system/src/main/resources/application-dev.yml b/blade-service/blade-system/src/main/resources/application-dev.yml
deleted file mode 100644
index 216bd19..0000000
--- a/blade-service/blade-system/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-#服务器端口
-server:
-  port: 8106
-
-#数据源配置
-spring:
-  datasource:
-    url: ${blade.datasource.dev.url}
-    username: ${blade.datasource.dev.username}
-    password: ${blade.datasource.dev.password}
\ No newline at end of file
diff --git a/blade-service/blade-system/src/main/resources/application-prod.yml b/blade-service/blade-system/src/main/resources/application-prod.yml
deleted file mode 100644
index 25635bc..0000000
--- a/blade-service/blade-system/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-#服务器端口
-server:
-  port: 8106
-
-#数据源配置
-spring:
-  datasource:
-    url: ${blade.datasource.prod.url}
-    username: ${blade.datasource.prod.username}
-    password: ${blade.datasource.prod.password}
diff --git a/blade-service/blade-system/src/main/resources/application-test.yml b/blade-service/blade-system/src/main/resources/application-test.yml
deleted file mode 100644
index fb5cd8f..0000000
--- a/blade-service/blade-system/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-#服务器端口
-server:
-  port: 8106
-
-#数据源配置
-spring:
-  datasource:
-    url: ${blade.datasource.test.url}
-    username: ${blade.datasource.test.username}
-    password: ${blade.datasource.test.password}
diff --git a/blade-service/blade-system/src/main/resources/application.yml b/blade-service/blade-system/src/main/resources/application.yml
new file mode 100644
index 0000000..294659d
--- /dev/null
+++ b/blade-service/blade-system/src/main/resources/application.yml
@@ -0,0 +1,26 @@
+server:
+  port: 8106
+
+spring:
+  application:
+    name: blade-system
+  config:
+    import:
+      - nacos:blade.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+      - nacos:blade-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+      - nacos:third-party-api.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+      - 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}
+      discovery:
+        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+      config:
+        file-extension: yaml
+        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+  datasource:
+    url: ${blade.datasource.${spring.profiles.active}.url}
+    username: ${blade.datasource.${spring.profiles.active}.username}
+    password: ${blade.datasource.${spring.profiles.active}.password}