Developer

.github/ISSUE_TEMPLATE.md

@@ -26,6 +26,8 @@
 - [ ] Senparc.Weixin.WxOpen 版本：
 - [ ] Senparc.Weixin.Cache.Redis 版本：
 - [ ] Senparc.Weixin.Cache.Memcached 版本：
+- [ ] Senparc.Weixin.Tenpay 版本：
+- [ ] Senparc.WebSocket 版本：
 - [ ] 其他模块：
 
 
@@ -38,6 +40,7 @@
 - [ ] .net core 1.x
 - [ ] .net core 2.x
 - [x] .net core 3.x
+- [ ] .net 5.x / 6.x
 
 ##### 开发环境
 

.github/workflows/master_SenparcWeixinSampleNetCore3.yml

@@ -0,0 +1,55 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy ASP app to Azure Web App - senparcweixinsamplenetcore3(senparcweixinsamplenet5)
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build-and-deploy:
+    runs-on: 'windows-latest'
+
+    steps:
+    - uses: actions/checkout@master
+
+    - name: Setup MSBuild path
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Setup NuGet
+      uses: NuGet/setup-nuget@v1.0.5
+
+    - name: Set up .NET Core 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '2.1.807'
+
+
+    - name: Set up .NET Core 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.301'
+
+    - name: CMD1
+      run: dir
+
+    - name: CMD2
+      run: cd ./samples/netcore3.0-mvc/
+
+    - name: Restore NuGet packages
+      run: nuget restore 
+      #-SolutionDirectory ./samples/netcore3.0-mvc/
+
+    - name: Publish to folder
+      run: msbuild /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\"
+
+    - name: Deploy to Azure Web App
+      uses: azure/webapps-deploy@v2
+      with:
+        app-name: 'senparcweixinsamplenetcore3'
+        slot-name: 'senparcweixinsamplenet5'
+        publish-profile: ${{ secrets.AzureAppService_PublishProfile_3ee3a42f0a324bf7be968d8c232a8555 }}
+        package: \published\

.gitignore

@@ -88,3 +88,6 @@ packages/
 /Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/appsettings.Development.json
 /Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/App_Data/WeChat_OfficialAccount
 /Samples/netcore3.0-mvc/.idea
+/Samples/net6-mvc/Senparc.Weixin.Sample.Net6/App_Data/SenparcTraceLog
+/Samples/net6-mvc/Senparc.Weixin.Sample.Net6/App_Data/WeChat_OfficialAccount
+/src/BuildOutPut

Samples/net45-mvc/Senparc.Weixin.MP.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler.cs

@@ -35,13 +35,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using Senparc.CO2NET.Cache;
 
 #if NET45
 using System.Web;
 using System.Configuration;
 using System.Web.Configuration;
 using Senparc.Weixin.MP.Sample.CommonService.Utilities;
 #else
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
 #endif
 
 namespace Senparc.Weixin.MP.Sample.CommonService.CustomMessageHandler
@@ -59,7 +62,7 @@ public partial class CustomMessageHandler : MessageHandler<CustomMessageContext>
          */
 
 
-#if !DEBUG || NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_1
+#if !DEBUG || NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_1 || NET6_0
         string agentUrl = "http://localhost:12222/App/Weixin/4";
         string agentToken = "27C455F496044A87";
         string wiweihiKey = "CNadjJuWzyX5bz5Gn+/XoyqiqMa5DjXQ";
@@ -73,20 +76,23 @@ public partial class CustomMessageHandler : MessageHandler<CustomMessageContext>
         private string appId = Config.SenparcWeixinSetting.WeixinAppId;
         private string appSecret = Config.SenparcWeixinSetting.WeixinAppSecret;
 
-        /// <summary>
-        /// 模板消息集合（Key：checkCode，Value：OpenId）
-        /// 注意：这里只做测试，只适用于单服务器
-        /// </summary>
-        public static Dictionary<string, string> TemplateMessageCollection = new Dictionary<string, string>();
 
         /// <summary>
         /// 为中间件提供生成当前类的委托
         /// </summary>
