From cf16e31632fa5c293c978d27e64dfec7b08e3335 Mon Sep 17 00:00:00 2001
From: dingzhongyuan <dingzhongyuan@kinggrid.com>
Date: 星期二, 22 六月 2021 11:31:04 +0800
Subject: [PATCH] 多数据源替换成dynamic-datasource

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java
index 95e3d43..8334b2a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.common.utils.JsonUtils;
@@ -13,6 +12,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import java.time.LocalDateTime;
+import java.util.TimeZone;
 
 /**
  * jackson 閰嶇疆
@@ -34,12 +34,10 @@
 				ObjectMapper objectMapper = (ObjectMapper) bean;
 				// 鍏ㄥ眬閰嶇疆搴忓垪鍖栬繑鍥� JSON 澶勭悊
 				SimpleModule simpleModule = new SimpleModule();
-				//JSON Long ==> String 鎶婃墍鏈夋暟瀛楄繑鍥炲彉涓哄瓧绗︿覆杩斿洖閫傞厤鍓嶇Long鍨嬪け鐪熼棶棰�
-				simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-				simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
 				simpleModule.addSerializer(LocalDateTime.class, LocalDateTimeSerializer.INSTANCE);
 				simpleModule.addDeserializer(LocalDateTime.class, LocalDateTimeDeserializer.INSTANCE);
 				objectMapper.registerModule(simpleModule);
+				objectMapper.setTimeZone(TimeZone.getDefault());
 				JsonUtils.init(objectMapper);
 				log.info("鍒濆鍖� jackson 閰嶇疆");
 				return bean;

--
Gitblit v1.9.3