From c6b5ce63e90a7d427c37385c79b516ab45f06913 Mon Sep 17 00:00:00 2001
From: Daniel Qian <chanjarster@gmail.com>
Date: Fri, 19 Dec 2014 12:14:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#53=20=E6=A8=A1=E6=9D=BF=20=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E5=90=8E=EF=BC=8C=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=A8=E9=80=81=E7=9A=84=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84xml=E7=BB=93=E6=9E=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=86=85=E7=9A=84msgID=20=E6=B2=A1=E6=9C=89=E8=A2=ABW?=
 =?UTF-8?q?xMpXmlMessage=20=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 8ed9e5677..d50bd8998 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
@@ -381,6 +381,8 @@ public class WxMpXmlMessage {
 
   public static WxMpXmlMessage fromXml(String xml) {
     try {
+      // 操蛋的微信，模板消息推送成功的消息是MsgID，其他消息推送过来是MsgId
+      xml = xml.replaceAll("<MsgID>", "<MsgId>").replaceAll("</MsgID>", "</MsgID>");
       return XmlTransformer.fromXml(WxMpXmlMessage.class, xml);
     } catch (JAXBException e) {
       throw new RuntimeException(e);
@@ -389,8 +391,8 @@ public class WxMpXmlMessage {
 
   public static WxMpXmlMessage fromXml(InputStream is) {
     try {
-      return XmlTransformer.fromXml(WxMpXmlMessage.class, is);
-    } catch (JAXBException e) {
+      return fromXml(IOUtils.toString(is, "UTF-8"));
+    } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }