引入nacos支持
All checks were successful
test/timeline-server/pipeline/head This commit looks good

This commit is contained in:
2026-01-07 13:47:22 +08:00
parent d155ebc18f
commit cededdaaa9
3 changed files with 8 additions and 22 deletions

View File

@@ -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 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

View File

@@ -18,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
# 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
@@ -54,18 +50,14 @@ spring.data.redis.timeout=5000
#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
# 10 minutes, below MySQL wait_timeout
spring.datasource.hikari.max-lifetime=600000
# 5 minutes, recycle idle connections
spring.datasource.hikari.idle-timeout=300000
# fast validation timeout
spring.datasource.hikari.validation-timeout=3000
# wait up to 30s for a connection
spring.datasource.hikari.connection-timeout=30000
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
server.servlet.encoding.charset=UTF-8
server.servlet.encoding.enabled=true
server.servlet.encoding.force=true

View File

@@ -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 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