-        public static Func<Stream, PostModel, int, CustomMessageHandler> GenerateMessageHandler = (stream, postModel, maxRecordCount)
-                        => new CustomMessageHandler(stream, postModel, maxRecordCount, false /* 是否只允许处理加密消息，以提高安全性 */);
+        public static Func<Stream, PostModel, int, IServiceProvider, CustomMessageHandler> GenerateMessageHandler = (stream, postModel, maxRecordCount, serviceProvider)
+                         => new CustomMessageHandler(stream, postModel, maxRecordCount, false /* 是否只允许处理加密消息，以提高安全性 */, serviceProvider: serviceProvider);
 
-        public CustomMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0, bool onlyAllowEncryptMessage = false)
-            : base(inputStream, postModel, maxRecordCount, onlyAllowEncryptMessage)
+        /// <summary>
+        /// 自定义 MessageHandler
+        /// </summary>
+        /// <param name="provider">.NET Framework 可忽略</param>
+        /// <param name="inputStream"></param>
+        /// <param name="postModel"></param>
+        /// <param name="maxRecordCount"></param>
+        /// <param name="onlyAllowEncryptMessage"></param>
+        public CustomMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0, bool onlyAllowEncryptMessage = false, IServiceProvider serviceProvider = null)
+            : base(inputStream, postModel, maxRecordCount, onlyAllowEncryptMessage, serviceProvider: serviceProvider)
         {
             //这里设置仅用于测试，实际开发可以在外部更全局的地方设置，
             //比如MessageHandler<MessageContext>.GlobalGlobalMessageContext.ExpireMinutes = 3。
@@ -208,7 +214,7 @@ public override async Task<IResponseMessageBase> OnTextRequestAsync(RequestMessa
 #if NET45
                         null,
 #else
-                        Senparc.CO2NET.SenparcDI.GetServiceProvider(), 
+                        Senparc.CO2NET.SenparcDI.GetServiceProvider(),
 #endif
                         agentUrl, agentToken, agentXml);
                     //获取返回的XML
@@ -312,7 +318,13 @@ public override async Task<IResponseMessageBase> OnTextRequestAsync(RequestMessa
                 {
                     var openId = requestMessage.FromUserName;
                     var checkCode = Guid.NewGuid().ToString("n").Substring(0, 3);//为了防止openId泄露造成骚扰，这里启用验证码
-                    TemplateMessageCollection[checkCode] = openId;
+
+                    Task.Factory.StartNew(async () =>
+                    {
+                        var currentCache = CacheStrategyFactory.GetObjectCacheStrategyInstance();
+                        await currentCache.SetAsync($"TestCheckCode:{checkCode}", openId, TimeSpan.FromHours(1));//使用缓存，如果多台服务器可以使用分布式缓存共享
+                    }).Wait();
+
                     defaultResponseMessage.Content = string.Format(@"新的验证码为：{0}，请在网页上输入。网址：https://sdk.weixin.senparc.com/AsyncMethods", checkCode);
                     return defaultResponseMessage;
                 })
@@ -392,6 +404,24 @@ public override async Task<IResponseMessageBase> OnTextRequestAsync(RequestMessa
                     defaultResponseMessage.Content = string.Format("您输入了：{0}，符合正则表达式：^\\d+#\\d+$", requestMessage.Content);
                     return defaultResponseMessage;
                 })
+                //ServiceProvider
+                .Keyword("SP", () =>
+                {
+                    if (base.ServiceProvider == null)
+                    {
+                        defaultResponseMessage.Content = "ServiceProvider 为 null";
+                    }
+                    else
+                    {
+#if !NET45
+                        var httpContextAccessor = base.ServiceProvider.GetService<IHttpContextAccessor>();
+                        defaultResponseMessage.Content = $"ServiceProvider 载入成功，从 IHttpContextAccessor 读取当前服务器协议：{httpContextAccessor.HttpContext.Request.Scheme}";
+#endif
+                    }
+
+
+                    return defaultResponseMessage;
+                })
 
                 //当 Default 使用异步方法时，需要写在最后一个，且 requestMessage.StartHandler() 前需要使用 await 等待异步方法执行；
                 //当 Default 使用同步方法，不一定要在最后一个,并且不需要使用 await
