引入nacos支持

timeline-gateway-service/src/main/resources/application.properties

@@ -1,12 +1,16 @@
-# application.properties
+# Application configuration for Gateway service
+
+# Application name
 spring.application.name=timeline-gateway
+
+# Server configuration
 server.port=30000
 
-# 时区配置
+# Timezone configuration
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 
-# UTF-8编码配置
+# UTF-8 encoding configuration to ensure proper Chinese character handling
 logging.charset.console=UTF-8
 logging.charset.file=UTF-8
 server.tomcat.uri-encoding=UTF-8
@@ -14,47 +18,54 @@ server.servlet.encoding.charset=UTF-8
 server.servlet.encoding.enabled=true
 server.servlet.encoding.force=true
 
-# 日志配置
+# Logging configuration
 logging.level.org.springframework.cloud.gateway=DEBUG
 logging.level.com.timeline.gateway=DEBUG
 logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 
+# Nacos configuration - commented out to use environment variables
+#spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
+#spring.cloud.nacos.config.enabled=false
 
-# 使用Nacos进行服务发现
+# Gateway routes configuration for different services
+# Story service route
 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/**
 spring.cloud.gateway.routes[0].filters[0]=StripPrefix=0
 
+# File service route
 spring.cloud.gateway.routes[1].id=file-service
 spring.cloud.gateway.routes[1].uri=lb://timeline-file
 spring.cloud.gateway.routes[1].predicates[0]=Path=/file/**
 spring.cloud.gateway.routes[1].filters[0]=StripPrefix=0
 
+# User service WebSocket route
 spring.cloud.gateway.routes[2].id=user-service-ws
 spring.cloud.gateway.routes[2].uri=lb://timeline-user
 spring.cloud.gateway.routes[2].predicates[0]=Path=/user/ws/**
 spring.cloud.gateway.routes[2].filters[0]=StripPrefix=0
 
+# User service route
 spring.cloud.gateway.routes[3].id=user-service
 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 configuration
 jwt.secret=6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a
 jwt.expiration=86400
 
-# Redis
+# Redis configuration
 spring.data.redis.host=localhost
 spring.data.redis.port=36379
 spring.data.redis.password=123456
 spring.data.redis.timeout=5000
 
-# Actuator配置
+# Actuator configuration for monitoring
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
 
-# 网关配置
+# Gateway discovery locator configuration - enables route discovery via service registry
 spring.cloud.gateway.discovery.locator.enabled=true

timeline-story-service/src/main/resources/application.properties

@@ -1,47 +1,68 @@
+# Application name
 spring.application.name=timeline-story
+
+# Database connection settings
 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.configuration.log4j=true
-# 时区配置
-spring.jackson.time-zone=GMT+8
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 
-server.port=30001
+# MyBatis configuration
-spring.web.mvc.use-trailing-slash=true
+mybatis.configuration.log4j=true
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.timeline.user.entity
 mybatis.configuration.mapUnderscoreToCamelCase=true
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+# Logging configuration
 logging.level.com.timeline.user.dao=DEBUG
 logging.level.org.mybatis=DEBUG
 
-spring.servlet.multipart.enabled=true
+# Timezone configuration
-spring.servlet.multipart.max-file-size=1000MB
+spring.jackson.time-zone=GMT+8
-spring.servlet.multipart.max-request-size=1000MB
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 
-spring.data.redis.host=127.0.0.1
+# UTF-8 encoding configuration to ensure proper Chinese character handling
-spring.data.redis.port=36379
+logging.charset.console=UTF-8
-spring.data.redis.password=123456
+logging.charset.file=UTF-8
-spring.data.redis.timeout=5000
+server.tomcat.uri-encoding=UTF-8
-
+server.servlet.encoding.charset=UTF-8
-
+server.servlet.encoding.enabled=true
-# HikariCP tuning to avoid stale/closed MySQL connections
+server.servlet.encoding.force=true
-spring.datasource.hikari.max-lifetime=600000          
+
-# 10 minutes, below MySQL wait_timeout
+# Server configuration
-spring.datasource.hikari.idle-timeout=300000          
+server.port=30001
-# 5 minutes, recycle idle connections
+spring.web.mvc.use-trailing-slash=true
-spring.datasource.hikari.validation-timeout=3000      
+
-# fast validation timeout
+# LocalDateTime serialization configuration
-spring.datasource.hikari.connection-timeout=30000     
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-# wait up to 30s for a connection
+spring.jackson.time-zone=UTC
-spring.datasource.hikari.connection-test-query=SELECT 1
+
-spring.datasource.hikari.test-on-borrow=true
+# File upload configuration
-spring.datasource.hikari.test-while-idle=true
+spring.servlet.multipart.enabled=true
-
+spring.servlet.multipart.max-file-size=1000MB
-# Ensure UTF-8 encoding for logs and web layer to avoid garbled Chinese output
+spring.servlet.multipart.max-request-size=1000MB
+
+# Redis configuration
+spring.data.redis.host=127.0.0.1
+spring.data.redis.port=36379
+spring.data.redis.password=123456
+spring.data.redis.timeout=5000
+
+# Nacos configuration - commented out to avoid Nacos config loading issues
+#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 connection pool configuration to avoid stale/closed MySQL connections
+spring.datasource.hikari.max-lifetime=600000          # 10 minutes, below MySQL wait_timeout
+spring.datasource.hikari.idle-timeout=300000          # 5 minutes, recycle idle connections
+spring.datasource.hikari.validation-timeout=3000      # fast validation timeout
+spring.datasource.hikari.connection-timeout=30000     # wait up to 30s for a connection
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.test-on-borrow=true
+spring.datasource.hikari.test-while-idle=true
+
+# Additional UTF-8 encoding configuration
 logging.charset.console=UTF-8
 logging.charset.file=UTF-8
 server.tomcat.uri-encoding=UTF-8