Developer

Samples/net45-mvc/Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.NetCore3Sample.CommonService.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
-    <PackageReference Include="Senparc.NeuChar" Version="1.2.201" />
+    <PackageReference Include="Senparc.NeuChar" Version="1.3.200" />
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
   </ItemGroup>
 

Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Senparc.Weixin.Sample.NetCore3.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>5.600.7</Version>
+    <Version>5.600.8</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -39,8 +39,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
-    <PackageReference Include="Senparc.NeuChar.App" Version="0.8.200" />
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="0.2.200" />
+    <PackageReference Include="Senparc.NeuChar.App" Version="0.9.200" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="0.3.200" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
     <PackageReference Include="ZXing.Net" Version="0.16.4" />

Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Startup.cs

@@ -218,7 +218,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env,
                     {
                         app.UseEnyimMemcached();
                         weixinRegister.UseSenparcWeixinCacheMemcached();
-                    }                                                                                      // DPBMARK_END
+                    }                                                                                     // DPBMARK_END
 
                     #endregion
 
@@ -227,7 +227,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env,
                     weixinRegister
                             //注册公众号（可注册多个）                                                    -- DPBMARK MP
 
-                            .RegisterMpAccount(senparcWeixinSetting.Value, "【盛派网络小助手】公众号")// DPBMARK_END
+                            .RegisterMpAccount(senparcWeixinSetting.Value, "【盛派网络小助手】公众号")     // DPBMARK_END
 
 
                             //注册多个公众号或小程序（可注册多个）                                        -- DPBMARK MiniProgram
