From 61e3163f48a8e1ee95bbed871f600f9a34c8b74a Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 22 Apr 2018 00:54:33 +0800 Subject: [PATCH] =?UTF-8?q?#531=20=E5=B0=8F=E7=A8=8B=E5=BA=8FWxMaMessage?= =?UTF-8?q?=E7=B1=BB=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=B6=88=E6=81=AF=E7=9B=B8=E5=85=B3=E7=9A=84=E5=87=A0?= =?UTF-8?q?=E4=B8=AA=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wx/miniapp/bean/WxMaMessage.java | 27 +++- .../wx/miniapp/bean/WxMaMessageTest.java | 129 ++++-------------- 2 files changed, 50 insertions(+), 106 deletions(-) diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java index 60b19bf9..d04212d4 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java @@ -42,7 +42,6 @@ public class WxMaMessage implements Serializable { @SerializedName("CreateTime") @XStreamAlias("CreateTime") - @XStreamConverter(value = XStreamCDataConverter.class) private Integer createTime; @SerializedName("MsgType") @@ -62,7 +61,6 @@ public class WxMaMessage implements Serializable { @SerializedName("MsgId") @XStreamAlias("MsgId") - @XStreamConverter(value = XStreamCDataConverter.class) private Long msgId; @SerializedName("PicUrl") @@ -80,6 +78,31 @@ public class WxMaMessage implements Serializable { @XStreamConverter(value = XStreamCDataConverter.class) private String event; + @SerializedName("Title") + @XStreamAlias("Title") + @XStreamConverter(value = XStreamCDataConverter.class) + private String title; + + @SerializedName("AppId") + @XStreamAlias("AppId") + @XStreamConverter(value = XStreamCDataConverter.class) + private String appId; + + @SerializedName("PagePath") + @XStreamAlias("PagePath") + @XStreamConverter(value = XStreamCDataConverter.class) + private String pagePath; + + @SerializedName("ThumbUrl") + @XStreamAlias("ThumbUrl") + @XStreamConverter(value = XStreamCDataConverter.class) + private String thumbUrl; + + @SerializedName("ThumbMediaId") + @XStreamAlias("ThumbMediaId") + @XStreamConverter(value = XStreamCDataConverter.class) + private String thumbMediaId; + @SerializedName("SessionFrom") @XStreamAlias("SessionFrom") @XStreamConverter(value = XStreamCDataConverter.class) diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java index fa7d3ebb..26855b36 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java @@ -12,118 +12,39 @@ import static org.testng.Assert.assertEquals; public class WxMaMessageTest { public void testFromXml() { - String xml = "" - + "" - + " " - + "1348831860" - + "" - + "" - + "1234567890123456" - + "" - + "" - + "" - + "" - + "23.134521" - + "113.358803" - + "20" - + "" - + "" - + "" - + "<![CDATA[公众平台官网链接]]>" - + "" - + "" - + "" - + "23.137466" - + "113.352425" - + "119.385040" - + "" - + " " - + " " - + "" - + "" - + " 1\n" - + " " - + " " - + " " - + " " - + " " - + "" - + "" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + "" - + ""; + String xml = "\n" + + " \n" + + " \n" + + " 1482048670\n" + + " \n" + + " \n" + + " 1234567890123456\n" + + " \n" + + " \n" + + " <![CDATA[Title]]>\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + ""; WxMaMessage wxMessage = WxMaMessage.fromXml(xml); assertEquals(wxMessage.getToUser(), "toUser"); assertEquals(wxMessage.getFromUser(), "fromUser"); - assertEquals(wxMessage.getCreateTime(), new Long(1348831860L)); + assertEquals(wxMessage.getCreateTime(),new Integer(1482048670)); assertEquals(wxMessage.getMsgType(), WxConsts.XmlMsgType.TEXT); assertEquals(wxMessage.getContent(), "this is a test"); assertEquals(wxMessage.getMsgId(), new Long(1234567890123456L)); assertEquals(wxMessage.getPicUrl(), "this is a url"); assertEquals(wxMessage.getMediaId(), "media_id"); - assertEquals(wxMessage.getEvent(), "subscribe"); - } - - public void testFromXml2() { - - String xml = "" - + "" - + " " - + "1348831860" - + "" - + "" - + "1234567890123456" - + "" - + "" - + "" - + "" - + "23.134521" - + "113.358803" - + "20" - + "" - + "" - + "" - + "<![CDATA[公众平台官网链接]]>" - + "" - + "" - + "" - + "23.137466" - + "113.352425" - + "119.385040" - + "" - + " " - + " " - + "" - + "" - + " 1\n" - + " " - + " " - + " " - + " " - + " " - + "" - + "" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + "" - + ""; - WxMaMessage wxMessage = WxMaMessage.fromXml(xml); - assertEquals(wxMessage.getToUser(), "toUser"); - assertEquals(wxMessage.getFromUser(), "fromUser"); - assertEquals(wxMessage.getCreateTime(), new Integer(1348831860)); - assertEquals(wxMessage.getMsgType(), WxConsts.XmlMsgType.TEXT); - assertEquals(wxMessage.getContent(), "this is a test"); - assertEquals(wxMessage.getMsgId(), new Long(1234567890123456L)); - assertEquals(wxMessage.getPicUrl(), "this is a url"); - assertEquals(wxMessage.getMediaId(), "media_id"); - assertEquals(wxMessage.getEvent(), "subscribe"); + assertEquals(wxMessage.getTitle(), "Title"); + assertEquals(wxMessage.getPagePath(), "PagePath"); + assertEquals(wxMessage.getThumbUrl(), "ThumbUrl"); + assertEquals(wxMessage.getThumbMediaId(), "ThumbMediaId"); + assertEquals(wxMessage.getAppId(), "AppId"); + assertEquals(wxMessage.getEvent(), "user_enter_tempsession"); + assertEquals(wxMessage.getSessionFrom(), "sessionFrom"); } }