From d3f0c66fd9046e7d78d933293db2af402f8362fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8F=82=E6=BA=90?= <623417969@qq.com> Date: Mon, 29 Mar 2021 16:01:34 +0800 Subject: [PATCH] =?UTF-8?q?fixbug=EF=BC=9Aviewminiprogram=20->=20view=5Fmi?= =?UTF-8?q?niprogram?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServerMessages/From/FromEventTypes.cs | 20 ++++++++++++------- .../From/FromViewMiniprogramEvent.cs | 14 ++++++------- .../ServerMessages/ServerMessageHandler.cs | 7 +++---- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromEventTypes.cs b/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromEventTypes.cs index a66b722..61708ff 100644 --- a/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromEventTypes.cs +++ b/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromEventTypes.cs @@ -1,16 +1,16 @@ // ====================================================================== -// -// Copyright (C) 2018-2068 湖南心莱信息科技有限公司 +// +// Copyright (C) 2018-2068 湖南心莱信息科技有限公司 // All rights reserved -// +// // filename : FromEventTypes.cs // description : -// +// // created by codelove1314@live.cn at 2021-02-09 10:48:26 // Blog:http://www.cnblogs.com/codelove/ // GitHub : https://github.com/xin-lai // Home:http://xin-lai.com -// +// // ======================================================================= namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.From @@ -27,31 +27,37 @@ namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.From /// [XmlEnum(Name = "subscribe")] subscribe = 0, + /// /// 取消关注 /// [XmlEnum(Name = "unsubscribe")] unsubscribe = 1, + /// /// 扫描带参数二维码 /// [XmlEnum(Name = "scan")] scan = 2, + /// /// 上报地理位置 /// [XmlEnum(Name = "location")] location = 3, + /// /// 点击菜单拉取消息时的事件推送 /// [XmlEnum(Name = "click")] click = 4, + /// /// 点击菜单跳转链接时的事件推送 /// [XmlEnum(Name = "view")] view = 5, + /// /// 模板消息发送完成 /// @@ -62,6 +68,6 @@ namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.From /// 点击菜单跳转小程序的事件推送 /// [XmlEnum(Name = "view_miniprogram")] - viewminiprogram = 7 + view_miniprogram = 7 } -} +} \ No newline at end of file diff --git a/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromViewMiniprogramEvent.cs b/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromViewMiniprogramEvent.cs index b142f4a..ebf4c5e 100644 --- a/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromViewMiniprogramEvent.cs +++ b/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/From/FromViewMiniprogramEvent.cs @@ -1,16 +1,16 @@ // ====================================================================== -// -// Copyright (C) 2018-2068 湖南心莱信息科技有限公司 +// +// Copyright (C) 2018-2068 湖南心莱信息科技有限公司 // All rights reserved -// +// // filename : FromSubscribeEvent.cs // description : -// +// // created by codelove1314@live.cn at 2021-02-09 10:48:27 // Blog:http://www.cnblogs.com/codelove/ // GitHub : https://github.com/xin-lai // Home:http://xin-lai.com -// +// // ======================================================================= namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.From @@ -28,7 +28,7 @@ namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.From /// public FromViewMiniprogramEvent() { - Event = FromEventTypes.viewminiprogram; + Event = FromEventTypes.view_miniprogram; } /// @@ -41,4 +41,4 @@ namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.From /// public string MenuId { get; set; } } -} +} \ No newline at end of file diff --git a/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/ServerMessageHandler.cs b/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/ServerMessageHandler.cs index cca038b..b46bd39 100644 --- a/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/ServerMessageHandler.cs +++ b/src/Magicodes.Wx.PublicAccount.Sdk.AspNet/ServerMessages/ServerMessageHandler.cs @@ -18,15 +18,14 @@ namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages using Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.From; using Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages.To; using Magicodes.Wx.PublicAccount.Sdk.Helper; + using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using System; - using System.Collections.Generic; using System.Linq; using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; - using Microsoft.Extensions.DependencyInjection; /// /// 服务器消息处理类 @@ -111,7 +110,7 @@ namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages FromEventTypes.location => await ExecuteHandler(xmlStr), FromEventTypes.click => await ExecuteHandler(xmlStr), FromEventTypes.view => await ExecuteHandler(xmlStr), - FromEventTypes.viewminiprogram => await ExecuteHandler(xmlStr), + FromEventTypes.view_miniprogram => await ExecuteHandler(xmlStr), FromEventTypes.templatesendjobfinish => await ExecuteHandler(xmlStr), _ => throw new ArgumentOutOfRangeException(), }; @@ -203,7 +202,7 @@ namespace Magicodes.Wx.PublicAccount.Sdk.AspNet.ServerMessages { throw new WxSdkException($"接收公众号服务端事件消息需要先注册 {nameof(IWxEventsHandler)} !"); } - + IFromMessage fromMessage = XmlHelper.DeserializeObject(xmlStr); if (fromMessage != null) toMessage = await handler.Execute(fromMessage); -- Gitee