From d155ebc18f433564a9db425590783bb18ba2b749 Mon Sep 17 00:00:00 2001 From: jianghao <332515344@qq.com> Date: Tue, 6 Jan 2026 11:26:13 +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 | 25 +++++---- .../src/main/resources/application.properties | 31 +++++++---- .../src/main/resources/application.properties | 55 +++++++++++++------ 3 files changed, 74 insertions(+), 37 deletions(-) diff --git a/timeline-file-service/src/main/resources/application.properties b/timeline-file-service/src/main/resources/application.properties index bef2c07..9a14d25 100644 --- a/timeline-file-service/src/main/resources/application.properties +++ b/timeline-file-service/src/main/resources/application.properties @@ -1,35 +1,40 @@ +# Application name spring.application.name=timeline-file + +# 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 -# MinIO 配置 + +# MinIO configuration for file storage minio.endpoint=http://59.80.22.43:9000 minio.accessKey=9ttSGjvQxek2uKKlhpqI minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex minio.bucketName=timeline-test -# MyBatis 配置 +# MyBatis configuration mybatis.mapper-locations=classpath:mapper/*.xml 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 configuration server.port=30002 + +# File upload configuration spring.servlet.multipart.enabled=true spring.servlet.multipart.max-file-size=1000MB spring.servlet.multipart.max-request-size=1000MB -# Nacos配置 - 这些配置将被环境变量覆盖,但保ç•ä½ä¸å¤‡ç”¨ +# Timezone configuration +spring.jackson.time-zone=GMT+8 +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss + +# 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} -# Ensure UTF-8 encoding for logs and web layer to avoid garbled Chinese output +# 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 diff --git a/timeline-gateway-service/src/main/resources/application.properties b/timeline-gateway-service/src/main/resources/application.properties index 664d96e..e1c0360 100644 --- a/timeline-gateway-service/src/main/resources/application.properties +++ b/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 -# 网关配置 -spring.cloud.gateway.discovery.locator.enabled=true +# Gateway discovery locator configuration - enables route discovery via service registry +spring.cloud.gateway.discovery.locator.enabled=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 2c15938..7d73fa4 100644 --- a/timeline-story-service/src/main/resources/application.properties +++ b/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 -spring.web.mvc.use-trailing-slash=true +# MyBatis configuration +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 +# 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 + +# Server configuration +server.port=30001 +spring.web.mvc.use-trailing-slash=true + +# LocalDateTime serialization configuration +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss +spring.jackson.time-zone=UTC + +# File upload configuration spring.servlet.multipart.enabled=true spring.servlet.multipart.max-file-size=1000MB 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 tuning 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 +# 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 -# Ensure UTF-8 encoding for logs and web layer to avoid garbled Chinese output +# Additional UTF-8 encoding configuration logging.charset.console=UTF-8 logging.charset.file=UTF-8 server.tomcat.uri-encoding=UTF-8