From ea35246d7639c1e4f278f894b4a5725f36ac86a9 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Fri, 9 Sep 2016 14:03:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89jackson?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E4=BB=A3=E7=A0=81=E6=94=BE=E5=9C=A8?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=AF=94=E8=BE=83=E5=A5=BD=E4=BA=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ----- .../weixin/mp/bean/WxMpXmlMessage.java | 3 --- .../mp/bean/kefu/result/WxMpKfMsgRecord.java | 6 ++--- .../util/json/WxLongTimeJsonSerializer.java | 25 ------------------- .../mp/api/impl/WxMpKefuServiceImplTest.java | 10 +++----- 5 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxLongTimeJsonSerializer.java diff --git a/pom.xml b/pom.xml index 54782c38..357471f9 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ 1.7.10 1.1.2 3.6.7 - 2.8.0 2.9.0 2.7 3.4 @@ -106,11 +105,6 @@ commons-lang3 ${commons-lang3.version} - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - redis.clients jedis diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java index 823558fe..047961ea 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java @@ -6,8 +6,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import me.chanjar.weixin.mp.util.json.WxLongTimeJsonSerializer; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -49,7 +47,6 @@ public class WxMpXmlMessage implements Serializable { private String fromUserName; @XStreamAlias("CreateTime") - @JsonSerialize(using = WxLongTimeJsonSerializer.class) private Long createTime; @XStreamAlias("MsgType") diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java index 3fe2002c..7f326ac1 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java @@ -1,11 +1,10 @@ package me.chanjar.weixin.mp.bean.kefu.result; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.gson.annotations.SerializedName; -import me.chanjar.weixin.mp.util.json.WxLongTimeJsonSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import com.google.gson.annotations.SerializedName; + /** * Created by Binary Wang on 2016/7/18. */ @@ -38,7 +37,6 @@ public class WxMpKfMsgRecord { * time 操作时间,unix时间戳 */ @SerializedName("time") - @JsonSerialize(using = WxLongTimeJsonSerializer.class) private Long time; @Override diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxLongTimeJsonSerializer.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxLongTimeJsonSerializer.java deleted file mode 100644 index 957600da..00000000 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxLongTimeJsonSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.chanjar.weixin.mp.util.json; - -import java.io.IOException; -import java.text.Format; - -import org.apache.commons.lang3.time.FastDateFormat; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; - -/** - * Created by Binary Wang on 2016/7/13. - */ -public class WxLongTimeJsonSerializer extends JsonSerializer { - private static Format DF = FastDateFormat.getInstance( - "yyyy-MM-dd HH:mm:ss"); - - @Override - public void serialize(Long value, JsonGenerator gen, - SerializerProvider serializers) - throws IOException { - gen.writeString(DF.format(value * 1000)); - } -} diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java index c1812ab0..45ad1804 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java @@ -9,8 +9,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Guice; import org.testng.annotations.Test; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; import me.chanjar.weixin.common.exception.WxErrorException; @@ -150,20 +148,20 @@ public class WxMpKefuServiceImplTest { } @Test - public void testKfMsgList() throws WxErrorException, JsonProcessingException { + public void testKfMsgList() throws WxErrorException { Date startTime = DateTime.now().minusDays(1).toDate(); Date endTime = DateTime.now().minusDays(0).toDate(); WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime,endTime, 1L, 50); Assert.assertNotNull(result); - System.err.println(new ObjectMapper().writeValueAsString(result)); + System.err.println(result); } @Test - public void testKfMsgListAll() throws WxErrorException, JsonProcessingException { + public void testKfMsgListAll() throws WxErrorException { Date startTime = DateTime.now().minusDays(1).toDate(); Date endTime = DateTime.now().minusDays(0).toDate(); WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime,endTime); Assert.assertNotNull(result); - System.err.println(new ObjectMapper().writeValueAsString(result)); + System.err.println(result); } }