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 365012d7..dc1bcb4a 100644 --- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java +++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java @@ -79,37 +79,6 @@ public class JsonMapper extends ObjectMapper { .getProperty("lang.defaultTimeZone", "GMT+08:00"))); this.setAnnotationIntrospector(new JacksonAnnotationIntrospector() { private static final long serialVersionUID = 1L; - private final String[] pattern = new String[] {"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS"}; - class JeeSiteJsonSerializer extends JsonSerializer { - 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)); - } - } - } - } - class JeeSiteJsonDeserializer extends JsonDeserializer { - 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) { @@ -151,6 +120,38 @@ public class JsonMapper extends ObjectMapper { return this; } + private static final String[] pattern = new String[] {"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS"}; + private static final class JeeSiteJsonSerializer extends JsonSerializer { + 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 final class JeeSiteJsonDeserializer extends JsonDeserializer { + 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()); + } + } + } + /** * 开启将空值转换为空字符串 * @author ThinkGem