@@ -352,7 +352,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env,
             //使用公众号的 MessageHandler 中间件（不再需要创建 Controller）                       --DPBMARK MP
             app.UseMessageHandlerForMp("/WeixinAsync", CustomMessageHandler.GenerateMessageHandler, options =>
             {
-                //说明：此代码块中演示了较为全面的功能点，简化的使用可以参考下面小程序和企业微信
+                /* 说明：
+                 * 1、此代码块中演示了较为全面的功能点，简化的使用可以参考下面小程序和企业微信
+                 * 2、使用中间件也支持多账号，可以使用 URL 添加参数的方式（如：/Weixin?id=1），
+                 *    在options.AccountSettingFunc = context => {...} 中，从 context.Request 中获取 [id] 值，
+                 *    并反馈对应的 senparcWeixinSetting 信息
+                 */
 
                 #region 配置 SenparcWeixinSetting 参数，以自动提供 Token、EncodingAESKey 等参数
 

Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Views/Shared/_Layout.cshtml

@@ -117,9 +117,9 @@
                 @*<span>2017年6月16日已发布新版本，改进诸多功能，并发布企业微信（Senparc.Weixin.Work）测试版，支持 .net core / .net 4.5。<a href="http://mp.weixin.qq.com/s/G77RaeYnVuk9zciNrop9aA" target="_blank">点击这里查看</a>。</span>*@
                 @*<span>Senparc 官方微信开发教程《微信开发深度解析：公众号、小程序高效开发秘籍》已经出版，<a href="https://book.weixin.senparc.com/book/link?code=sdk-banner" target="_blank">点击这里购买正版</a>。</span>*@
                 <span>
+                    Senparc 官方微信开发视频教程《微信公众号+小程序快速开发（一）》已全部上线，<a href="https://book.weixin.senparc.com/book/videolinknetease?code=sdk-banner" target="_blank">【点击这开始学习】</a>。<br />
+                    Senparc 官方微信开发教程《微信开发深度解析：公众号、小程序高效开发秘籍》已经出版（已第 8 次印刷），<a href="https://book.weixin.senparc.com/book/link?code=sdk-banner" target="_blank">【点击这里购买正版】</a>。<br />
                     Sample 项目自动生成工具 v1.6 正式版已发布。<a href="@Url.Action("WeChatSampleBuilder","Home")">【点击这里查看】</a>。<br />
-                    Senparc 官方微信开发视频教程《微信公众号+小程序快速开发》已经上线，陆续更新中，<a href="https://book.weixin.senparc.com/book/videolinknetease?code=sdk-banner" target="_blank">【点击这开始学习】</a>。<br />
-                    Senparc 官方微信开发教程《微信开发深度解析：公众号、小程序高效开发秘籍》已经出版（已第 4 次印刷），<a href="https://book.weixin.senparc.com/book/link?code=sdk-banner" target="_blank">【点击这里购买正版】</a>。<br />
                 </span>
             </div>
         </div>

Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/WebSocket/Hubs/SenparcHub.cs

@@ -1,4 +1,6 @@
-using Microsoft.AspNetCore.SignalR;
+//DPBMARK_FILE WebSocket
+
+using Microsoft.AspNetCore.SignalR;
 using Senparc.WebSocket.SignalR;
 using System.Threading.Tasks;
 

src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.netcore3.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
-    <Version>0.10.600</Version>
+    <Version>0.11.101</Version>
     <AssemblyName>Senparc.WebSocket</AssemblyName>
     <RootNamespace>Senparc.WebSocket</RootNamespace>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.netcore3.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
-    <Version>0.1.600</Version>
+    <Version>0.2.101</Version>
     <AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
     <RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -82,7 +82,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="0.2.200" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="0.3.200" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.netcore3.csproj" />

src/Senparc.Weixin.Cache/Senparc.Weixin.Cache.CsRedis/Senparc.Weixin.Cache.CsRedis.netcore3.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>0.1.600</Version>
+    <Version>0.2.101</Version>
     <AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
     <RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

src/Senparc.Weixin.Cache/Senparc.Weixin.Cache.Memcached/Senparc.Weixin.Cache.Memcached.netcore3.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>2.6.600</Version>
+    <Version>2.7.101</Version>
     <AssemblyName>Senparc.Weixin.Cache.Memcached</AssemblyName>
     <RootNamespace>Senparc.Weixin.Cache.Memcached</RootNamespace>
     <Description>微信公众账号 - Memcached 模块

src/Senparc.Weixin.Cache/Senparc.Weixin.Cache.Redis/Senparc.Weixin.Cache.Redis.netcore3.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>2.8.600</Version>
+    <Version>2.9.101</Version>
     <AssemblyName>Senparc.Weixin.Cache.Redis</AssemblyName>
     <RootNamespace>Senparc.Weixin.Cache.Redis</RootNamespace>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.netcore3.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
-    <Version>0.1.600</Version>
+    <Version>0.2.101</Version>
     <AssemblyName>Senparc.Weixin.MP.Middleware</AssemblyName>
     <RootNamespace>Senparc.Weixin.MP.Middleware</RootNamespace>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -82,7 +82,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="0.2.200" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="0.3.200" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.netcore3.csproj" />

src/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.netcore3.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
-    <Version>7.5.600</Version>
+    <Version>7.6.101</Version>
     <AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
     <RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -163,7 +163,7 @@
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="1.2.201" />
+    <PackageReference Include="Senparc.NeuChar" Version="1.3.200" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Senparc.Weixin.AspNet\Senparc.Weixin.AspNet.netcore3.csproj" />

src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/CommonAPIs/CommonApiTest.Menu.cs

@@ -32,11 +32,9 @@ namespace Senparc.Weixin.MP.Test.CommonAPIs
 {
     public partial class CommonApiTest
     {
-        [TestMethod]
+        //[TestMethod]//已经通过测试
         public void CreateMenuTest()
         {
-            return;//已经通过测试
-
             //var accessToken = AccessTokenContainer.GetAccessToken(_appId);
 
             ButtonGroup bg = new ButtonGroup();

src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/CommonAPIs/CommonApiTest.cs

@@ -49,7 +49,7 @@ and limitations under the License.
 namespace Senparc.Weixin.MP.Test.CommonAPIs
 {
     //已通过测试
-    //[TestClass]
+    [TestClass]
     public partial class CommonApiTest : BaseTest
     {
         private dynamic _appConfig;

src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/MessageHandlers/MessageHandlers_OmitRepeatMessageTest.cs

@@ -26,6 +26,7 @@ and limitations under the License.
 using Senparc.Weixin.MP.Entities;
 using Senparc.Weixin.MP.Entities.Request;
 using Senparc.Weixin.MP.MessageHandlers;
+using Senparc.WeixinTests;
 
 namespace Senparc.Weixin.MP.Test.MessageHandlers
 {
@@ -34,12 +35,12 @@ public class OmitRepeatMessageMessageHandlers : MessageHandler<MessageContexts.D
         public string RunStep { get; set; }
 
 
-        public OmitRepeatMessageMessageHandlers(XDocument requestDoc,PostModel postModel)
+        public OmitRepeatMessageMessageHandlers(XDocument requestDoc, PostModel postModel)
             : base(requestDoc, postModel)
         {
         }
 
-    
+
 
         public override IResponseMessageBase OnTextRequest(RequestMessageText requestMessage)
         {
@@ -62,7 +63,7 @@ public override IResponseMessageBase DefaultResponseMessage(IRequestMessageBase
     }
 
     [TestClass]
-    public class MessageHandlers_OmitRepeatMessage
+    public class MessageHandlers_OmitRepeatMessage : BaseTest
     {
         string xmlText = @"<?xml version=""1.0"" encoding=""utf-8""?>
 <xml>

src/Senparc.Weixin.MP/Senparc.Weixin.MP/Containers/AccessTokenContainer.cs

@@ -118,45 +118,9 @@ namespace Senparc.Weixin.MP.Containers
     public class AccessTokenBag : BaseContainerBag, IBaseContainerBag_AppId
     {
         public string AppId { get; set; }
-        //        {
-        //            get { return _appId; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _appId, value, "AppId"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _appId, value); }
-        //#endif
-        //        }
-
         public string AppSecret { get; set; }
-        //        {
-        //            get { return _appSecret; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _appSecret, value, "AppSecret"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _appSecret, value); }
-        //#endif
-        //        }
-
         public DateTimeOffset AccessTokenExpireTime { get; set; }
-        //        {
-        //            get { return _accessTokenExpireTime; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _accessTokenExpireTime, value, "AccessTokenExpireTime"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _accessTokenExpireTime, value); }
-        //#endif
-        //        }
-
         public AccessTokenResult AccessTokenResult { get; set; }
-        //        {
-        //            get { return _accessTokenResult; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _accessTokenResult, value, "AccessTokenResult"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _accessTokenResult, value); }
-        //#endif
-        //        }
-
         //private AccessTokenResult _accessTokenResult;
         //private DateTimeOffset _accessTokenExpireTime;
         //private string _appSecret;
@@ -286,6 +250,10 @@ public static async Task RegisterAsync(string appId, string appSecret, string na
 
             if (!name.IsNullOrEmpty())
             {
+                /*
+                 * 注意：此处会修改全局的 WeixinAppId 和 WeixinAppSecret 的值，如果小程序从这里注册（并且没有提供 name），就会影响到公众号的参数 
+                 * https://github.com/JeffreySu/WeiXinMPSDK/pull/2261/files
+                 */
                 Senparc.Weixin.Config.SenparcWeixinSetting.Items[name].WeixinAppId = appId;
                 Senparc.Weixin.Config.SenparcWeixinSetting.Items[name].WeixinAppSecret = appSecret;
             }

src/Senparc.Weixin.MP/Senparc.Weixin.MP/Containers/JsApiTicketContainer.cs

@@ -100,43 +100,9 @@ namespace Senparc.Weixin.MP.Containers
     public class JsApiTicketBag : BaseContainerBag, IBaseContainerBag_AppId
     {
         public string AppId { get; set; }
-        //        {
-        //            get { return _appId; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _appId, value, "AppId"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _appId, value); }
-        //#endif
-        //        }
         public string AppSecret { get; set; }
-        //        {
-        //            get { return _appSecret; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _appSecret, value, "AppSecret"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _appSecret, value); }
-        //#endif
-        //        }
-
         public JsApiTicketResult JsApiTicketResult { get; set; }
-        //        {
-        //            get { return _jsApiTicketResult; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _jsApiTicketResult, value, "JsApiTicketResult"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _jsApiTicketResult, value); }
-        //#endif
-        //        }
-
         public DateTimeOffset JsApiTicketExpireTime { get; set; }
-        //        {
-        //            get { return _jsApiTicketExpireTime; }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _jsApiTicketExpireTime, value, "JsApiTicketExpireTime"); }
-        //#else
-        //            set { this.SetContainerProperty(ref _jsApiTicketExpireTime, value); }
-        //#endif
-        //        }
 
         /// <summary>
         /// 只针对这个AppId的锁

src/Senparc.Weixin.MP/Senparc.Weixin.MP/Containers/WxCardApiTicketContainer.cs

@@ -70,69 +70,9 @@ namespace Senparc.Weixin.MP.Containers
     public class WxCardApiTicketBag : BaseContainerBag, IBaseContainerBag_AppId
     {
         public string AppId { get; set; }
-        //        {
-        //            get
-        //            {
-        //                return _appId;
-        //            }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _appId, value, "AppId"); }
-        //#else
-        //            set
-        //            {
-        //                this.SetContainerProperty(ref _appId, value);
-        //            }
-        //#endif
-        //        }
-
         public string AppSecret { get; set; }
-        //        {
-        //            get
-        //            {
-        //                return _appSecret;
-        //            }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _appSecret, value, "AppSecret"); }
-        //#else
-        //            set
-        //            {
-        //                this.SetContainerProperty(ref _appSecret, value);
-        //            }
-        //#endif
-        //        }
-
         public JsApiTicketResult WxCardApiTicketResult { get; set; }
-        //        {
-        //            get
-        //            {
-        //                return _WxCardApiTicketResult;
-        //            }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _WxCardApiTicketResult, value, "WxCardApiTicketResult"); }
-        //#else
-        //            set
-        //            {
-        //                this.SetContainerProperty(ref _WxCardApiTicketResult, value);
-        //            }
-        //#endif
-        //        }
-
         public DateTimeOffset WxCardApiTicketExpireTime { get; set; }
-        //        {
-        //            get
-        //            {
-        //                return _WxCardApiTicketExpireTime;
-        //            }
-        //#if NET35 || NET40
-        //            set { this.SetContainerProperty(ref _WxCardApiTicketExpireTime, value, "WxCardApiExpireTime"); }
-        //#else
-        //            set
-        //            {
-        //                this.SetContainerProperty(ref _WxCardApiTicketExpireTime, value);
-        //            }
-        //#endif
-        //        }
-
         /// <summary>
         /// 只针对这个AppId的锁
         /// </summary>