From abe485a26747660f903e1849105ddf5eebd09b86 Mon Sep 17 00:00:00 2001
From: zhangjf <zhangjf@example.com>
Date: Tue, 24 Feb 2026 18:37:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=90=88=E5=B9=B6=20bootstrap.yml?=
 =?UTF-8?q?=20=E5=88=B0=20application.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 Nacos 配置改为环境变量形式（更灵活）
- 添加 config.enabled: false 配置
- 删除 bootstrap.yml 文件
- 更新 assembly.xml 移除 bootstrap.yml 引用
---
 worklog-api/src/main/assembly/assembly.xml    |  1 -
 .../src/main/resources/application.yml        | 22 ++++++++++---------
 worklog-api/src/main/resources/bootstrap.yml  | 16 --------------
 3 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 worklog-api/src/main/resources/bootstrap.yml

diff --git a/worklog-api/src/main/assembly/assembly.xml b/worklog-api/src/main/assembly/assembly.xml
index 1b34dfe..5e8c142 100644
--- a/worklog-api/src/main/assembly/assembly.xml
+++ b/worklog-api/src/main/assembly/assembly.xml
@@ -58,7 +58,6 @@
             <outputDirectory>conf</outputDirectory>
             <includes>
                 <include>application.yml</include>
-                <include>bootstrap.yml</include>
                 <include>logback-spring.xml</include>
                 <include>service.properties</include>
             </includes>
diff --git a/worklog-api/src/main/resources/application.yml b/worklog-api/src/main/resources/application.yml
index 810cc8c..0d1c9b5 100644
--- a/worklog-api/src/main/resources/application.yml
+++ b/worklog-api/src/main/resources/application.yml
@@ -41,18 +41,20 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
-        username: nacos
-        password: nacos
-        namespace: worklog-dev
-        group: DEFAULT_GROUP
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
+        username: ${NACOS_USERNAME:nacos}
+        password: ${NACOS_PASSWORD:nacos}
+        namespace: ${NACOS_NAMESPACE:worklog-dev}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-        server-addr: localhost:8848
-        username: nacos
-        password: nacos
-        namespace: worklog-dev
+        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
+        username: ${NACOS_USERNAME:nacos}
+        password: ${NACOS_PASSWORD:nacos}
+        namespace: ${NACOS_NAMESPACE:worklog-dev}
         file-extension: yml
-        group: DEFAULT_GROUP
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
+        # 是否启用 Nacos 配置中心（默认不启用）
+        enabled: false
 
 server:
   port: 8200
diff --git a/worklog-api/src/main/resources/bootstrap.yml b/worklog-api/src/main/resources/bootstrap.yml
deleted file mode 100644
index 4453768..0000000
--- a/worklog-api/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-spring:
-  application:
-    name: worklog-api
-  
-  # Nacos 配置中心（可选，如果使用配置中心）
-  cloud:
-    nacos:
-      config:
-        server-addr: ${NACOS_SERVER_ADDR:localhost:8848}
-        namespace: ${NACOS_NAMESPACE:worklog-dev}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:nacos}
-        file-extension: yml
-        # 是否启用 Nacos 配置中心（默认不启用）
-        enabled: false