@@ -403,7 +433,7 @@ public override async Task<IResponseMessageBase> OnTextRequestAsync(RequestMessa
                     var currentMessageContext = await base.GetCurrentMessageContext();
                     if (currentMessageContext.RequestMessages.Count > 1)
                     {
-                        result.AppendFormat("您刚才还发送了如下消息（{0}/{1}）：\r\n", currentMessageContext.RequestMessages.Count,
+                        result.AppendFormat("您此前还发送了如下消息（{0}/{1}）：\r\n", currentMessageContext.RequestMessages.Count,
                             currentMessageContext.StorageData);
                         for (int i = currentMessageContext.RequestMessages.Count - 2; i >= 0; i--)
                         {

Samples/net45-mvc/Senparc.Weixin.MP.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler_Events.cs

@@ -62,7 +62,7 @@ private string GetWelcomeInfo()
 SDK Demo：https://sdk.weixin.senparc.com
 源代码及Demo下载地址：https://github.com/JeffreySu/WeiXinMPSDK
 Nuget地址：https://www.nuget.org/packages/Senparc.Weixin.MP
-QQ群：289181996
+QQ群：377815480
 
 ===============
 更多：
@@ -96,6 +96,8 @@ private string GetWelcomeInfo()
 格式：【数字#数字】，如2010#0102，调用正则表达式匹配
 
 【订阅】     测试“一次性订阅消息”接口
+
+【SP】 测试 ServiceProvider
 ",
                 version);
         }

Samples/net45-mvc/Senparc.Weixin.MP.Sample.CommonService/MessageHandlers/WebSocket/CustomNet45WebSocketMessageHandler.cs

@@ -88,8 +88,9 @@ public override async Task OnMessageReceiced(WebSocketHelper webSocketHandler, R
                     keyword6 = new TemplateDataItem("400-031-8816"),
                 };
 
-                var tmResult = Senparc.Weixin.WxOpen.AdvancedAPIs.Template.TemplateApi.SendTemplateMessage(appId, openId, "Ap1S3tRvsB8BXsWkiILLz93nhe7S8IgAipZDfygy9Bg", data, receivedMessage.FormId, "pages/websocket/websocket", "websocket",
-                         null);
+                //微信官方已停用此接口
+                //var tmResult = Senparc.Weixin.WxOpen.AdvancedAPIs.Template.TemplateApi.SendTemplateMessage(appId, openId, "Ap1S3tRvsB8BXsWkiILLz93nhe7S8IgAipZDfygy9Bg", data, receivedMessage.FormId, "pages/websocket/websocket", "websocket",
+                //         null);
             }
             catch (Exception ex)
             {

Samples/net45-mvc/Senparc.Weixin.MP.Sample.CommonService/MessageHandlers/WorkMessageHandler/WorkCustomMessageHandler.cs

@@ -27,11 +27,12 @@ public class WorkCustomMessageHandler : WorkMessageHandler<WorkCustomMessageCont
         /// <summary>
         /// 为中间件提供生成当前类的委托
         /// </summary>
-        public static Func<Stream, PostModel, int, WorkCustomMessageHandler> GenerateMessageHandler = (stream, postModel, maxRecordCount) => new WorkCustomMessageHandler(stream, postModel, maxRecordCount);
+        public static Func<Stream, PostModel, int, IServiceProvider, WorkCustomMessageHandler> GenerateMessageHandler =
+            (stream, postModel, maxRecordCount, serviceProvider) => new WorkCustomMessageHandler(stream, postModel, maxRecordCount, serviceProvider);
 
 
-        public WorkCustomMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0)
-            : base(inputStream, postModel, maxRecordCount)
+        public WorkCustomMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0, IServiceProvider serviceProvider = null)
+            : base(inputStream, postModel, maxRecordCount, serviceProvider: serviceProvider)
         {
         }
 

