From 28293383dd88404985cb0bb2cd7d4877eac4ea88 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 10 Jun 2025 11:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/mapper/JsonMapper.java | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index c3ad30ef..6e3ee3b0 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -83,36 +83,6 @@ public class JsonMapper extends ObjectMapper {
 			@Serial
 			private static final long serialVersionUID = 1L;
 			private static final String[] pattern = new String[] {"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS"};
-			private static class JeeSiteJsonSerializer extends JsonSerializer<Date> {
-				private final String pattern;
-				private JeeSiteJsonSerializer(String pattern) {
-					this.pattern = pattern;
-				}
-				@Override
-				public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-					if (value != null){
-						if (StringUtils.isNotBlank(pattern)) {
-							gen.writeString(DateUtils.formatDate(value, pattern));
-						} else {
-							gen.writeString(DateUtils.formatDateTime(value));
-						}
-					}
-				}
-			}
-			private static class JeeSiteJsonDeserializer extends JsonDeserializer<Date> {
-				private final String pattern;
-				private JeeSiteJsonDeserializer(String pattern) {
-					this.pattern = pattern;
-				}
-				@Override
-				public Date deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-					if (StringUtils.isNotBlank(pattern)) {
-						return DateUtils.parseDate(parser.getText(), pattern);
-					} else {
-						return DateUtils.parseDate(parser.getText());
-					}
-				}
-			}
 			@Override
 			public Object findSerializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
@@ -154,6 +124,38 @@ public class JsonMapper extends ObjectMapper {
 		return this;
 	}
 
+	public static final class JeeSiteJsonSerializer extends JsonSerializer<Date> {
+		private final String pattern;
+		public JeeSiteJsonSerializer(String pattern) {
+			this.pattern = pattern;
+		}
+		@Override
+		public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+			if (value != null){
+				if (StringUtils.isNotBlank(pattern)) {
+					gen.writeString(DateUtils.formatDate(value, pattern));
+				} else {
+					gen.writeString(DateUtils.formatDateTime(value));
+				}
+			}
+		}
+	}
+
+	public static final class JeeSiteJsonDeserializer extends JsonDeserializer<Date> {
+		private final String pattern;
+		public JeeSiteJsonDeserializer(String pattern) {
+			this.pattern = pattern;
+		}
+		@Override
+		public Date deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+			if (StringUtils.isNotBlank(pattern)) {
+				return DateUtils.parseDate(parser.getText(), pattern);
+			} else {
+				return DateUtils.parseDate(parser.getText());
+			}
+		}
+	}
+
 	/**
 	 * 开启将空值转换为空字符串
 	 * @author ThinkGem