From 15d6d20c8f5e36f79b420cf6ebdcbbf41cb2cdc8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 18:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
index 4433951..0814d9a 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
@@ -1,9 +1,15 @@
package com.ruoyi.common.security.config;
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.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.TimeZone;
/**
@@ -13,6 +19,8 @@
*/
public class ApplicationConfig
{
+ private static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+ private static final String DATE_PATTERN = "yyyy-MM-dd";
/**
* 时区配置
*/
@@ -28,4 +36,20 @@
builder.serializerByType(Long.class, ToStringSerializer.instance);
};
}
+ /**
+ * 统一配置
+ */
+ @Bean
+ public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
+ JavaTimeModule module = new JavaTimeModule();
+ LocalDateTimeDeserializer localDateTimeDeserializer = new LocalDateTimeDeserializer(
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ module.addDeserializer(LocalDateTime.class, localDateTimeDeserializer);
+ return builder -> {
+ builder.simpleDateFormat(DATE_TIME_PATTERN);
+ builder.serializers(new LocalDateSerializer(DateTimeFormatter.ofPattern(DATE_PATTERN)));
+ builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)));
+ builder.modules(module);
+ };
+ }
}
--
Gitblit v1.7.1