引入nacos支持

2026-01-05 16:31:17 +08:00
parent d928c11f03
commit 962a3ad07f
8 changed files with 47 additions and 47 deletions
--- a/timeline-file-service/src/main/resources/application.properties
+++ b/timeline-file-service/src/main/resources/application.properties
@@ -4,13 +4,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

@@ -22,9 +22,9 @@ spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=1000MB
 spring.servlet.multipart.max-request-size=1000MB

-# 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}
+# 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}

 # Ensure UTF-8 encoding for logs and web layer to avoid garbled Chinese output
 logging.charset.console=UTF-8
--- a/timeline-file-service/src/main/resources/bootstrap.properties
+++ b/timeline-file-service/src/main/resources/bootstrap.properties
@@ -1,16 +1,16 @@
-# Nacoséç½®
+# Nacos配置
 spring.config.import=nacos:
 spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
 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éç½®ä¸å¿å è½½éç½®æä»¶ï¼åæ¶ä¸é¢çæ³¨é
-#spring.cloud.nacos.config.shared-configs[0].data-id=common.properties
-#spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
-#spring.cloud.nacos.config.shared-configs[0].refresh=true
+# 如果需要从Nacos配置中心加载配置文件，取消下面的注释
+spring.cloud.nacos.config.shared-configs[0].data-id=timeline-file.properties
+spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
+spring.cloud.nacos.config.shared-configs[0].refresh=true
--- a/timeline-gateway-service/src/main/resources/application.properties
+++ b/timeline-gateway-service/src/main/resources/application.properties
@@ -3,11 +3,11 @@ spring.config.import=nacos:
 spring.application.name=timeline-gateway
 server.port=30000

-# 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}
+# 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}

-# ä½¿ç¨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
--- a/timeline-gateway-service/src/main/resources/bootstrap.properties
+++ b/timeline-gateway-service/src/main/resources/bootstrap.properties
@@ -11,6 +11,6 @@ spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group}
 spring.cloud.nacos.config.file-extension=properties

 # å¦æéè¦ä»Nacoséç½®ä¸å¿å è½½éç½®æä»¶ï¼åæ¶ä¸é¢çæ³¨é
-#spring.cloud.nacos.config.shared-configs[0].data-id=common.properties
-#spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
-#spring.cloud.nacos.config.shared-configs[0].refresh=true
+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
--- a/timeline-story-service/src/main/resources/application.properties
+++ b/timeline-story-service/src/main/resources/application.properties
@@ -4,7 +4,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
@@ -15,7 +15,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

@@ -28,9 +28,9 @@ spring.data.redis.port=36379
 spring.data.redis.password=123456
 spring.data.redis.timeout=5000

-# 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}
+# 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}

 # HikariCP tuning to avoid stale/closed MySQL connections
 spring.datasource.hikari.max-lifetime=600000          
--- a/timeline-story-service/src/main/resources/bootstrap.properties
+++ b/timeline-story-service/src/main/resources/bootstrap.properties
@@ -11,6 +11,6 @@ spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group}
 spring.cloud.nacos.config.file-extension=properties

 # å¦æéè¦ä»Nacoséç½®ä¸å¿å è½½éç½®æä»¶ï¼åæ¶ä¸é¢çæ³¨é
-#spring.cloud.nacos.config.shared-configs[0].data-id=common.properties
-#spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
-#spring.cloud.nacos.config.shared-configs[0].refresh=true
+spring.cloud.nacos.config.shared-configs[0].data-id=timeline-story.properties
+spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
+spring.cloud.nacos.config.shared-configs[0].refresh=true
--- a/timeline-user-service/src/main/resources/application.properties
+++ b/timeline-user-service/src/main/resources/application.properties
@@ -2,13 +2,13 @@ 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
@@ -16,35 +16,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Ã©ÂÂÃ§Â½Â®
-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}
+# 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
--- a/timeline-user-service/src/main/resources/bootstrap.properties
+++ b/timeline-user-service/src/main/resources/bootstrap.properties
@@ -11,6 +11,6 @@ spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group}
 spring.cloud.nacos.config.file-extension=properties

 # å¦æéè¦ä»Nacoséç½®ä¸å¿å è½½éç½®æä»¶ï¼åæ¶ä¸é¢çæ³¨é
-#spring.cloud.nacos.config.shared-configs[0].data-id=common.properties
-#spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
-#spring.cloud.nacos.config.shared-configs[0].refresh=true
+spring.cloud.nacos.config.shared-configs[0].data-id=timeline-user.properties
+spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP
+spring.cloud.nacos.config.shared-configs[0].refresh=true