Samples/net45-mvc/Senparc.Weixin.MP.Sample.CommonService/MessageHandlers/WxOpenMessageHandler/CustomWxOpenMessageHandler.cs

@@ -23,6 +23,8 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Senparc.CO2NET.Helpers;
+using Senparc.CO2NET.Extensions;
 
 #if NET45
 using System.Web.Configuration;
@@ -44,11 +46,12 @@ public partial class CustomWxOpenMessageHandler : WxOpenMessageHandler<CustomWxO
         /// <summary>
         /// 为中间件提供生成当前类的委托
         /// </summary>
-        public static Func<Stream, PostModel, int, CustomWxOpenMessageHandler> GenerateMessageHandler = (stream, postModel, maxRecordCount) => new CustomWxOpenMessageHandler(stream, postModel, maxRecordCount);
+        public static Func<Stream, PostModel, int, IServiceProvider, CustomWxOpenMessageHandler> GenerateMessageHandler =
+            (stream, postModel, maxRecordCount, serviceProvider) => new CustomWxOpenMessageHandler(stream, postModel, maxRecordCount, serviceProvider);
 
 
-        public CustomWxOpenMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0)
-            : base(inputStream, postModel, maxRecordCount)
+        public CustomWxOpenMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0, IServiceProvider serviceProvider = null)
+            : base(inputStream, postModel, maxRecordCount, serviceProvider: serviceProvider)
         {
             //这里设置仅用于测试，实际开发可以在外部更全局的地方设置，
             //比如MessageHandler<MessageContext>.GlobalGlobalMessageContext.ExpireMinutes = 3。
@@ -86,8 +89,15 @@ public override async Task OnExecutingAsync(CancellationToken cancellationToken)
         public override async Task OnExecutedAsync(CancellationToken cancellationToken)
         {
             await base.OnExecutedAsync(cancellationToken);
-            var currentMessageContext = await base.GetCurrentMessageContext();
-            currentMessageContext.StorageData = ((int)currentMessageContext.StorageData) + 1;
+            try
+            {
+                var currentMessageContext = await base.GetCurrentMessageContext();
+                currentMessageContext.StorageData = ((int)currentMessageContext.StorageData) + 1;
+            }
+            catch (Exception ex)
+            {
+                Senparc.CO2NET.Trace.SenparcTrace.SendCustomLog("小程序 OnExecutedAsync 常规跟踪（开发者请忽略）", ex.ToString());
+            }
         }
 
 
@@ -205,12 +215,22 @@ public override async Task<IResponseMessageBase> OnEvent_UserEnterTempSessionReq
 1、发送任意文字，返回上下文消息记录
 2、发送图片，返回同样的图片
 3、发送文字“link”,返回图文链接
-4、发送文字“card”，发送小程序卡片";
+4、发送文字“card”，发送小程序卡片
+5、点击右下角出现的小程序浮窗，发送小程序页面信息";
             await Senparc.Weixin.WxOpen.AdvancedAPIs.CustomApi.SendTextAsync(appId, OpenId, msg);
 
             return await DefaultResponseMessageAsync(requestMessage);
         }
 
+        public override async Task<IResponseMessageBase> OnMiniProgramPageRequestAsync(RequestMessageMiniProgramPage requestMessage)
+        {
+            var msg = $"您从某个小程序页面来到客服，并且发送了小程序卡片。\r\nTitle：{requestMessage.Title}\r\nAppId：{requestMessage.AppId.Substring(1,5)}...\r\nPagePath：{requestMessage.PagePath}\r\n附带照片：";
+            await Senparc.Weixin.WxOpen.AdvancedAPIs.CustomApi.SendTextAsync(appId, OpenId, msg); 
+            await Senparc.Weixin.WxOpen.AdvancedAPIs.CustomApi.SendImageAsync(appId, OpenId, requestMessage.ThumbMediaId);
+            return await DefaultResponseMessageAsync(requestMessage);
+        }
+
+
         public override IResponseMessageBase DefaultResponseMessage(IRequestMessageBase requestMessage)
         {
             //所有没有被处理的消息会默认返回这里的结果