chore: 合并 master 分支

src/main/java/com/youlai/boot/config/CaffeineConfig.java

@@ -0,0 +1,37 @@
+package com.youlai.boot.config;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * caffeine缓存配置
+ *
+ * @author Theo
+ * @since 2025-01-22 17:40:23
+ */
+@Slf4j
+@Configuration
+public class CaffeineConfig {
+
+    @Value("${spring.cache.caffeine.spec}")
+    private String caffeineSpec;
+
+    /**
+     * 缓存管理器
+     *
+     * @return CacheManager 缓存管理器
+     */
+    @Bean
+    public CacheManager cacheManager() {
+        CaffeineCacheManager caffeineCacheManager = new CaffeineCacheManager();
+        Caffeine<Object, Object> caffeineBuilder = Caffeine.from(caffeineSpec);
+        caffeineCacheManager.setCaffeine(caffeineBuilder);
+        return caffeineCacheManager;
+    }
+}
+

src/main/java/com/youlai/boot/config/WebMvcConfig.java

@@ -1,13 +1,11 @@
 package com.youlai.boot.config;
 
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
@@ -25,20 +23,22 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.TimeZone;
 
 /**
- * WebMvc 自动装配配置
+ * Web 配置
  *
- * @author Ray
+ * @author Ray.Hao
  * @since 2020/10/16
  */
 @Configuration
 @Slf4j
 public class WebMvcConfig implements WebMvcConfigurer {
 
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
     /**
      * 配置消息转换器
      *
@@ -47,21 +47,26 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
         MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
-        ObjectMapper objectMapper = jackson2HttpMessageConverter.getObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule());
-        objectMapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
-        objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
+        ObjectMapper objectMapper = new ObjectMapper();
 
-        // 处理 Long 和 BigInteger 类型，避免前端精度丢失问题
+        // 注册 JavaTimeModule（替代手动注册 LocalDateTimeSerializer）
+        JavaTimeModule javaTimeModule = new JavaTimeModule();
+        // 返回指定字符串格式
+        javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DATE_TIME_FORMATTER));
+        // 反序列化，接受前端传来的格式
+        javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DATE_TIME_FORMATTER));
+        objectMapper.registerModule(javaTimeModule);
+
+        // 配置全局日期格式和时区
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+
+        // 处理 Long/BigInteger 的精度问题
         SimpleModule simpleModule = new SimpleModule();
         simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
         simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
-        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(
-                DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN).withZone(ZoneId.of( "GMT+8"))
-        ));
         objectMapper.registerModule(simpleModule);
-        objectMapper.setDateFormat(new SimpleDateFormat(DatePattern.NORM_DATETIME_PATTERN));
-
 
         jackson2HttpMessageConverter.setObjectMapper(objectMapper);
         converters.add(1, jackson2HttpMessageConverter);