diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java index 95488cc..4973065 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java @@ -62,7 +62,9 @@ public class CmsWebsiteServiceImplHelper { vo.setDomain(website.getDomain()); vo.setRunning(website.getRunning()); vo.setVersion(website.getVersion()); - vo.setCreateTime(String.valueOf(website.getCreateTime())); + if (website.getCreateTime() != null) { + vo.setCreateTime(website.getCreateTime().format(formatter)); + } // 时间字段 - 格式化为字符串 if (website.getExpirationTime() != null) { diff --git a/src/main/java/com/gxwebsoft/common/core/config/JacksonConfig.java b/src/main/java/com/gxwebsoft/common/core/config/JacksonConfig.java index eebe6c5..87bb915 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/JacksonConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/JacksonConfig.java @@ -1,13 +1,22 @@ package com.gxwebsoft.common.core.config; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; /** * Jackson配置类 - * 确保JSR310模块被正确注册 + * 确保JSR310模块被正确注册到ObjectMapper中,并配置自定义时间格式 * * @author WebSoft * @since 2025-01-12 @@ -15,12 +24,51 @@ import org.springframework.context.annotation.Configuration; @Configuration public class JacksonConfig { + private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + /** + * 配置ObjectMapper,确保JSR310模块被正确注册并设置自定义时间格式 + */ + @Bean + @Primary + @ConditionalOnMissingBean + public ObjectMapper objectMapper() { + ObjectMapper mapper = new ObjectMapper(); + + // 创建自定义的JavaTimeModule + JavaTimeModule javaTimeModule = new JavaTimeModule(); + + // 配置LocalDateTime的序列化和反序列化格式 + javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DATE_TIME_FORMATTER)); + javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DATE_TIME_FORMATTER)); + + // 注册自定义的JSR310模块 + mapper.registerModule(javaTimeModule); + + // 禁用将日期写为时间戳 + mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + + // 忽略未知属性 + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + + // 允许空字符串作为null对象 + mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true); + + return mapper; + } + /** - * 确保JavaTimeModule被注册 + * 确保JavaTimeModule被注册(保留原有Bean) */ @Bean @ConditionalOnMissingBean public JavaTimeModule javaTimeModule() { - return new JavaTimeModule(); + JavaTimeModule module = new JavaTimeModule(); + + // 配置LocalDateTime的序列化和反序列化格式 + module.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DATE_TIME_FORMATTER)); + module.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DATE_TIME_FORMATTER)); + + return module; } }