diff --git a/B3WeChat.Web/Pages/WeChatReceive.cs b/B3WeChat.Web/Pages/WeChatReceive.cs index ea91edf..256c6d8 100644 --- a/B3WeChat.Web/Pages/WeChatReceive.cs +++ b/B3WeChat.Web/Pages/WeChatReceive.cs @@ -47,9 +47,9 @@ namespace BWP.Web.Pages object result = InOutMessageUtil.GetMessage(context.Request); - if (result is ReceivedMsg) + if (result is ReceivedTextMsg) { - ReceivedMsg msg = result as ReceivedMsg; + ReceivedTextMsg msg = result as ReceivedTextMsg; string str = string.Empty; if (msg != null) { @@ -70,9 +70,9 @@ namespace BWP.Web.Pages } } - else if (result is QRCodeMessage) + else if (result is ReceivedEventMsg) { - QRCodeMessage msg = result as QRCodeMessage; + ReceivedEventMsg msg = result as ReceivedEventMsg; if (msg.IsUnsubscribeEvent()) { Unsubscribe(msg.FromUserName); diff --git a/B3WeChat/B3WeChat.csproj b/B3WeChat/B3WeChat.csproj index 12cd065..20e4a47 100644 --- a/B3WeChat/B3WeChat.csproj +++ b/B3WeChat/B3WeChat.csproj @@ -121,9 +121,9 @@ - + - + diff --git a/B3WeChat/Entities/QRCodeMessage.cs b/B3WeChat/Entities/ReceivedEventMsg.cs similarity index 98% rename from B3WeChat/Entities/QRCodeMessage.cs rename to B3WeChat/Entities/ReceivedEventMsg.cs index 0e2d55b..e9e4b6b 100644 --- a/B3WeChat/Entities/QRCodeMessage.cs +++ b/B3WeChat/Entities/ReceivedEventMsg.cs @@ -11,7 +11,7 @@ namespace BWP.B3WeChat.Entities /// [XmlRoot("xml")] [Serializable] - public class QRCodeMessage + public class ReceivedEventMsg { /// /// 开发者微信号 diff --git a/B3WeChat/Entities/ReceivedMsg.cs b/B3WeChat/Entities/ReceivedTextMsg.cs similarity index 97% rename from B3WeChat/Entities/ReceivedMsg.cs rename to B3WeChat/Entities/ReceivedTextMsg.cs index 385dcdd..8c68ebb 100644 --- a/B3WeChat/Entities/ReceivedMsg.cs +++ b/B3WeChat/Entities/ReceivedTextMsg.cs @@ -11,7 +11,7 @@ namespace BWP.B3WeChat.Entities /// [XmlRoot("xml")] [Serializable] - public class ReceivedMsg + public class ReceivedTextMsg { /// /// 开发者微信号 diff --git a/B3WeChat/Utils/InOutMessageUtil.cs b/B3WeChat/Utils/InOutMessageUtil.cs index 359ed6a..4483f1f 100644 --- a/B3WeChat/Utils/InOutMessageUtil.cs +++ b/B3WeChat/Utils/InOutMessageUtil.cs @@ -212,11 +212,11 @@ namespace BWP.B3WeChat.Utils MessageType type = XmlUtil.Deserialize(xmlData); if (type.MsgType == MsgType.文本) { - obj = XmlUtil.Deserialize(xmlData); + obj = XmlUtil.Deserialize(xmlData); } else if (type.MsgType == MsgType.事件) { - obj = XmlUtil.Deserialize(xmlData); + obj = XmlUtil.Deserialize(xmlData); } return obj; } diff --git a/Test/UnitTest1.cs b/Test/UnitTest1.cs index b1c1648..d148109 100644 --- a/Test/UnitTest1.cs +++ b/Test/UnitTest1.cs @@ -21,7 +21,7 @@ namespace Test 1234567890123456 "; - var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedMsg; + var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedTextMsg; Assert.IsNotNull(message); Assert.AreEqual("toUser", message.ToUserName); @@ -43,7 +43,7 @@ namespace Test "; - var message = InOutMessageUtil.ParseWeChatMessage(xml) as QRCodeMessage; + var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedEventMsg; Assert.IsNotNull(message); Assert.AreEqual("toUser", message.ToUserName); @@ -68,7 +68,7 @@ namespace Test "; - var message = InOutMessageUtil.ParseWeChatMessage(xml) as QRCodeMessage; + var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedEventMsg; Assert.IsNotNull(message); Assert.AreEqual("toUser", message.ToUserName); @@ -95,7 +95,7 @@ namespace Test "; - var message = InOutMessageUtil.ParseWeChatMessage(xml) as QRCodeMessage; + var message = InOutMessageUtil.ParseWeChatMessage(xml) as ReceivedEventMsg; Assert.IsNotNull(message); Assert.AreEqual("toUser", message.ToUserName); Assert.AreEqual("fromUser", message.FromUserName);