From 4a7c1356d17234d205670b5b1a40e67c55a41073 Mon Sep 17 00:00:00 2001
From: jianghao <332515344@qq.com>
Date: Tue, 6 Jan 2026 09:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5nacos=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties |  6 ++--
 .../src/main/resources/bootstrap.properties   |  4 +--
 .../src/main/resources/application.properties | 12 ++++----
 .../src/main/resources/bootstrap.properties   |  9 +++---
 .../src/main/resources/application.properties |  6 ++--
 .../src/main/resources/bootstrap.properties   |  4 +--
 .../src/main/resources/application.properties | 28 +++++++++----------
 .../src/main/resources/bootstrap.properties   |  4 +--
 8 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/timeline-file-service/src/main/resources/application.properties b/timeline-file-service/src/main/resources/application.properties
index bbc350a..d3f5733 100644
--- a/timeline-file-service/src/main/resources/application.properties
+++ b/timeline-file-service/src/main/resources/application.properties
@@ -3,13 +3,13 @@ spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=WoCloud@9ol7uj
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-# MinIO 配置
+# MinIO 配置
 minio.endpoint=http://59.80.22.43:9000
 minio.accessKey=9ttSGjvQxek2uKKlhpqI
 minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex
 minio.bucketName=timeline-test
 
-# MyBatis 配置
+# MyBatis 配置
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.timeline.file.entity
 
@@ -21,7 +21,7 @@ spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=1000MB
 spring.servlet.multipart.max-request-size=1000MB
 
-# Nacos配置 - 这些配置将被环境变量覆盖，但保ç•ä½ä¸å¤‡ç”¨
+# Nacos配置 - 这些配置将被环境变量覆盖，但保ç•ä½ä¸å¤‡ç”¨
 #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
 #spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr}
 
diff --git a/timeline-file-service/src/main/resources/bootstrap.properties b/timeline-file-service/src/main/resources/bootstrap.properties
index 42907bf..110f15e 100644
--- a/timeline-file-service/src/main/resources/bootstrap.properties
+++ b/timeline-file-service/src/main/resources/bootstrap.properties
@@ -1,6 +1,6 @@
 # Nacos配置
-# 完全移除spring.config.import，只通过环境变量配置Nacos
-spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
+spring.config.import=optional:nacos:
+spring.cloud.nacos.discovery.server-addr=host.docker.internal:8848
 spring.cloud.nacos.config.enabled=false
 spring.cloud.nacos.discovery.namespace=public
 spring.cloud.nacos.discovery.group=DEFAULT_GROUP
diff --git a/timeline-gateway-service/src/main/resources/application.properties b/timeline-gateway-service/src/main/resources/application.properties
index 1b72f1b..5314fec 100644
--- a/timeline-gateway-service/src/main/resources/application.properties
+++ b/timeline-gateway-service/src/main/resources/application.properties
@@ -1,13 +1,13 @@
 # application.properties
-# 移除spring.config.import以避免Nacos配置加载问题
+# 移除spring.config.import以避免Nacos配置加载问题
 spring.application.name=timeline-gateway
 server.port=30000
 
-# Nacos配置 - 通过环境变量配置
+# Nacos配置 - 通过环境变量配置
 #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
 #spring.cloud.nacos.config.enabled=false
 
-# 使用Nacos服务发现进行路由
+# 使用Nacos服务发现进行路由
 spring.cloud.gateway.routes[0].id=story-service
 spring.cloud.gateway.routes[0].uri=lb://timeline-story
 spring.cloud.gateway.routes[0].predicates[0]=Path=/story/**
@@ -28,7 +28,7 @@ spring.cloud.gateway.routes[3].uri=lb://timeline-user
 spring.cloud.gateway.routes[3].predicates[0]=Path=/user/**
 spring.cloud.gateway.routes[3].filters[0]=StripPrefix=0
 
-# JWT配置
+# JWT配置
 jwt.secret=6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a
 jwt.expiration=86400
 
@@ -38,10 +38,10 @@ spring.data.redis.port=36379
 spring.data.redis.password=123456
 spring.data.redis.timeout=5000
 
-# Actuator配置
+# Actuator配置
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
 
-# 日志配置
+# 日志配置
 logging.level.org.springframework.cloud.gateway=DEBUG
 logging.level.com.timeline.gateway=DEBUG
\ No newline at end of file
diff --git a/timeline-gateway-service/src/main/resources/bootstrap.properties b/timeline-gateway-service/src/main/resources/bootstrap.properties
index 0ded099..35bf986 100644
--- a/timeline-gateway-service/src/main/resources/bootstrap.properties
+++ b/timeline-gateway-service/src/main/resources/bootstrap.properties
@@ -1,16 +1,17 @@
-# Nacos配置
-spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
+# Nacos配置
+spring.config.import=optional:nacos:
+spring.cloud.nacos.discovery.server-addr=host.docker.internal:8848
 spring.cloud.nacos.config.enabled=false
 spring.cloud.nacos.discovery.namespace=public
 spring.cloud.nacos.discovery.group=DEFAULT_GROUP
 
-# Nacos配置中心
+# Nacos配置中心
 spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr}
 spring.cloud.nacos.config.namespace=${spring.cloud.nacos.discovery.namespace}
 spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group}
 spring.cloud.nacos.config.file-extension=properties
 
-# 如果需要从Nacos配置中心加载配置文件，取消下面的注释
+# 如果需要从Nacos配置中心加载配置文件，取消下面的注释
 spring.cloud.nacos.config.shared-configs[0].data-id=timeline-gateway.properties
 spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
 spring.cloud.nacos.config.shared-configs[0].refresh=true
\ No newline at end of file
diff --git a/timeline-story-service/src/main/resources/application.properties b/timeline-story-service/src/main/resources/application.properties
index c791458..f13443d 100644
--- a/timeline-story-service/src/main/resources/application.properties
+++ b/timeline-story-service/src/main/resources/application.properties
@@ -3,7 +3,7 @@ spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=WoCloud@9ol7uj
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-# MyBatis 配置
+# MyBatis 配置
 mybatis.configuration.log4j=true
 server.port=30001
 spring.web.mvc.use-trailing-slash=true
@@ -14,7 +14,7 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 logging.level.com.timeline.user.dao=DEBUG
 logging.level.org.mybatis=DEBUG
 
-# LocalDateTime 序列化配置
+# LocalDateTime 序列化配置
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=UTC
 
@@ -27,7 +27,7 @@ spring.data.redis.port=36379
 spring.data.redis.password=123456
 spring.data.redis.timeout=5000
 
-# Nacos配置 - 这些配置将被环境åè¦†ç›–，但保留作ä¸å¤‡ç”¨
+# Nacos配置 - 这些配置将被环境åè¦†ç›–，但保留作ä¸å¤‡ç”¨
 #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
 #spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr}
 
diff --git a/timeline-story-service/src/main/resources/bootstrap.properties b/timeline-story-service/src/main/resources/bootstrap.properties
index b556313..927384c 100644
--- a/timeline-story-service/src/main/resources/bootstrap.properties
+++ b/timeline-story-service/src/main/resources/bootstrap.properties
@@ -1,6 +1,6 @@
 # Nacos配置
-# 完全移除spring.config.import，只通过环境变量配置Nacos
-spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
+spring.config.import=optional:nacos:
+spring.cloud.nacos.discovery.server-addr=host.docker.internal:8848
 spring.cloud.nacos.config.enabled=false
 spring.cloud.nacos.discovery.namespace=public
 spring.cloud.nacos.discovery.group=DEFAULT_GROUP
diff --git a/timeline-user-service/src/main/resources/application.properties b/timeline-user-service/src/main/resources/application.properties
index 156dd24..c3c7927 100644
--- a/timeline-user-service/src/main/resources/application.properties
+++ b/timeline-user-service/src/main/resources/application.properties
@@ -1,15 +1,15 @@
-# 移除spring.config.import以避免Nacos配置加载问题
+# 移除spring.config.import以避免Nacos配置加载问题
 spring.application.name=timeline-user
 server.port=30003
 
 
-# 数据库配置
+# 数据库配置
 spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=WoCloud@9ol7uj
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
-# MyBatis 配置
+# MyBatis 配置
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.timeline.user.entity
 mybatis.configuration.mapUnderscoreToCamelCase=true
@@ -17,35 +17,35 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 logging.level.com.timeline.user.dao=DEBUG
 logging.level.org.mybatis=DEBUG
 
-# JWT 配置
+# JWT 配置
 jwt.secret=6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a
-# Access Token 过期时间（秒），默认15分钟
+# Access Token 过期时间（秒），默认15分钟
 jwt.access-expiration=900
-# Refresh Token 过期时间（秒），默认7天
+# Refresh Token 过期时间（秒），默认7天
 jwt.refresh-expiration=604800
 
-# 日志配置
+# 日志配置
 logging.level.com.timeline.user=DEBUG
 
-# Redis (本地默认配置，按需调整)
+# Redis (本地默认配置，按需调整)
 spring.data.redis.host=127.0.0.1
 spring.data.redis.port=36379
 spring.data.redis.password=123456
 spring.data.redis.timeout=5000
 
-# Nacos配置 - 这些配置将被环境变量覆盖，但保留作ä¸å¤‡ç”¨
+# Nacos配置 - 这些配置将被环境变量覆盖，但保留作ä¸å¤‡ç”¨
 #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
 #spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr}
 
-# 连接池
+# 连接池
 spring.datasource.hikari.maximum-pool-size=10
 spring.datasource.hikari.minimum-idle=2
 spring.datasource.hikari.idle-timeout=300000        
-# 5分钟，低于 wait_timeout
+# 5分钟，低于 wait_timeout
 spring.datasource.hikari.max-lifetime=1800000       
-# 30分钟，低于 MySQL wait_timeout（默认8小时）
+# 30分钟，低于 MySQL wait_timeout（默认8小时）
 spring.datasource.hikari.connection-timeout=30000   
-# 获取连接超时
+# 获取连接超时
 spring.datasource.hikari.keepalive-time=0           
-# 如 MySQL wait_timeout 较短，可设 180000(3分钟)
+# 如 MySQL wait_timeout 较短，可设 180000(3分钟)
 spring.datasource.hikari.validation-timeout=5000
\ No newline at end of file
diff --git a/timeline-user-service/src/main/resources/bootstrap.properties b/timeline-user-service/src/main/resources/bootstrap.properties
index 536b022..a5b3b6e 100644
--- a/timeline-user-service/src/main/resources/bootstrap.properties
+++ b/timeline-user-service/src/main/resources/bootstrap.properties
@@ -1,6 +1,6 @@
 # Nacos配置
-# 完全移除spring.config.import，只通过环境变量配置Nacos
-spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
+spring.config.import=optional:nacos:
+spring.cloud.nacos.discovery.server-addr=host.docker.internal:8848
 spring.cloud.nacos.config.enabled=false
 spring.cloud.nacos.discovery.namespace=public
 spring.cloud.nacos.discovery.group=DEFAULT_GROUP