From cededdaaa9c4ab75a0a0106f6623b00179c8973a Mon Sep 17 00:00:00 2001
From: jianghao <332515344@qq.com>
Date: Wed, 7 Jan 2026 13:47:22 +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/bootstrap.properties   |  3 ---
 .../src/main/resources/application.properties | 24 +++++++------------
 .../src/main/resources/bootstrap.properties   |  3 ---
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/timeline-file-service/src/main/resources/bootstrap.properties b/timeline-file-service/src/main/resources/bootstrap.properties
index 311449a..38eb0ee 100644
--- a/timeline-file-service/src/main/resources/bootstrap.properties
+++ b/timeline-file-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 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-story-service/src/main/resources/application.properties b/timeline-story-service/src/main/resources/application.properties
index 7d73fa4..405ad35 100644
--- a/timeline-story-service/src/main/resources/application.properties
+++ b/timeline-story-service/src/main/resources/application.properties
@@ -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
\ No newline at end of file
diff --git a/timeline-story-service/src/main/resources/bootstrap.properties b/timeline-story-service/src/main/resources/bootstrap.properties
index 2923d76..09f6482 100644
--- a/timeline-story-service/src/main/resources/bootstrap.properties
+++ b/timeline-story-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 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