From 7fdcecb912d7319d1227a913278530545ddf4ad0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 23 Aug 2018 22:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81@JsonView=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E8=BF=87=E6=BB=A4Json?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E8=BE=93=E5=87=BA=E5=AD=97=E6=AE=B5=E3=80=82?=
 =?UTF-8?q?=E8=BF=99=E5=9C=A8=E7=A7=BB=E5=8A=A8=E7=AB=AFAPI=E8=8A=82?=
 =?UTF-8?q?=E7=9C=81=E6=B5=81=E9=87=8F=EF=BC=8C=E9=9A=90=E7=A7=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=88=96=E7=89=B9=E6=AE=8A=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=9E=E5=B8=B8=E6=9C=89=E7=94=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jeesite/common/mapper/JsonMapper.java  | 5 ++++-
 .../src/main/java/com/jeesite/common/mapper/XmlMapper.java   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 b2cedef6..8f7b1bfe 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -11,6 +11,7 @@ import java.util.TimeZone;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -46,6 +47,8 @@ public class JsonMapper extends ObjectMapper {
 	}
 	
 	public JsonMapper() {
+		// Spring ObjectMapper 初始化配置，支持 @JsonView
+		new Jackson2ObjectMapperBuilder().configure(this);
 		// 为Null时不序列化
 		this.setSerializationInclusion(Include.NON_NULL);
 		// 允许单引号
@@ -61,7 +64,7 @@ public class JsonMapper extends ObjectMapper {
 			@Override
 			public void serialize(Object value, JsonGenerator jgen,
 					SerializerProvider provider) throws IOException, JsonProcessingException {
-				jgen.writeString("");
+				jgen.writeString(StringUtils.EMPTY);
 			}
         });
 //		// 统一默认Date类型转换格式。如果设置，Bean中的@JsonFormat将失效
diff --git a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
index ea39d863..999aef60 100644
--- a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
@@ -21,6 +21,7 @@ import org.dom4j.Element;
 import org.dom4j.Namespace;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 import com.fasterxml.jackson.databind.JavaType;
 
@@ -46,6 +47,8 @@ public class XmlMapper extends com.fasterxml.jackson.dataformat.xml.XmlMapper{
 	 * 构造方法
 	 */
 	public XmlMapper() {
+		// Spring ObjectMapper 初始化配置，支持 @JsonView
+		new Jackson2ObjectMapperBuilder().configure(this);
 		// 设置时区
 		this.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
 	}