binarywang#429 WxMaMessage增加缺少的MsgType属性

binarywang · binarywang · commit 801caca355f5 · 2018-01-25T16:51:40.000+08:00
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
@@ -45,12 +45,16 @@ public class WxMaMessage implements Serializable {
   @XStreamConverter(value = XStreamCDataConverter.class)
   private Integer createTime;
 
+  @SerializedName("MsgType")
+  @XStreamAlias("MsgType")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String msgType;
+
   @SerializedName("MsgDataFormat")
   @XStreamAlias("MsgDataFormat")
   @XStreamConverter(value = XStreamCDataConverter.class)
-  private String msgType;
+  private String msgDataFormat;
 
-  // 文本消息
   @SerializedName("Content")
   @XStreamAlias("Content")
   @XStreamConverter(value = XStreamCDataConverter.class)
@@ -61,7 +65,6 @@ public class WxMaMessage implements Serializable {
   @XStreamConverter(value = XStreamCDataConverter.class)
   private Long msgId;
 
-  // 图片消息
   @SerializedName("PicUrl")
   @XStreamAlias("PicUrl")
   @XStreamConverter(value = XStreamCDataConverter.class)
@@ -72,7 +75,6 @@ public class WxMaMessage implements Serializable {
   @XStreamConverter(value = XStreamCDataConverter.class)
   private String mediaId;
 
-  // 事件消息
   @SerializedName("Event")
   @XStreamAlias("Event")
   @XStreamConverter(value = XStreamCDataConverter.class)
@@ -92,7 +94,7 @@ public static WxMaMessage fromXml(InputStream is) {
   }
 
   /**
-   * 从加密字符串转换
+   * 从加密字符串转换.
    *
    * @param encryptedXml 密文
    * @param wxMaConfig   配置存储器对象
