diff --git a/timeline-file-service/src/main/resources/application.properties b/timeline-file-service/src/main/resources/application.properties index d3f5733..bef2c07 100644 --- a/timeline-file-service/src/main/resources/application.properties +++ b/timeline-file-service/src/main/resources/application.properties @@ -16,6 +16,10 @@ mybatis.type-aliases-package=com.timeline.file.entity mybatis.configuration.mapUnderscoreToCamelCase=true +# 时区配置 +spring.jackson.time-zone=GMT+8 +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss + server.port=30002 spring.servlet.multipart.enabled=true spring.servlet.multipart.max-file-size=1000MB diff --git a/timeline-file-service/src/main/resources/bootstrap.properties b/timeline-file-service/src/main/resources/bootstrap.properties index 110f15e..311449a 100644 --- a/timeline-file-service/src/main/resources/bootstrap.properties +++ b/timeline-file-service/src/main/resources/bootstrap.properties @@ -1,17 +1,17 @@ -# Nacos配置 +# 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 dataId 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 \ No newline at end of file diff --git a/timeline-gateway-service/src/main/resources/application.properties b/timeline-gateway-service/src/main/resources/application.properties index 5314fec..80f3af1 100644 --- a/timeline-gateway-service/src/main/resources/application.properties +++ b/timeline-gateway-service/src/main/resources/application.properties @@ -1,13 +1,31 @@ # application.properties -# 移除spring.config.import以避免Nacos配置加载问题 +spring.config.import=optional:nacos: spring.application.name=timeline-gateway server.port=30000 -# Nacos配置 - 通过环境变量配置 +# 时区配置 +spring.jackson.time-zone=GMT+8 +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss + +# UTF-8编码配置 +logging.charset.console=UTF-8 +logging.charset.file=UTF-8 +server.tomcat.uri-encoding=UTF-8 +server.servlet.encoding.charset=UTF-8 +server.servlet.encoding.enabled=true +server.servlet.encoding.force=true + +# 日志配置 +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配置 - 通过环境变量配置 #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 +46,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 +56,9 @@ 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 +# 网关配置 +spring.cloud.gateway.discovery.locator.enabled=true diff --git a/timeline-gateway-service/src/main/resources/bootstrap.properties b/timeline-gateway-service/src/main/resources/bootstrap.properties index 35bf986..14a7347 100644 --- a/timeline-gateway-service/src/main/resources/bootstrap.properties +++ b/timeline-gateway-service/src/main/resources/bootstrap.properties @@ -1,17 +1,14 @@ -# 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配置中心 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=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 f13443d..42693fd 100644 --- a/timeline-story-service/src/main/resources/application.properties +++ b/timeline-story-service/src/main/resources/application.properties @@ -3,8 +3,12 @@ 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 +# 时区配置 +spring.jackson.time-zone=GMT+8 +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss + server.port=30001 spring.web.mvc.use-trailing-slash=true mybatis.mapper-locations=classpath:mapper/*.xml @@ -14,10 +18,6 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl logging.level.com.timeline.user.dao=DEBUG logging.level.org.mybatis=DEBUG -# LocalDateTime 序列化配置 -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=UTC - spring.servlet.multipart.enabled=true spring.servlet.multipart.max-file-size=1000MB spring.servlet.multipart.max-request-size=1000MB @@ -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 927384c..2923d76 100644 --- a/timeline-story-service/src/main/resources/bootstrap.properties +++ b/timeline-story-service/src/main/resources/bootstrap.properties @@ -1,18 +1,17 @@ -# Nacos配置 +# 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 dataId 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 -# 只保留服务状态,如果使用配置中心 diff --git a/timeline-user-service/src/main/resources/application.properties b/timeline-user-service/src/main/resources/application.properties index c3c7927..b9ac998 100644 --- a/timeline-user-service/src/main/resources/application.properties +++ b/timeline-user-service/src/main/resources/application.properties @@ -1,51 +1,62 @@ -# 移除spring.config.import以避免Nacos配置加载问题 +# Application name spring.application.name=timeline-user + +# Server configuration server.port=30003 - -# 数据库配置 +# 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 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 -# JWT 配置 +# JWT configuration jwt.secret=6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a -# Access Token 过期时间(秒),默认15分钟 +# Access Token expiration time (in seconds, 15 minutes) jwt.access-expiration=900 -# Refresh Token 过期时间(秒),默认7天 +# Refresh Token expiration time (in seconds, 7 days) jwt.refresh-expiration=604800 -# 日志配置 -logging.level.com.timeline.user=DEBUG - -# Redis (本地默认配置,按需调整) +# 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配置 - 这些配置将被环境变量覆盖,但保留作ä¸å¤‡ç”¨ +# 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} -# 连接池 +# Timezone configuration +spring.jackson.time-zone=GMT+8 +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss + +# 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 +server.servlet.encoding.charset=UTF-8 +server.servlet.encoding.enabled=true +server.servlet.encoding.force=true + +# HikariCP connection pool configuration spring.datasource.hikari.maximum-pool-size=10 spring.datasource.hikari.minimum-idle=2 +# 5 minutes spring.datasource.hikari.idle-timeout=300000 -# 5分钟,低于 wait_timeout +# 30 minutes, below MySQL wait_timeout spring.datasource.hikari.max-lifetime=1800000 -# 30分钟,低于 MySQL wait_timeout(默认8小时) +# wait up to 30s for a connection spring.datasource.hikari.connection-timeout=30000 -# 获取连接超时 spring.datasource.hikari.keepalive-time=0 -# 如 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 a5b3b6e..6e06541 100644 --- a/timeline-user-service/src/main/resources/bootstrap.properties +++ b/timeline-user-service/src/main/resources/bootstrap.properties @@ -1,17 +1,14 @@ -# 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配置中心 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=timeline-user.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