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 @@ conf application.yml - bootstrap.yml logback-spring.xml service.properties 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