支持 Senparc.NeuChar v0.2.11，升级 MessageHandler

lovepoco · Oct 21, 2018 · 81ea0a6 · 81ea0a6
1 parent 2191a7c
commit 81ea0a6
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 41 deletions.
diff --git a/...parc.Weixin.MP.Sample.vs2017/Senparc.Weixin.MP.CoreSample/wwwroot/Scripts/senparc.menu.js b/...parc.Weixin.MP.Sample.vs2017/Senparc.Weixin.MP.CoreSample/wwwroot/Scripts/senparc.menu.js
@@ -80,7 +80,7 @@ senparc.menu = {
             $('#menuTable tbody tr').eq(row).find('td').eq(0).addClass('currentMenuItem');
 
             //一级菜单提示
-            if (row == 5) {
+            if (row === 5) {
                 $('#rootButtonNotice').show();
             } else {
                 $('#rootButtonNotice').hide();

diff --git a/...ixin.MP.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler.cs b/...ixin.MP.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler.cs
@@ -108,10 +108,10 @@ public CustomMessageHandler(Stream inputStream, PostModel postModel, int maxReco
             };
         }
 
-        public CustomMessageHandler(RequestMessageBase requestMessage)
-            : base(requestMessage)
-        {
-        }
+        //public CustomMessageHandler(RequestMessageBase requestMessage, PostModel postModel)
+        //    : base(requestMessage, postModel)
+        //{
+        //}
 
         public override void OnExecuting()
         {

diff --git a/.../Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.MP.CoreSample.CommonService.csproj b/.../Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.MP.CoreSample.CommonService.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/....MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.vs2017.csproj b/....MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>7.1.9</Version>
+    <Version>7.1.10</Version>
     <AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
     <RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -83,7 +83,7 @@
       v7.1.6 支持 Senparc.NeuChar v0.2.1
       v7.1.7 支持 Senparc.Weixin 6.1.4
       v7.1.8 Senparc.NeuChar v0.2.7
-
+      v7.1.10 Senparc.NeuChar v0.2.11，升级 MessageHandler
     </PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
     <PackageId>Senparc.Weixin.MP.MVC</PackageId>
@@ -226,7 +226,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/MessageHandler.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/MessageHandler.cs
@@ -227,8 +227,8 @@ private void MarkRepeatedMessage()
         /// <param name="postModel">PostModel</param>
         /// <param name="maxRecordCount">单个用户上下文消息列表储存的最大长度</param>
         /// <param name="developerInfo">微微嗨开发者信息，如果不为空，则优先请求云端应用商店的资源</param>
-        public MessageHandler(Stream inputStream, PostModel postModel = null, int maxRecordCount = 0, DeveloperInfo developerInfo = null)
-            : base(inputStream, maxRecordCount, postModel)
+        public MessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0, DeveloperInfo developerInfo = null)
+            : base(inputStream, postModel, maxRecordCount)
         {
             DeveloperInfo = developerInfo;
         }
@@ -240,8 +240,8 @@ public MessageHandler(Stream inputStream, PostModel postModel = null, int maxRec
         /// <param name="postModel">PostModel</param>
         /// <param name="maxRecordCount">单个用户上下文消息列表储存的最大长度</param>
         /// <param name="developerInfo">微微嗨开发者信息，如果不为空，则优先请求云端应用商店的资源</param>
-        public MessageHandler(XDocument requestDocument, PostModel postModel = null, int maxRecordCount = 0, DeveloperInfo developerInfo = null)
-            : base(requestDocument, maxRecordCount, postModel)
+        public MessageHandler(XDocument requestDocument, PostModel postModel, int maxRecordCount = 0, DeveloperInfo developerInfo = null)
+            : base(requestDocument, postModel, maxRecordCount)
         {
             DeveloperInfo = developerInfo;
             //GlobalMessageContext.MaxRecordCount = maxRecordCount;
@@ -255,8 +255,8 @@ public MessageHandler(XDocument requestDocument, PostModel postModel = null, int
         /// <param name="maxRecordCount">单个用户上下文消息列表储存的最大长度</param>
         /// <param name="developerInfo">微微嗨开发者信息，如果不为空，则优先请求云端应用商店的资源</param>
         /// <param name="requestMessageBase"></param>
-        public MessageHandler(RequestMessageBase requestMessageBase, PostModel postModel = null, int maxRecordCount = 0, DeveloperInfo developerInfo = null)
-            : base(requestMessageBase, maxRecordCount, postModel)
+        public MessageHandler(RequestMessageBase requestMessageBase, PostModel postModel, int maxRecordCount = 0, DeveloperInfo developerInfo = null)
+            : base(requestMessageBase, postModel, maxRecordCount)
         {
             DeveloperInfo = developerInfo;
 
@@ -270,10 +270,10 @@ public MessageHandler(RequestMessageBase requestMessageBase, PostModel postModel
         /// <param name="postDataDocument"></param>
         /// <param name="postData"></param>
         /// <returns></returns>
-        public override XDocument Init(XDocument postDataDocument, object postData = null)
+        public override XDocument Init(XDocument postDataDocument, IEncryptPostModel postModel)
         {
             //进行加密判断并处理
-            _postModel = postData as PostModel;
+            _postModel = postModel as PostModel;
             var postDataStr = postDataDocument.ToString();
 
             XDocument decryptDoc = postDataDocument;

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.vs2017.csproj b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>16.4.6.1</Version>
+    <Version>16.4.7</Version>
     <AssemblyName>Senparc.Weixin.MP</AssemblyName>
     <RootNamespace>Senparc.Weixin.MP</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -442,6 +442,7 @@
       v16.4.2 Senparc.NeuChar v0.2.7
       v16.4.5 支持 Senparc.NeuChar v0.2.9.1
       v16.4.5 支持 Senparc.NeuChar v0.2.10，支持 NeuChar 连接检测
+      v16.4.7 Senparc.NeuChar v0.2.11，升级 MessageHandler
     </PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
@@ -588,7 +589,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.vs2017.csproj b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>4.1.12.1</Version>
+    <Version>4.1.13</Version>
     <AssemblyName>Senparc.Weixin.Open</AssemblyName>
     <RootNamespace>Senparc.Weixin.Open</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -141,6 +141,7 @@
       v4.1.9 支持 Senparc.NeuChar v0.2.1
       v4.1.10 支持 Senparc.Weixin 6.1.4
       v4.1.11 Senparc.NeuChar v0.2.7
+      v4.1.13 Senparc.NeuChar v0.2.11，升级 MessageHandler
 
     </PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
@@ -261,7 +262,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Senparc.Weixin.Work/Senparc.Weixin.Work/MessageHandlers/WorkMessageHandler.cs b/src/Senparc.Weixin.Work/Senparc.Weixin.Work/MessageHandlers/WorkMessageHandler.cs
@@ -169,19 +169,19 @@ public int? AgentId
 
 
         public WorkMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0)
-            : base(inputStream, maxRecordCount, postModel)
+            : base(inputStream, postModel, maxRecordCount)
         {
         }
 
         public WorkMessageHandler(XDocument requestDocument, PostModel postModel, int maxRecordCount = 0)
-            : base(requestDocument, maxRecordCount, postModel)
+            : base(requestDocument, postModel, maxRecordCount)
         {
         }
 
 
-        public override XDocument Init(XDocument postDataDocument, object postData)
+        public override XDocument Init(XDocument postDataDocument, IEncryptPostModel postModel)
         {
-            _postModel = postData as PostModel;
+            _postModel = postModel as PostModel;
 
             var postDataStr = postDataDocument.ToString();
             EncryptPostData = RequestMessageFactory.GetEncryptPostData(postDataStr);

diff --git a/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.vs2017.csproj b/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.vs2017.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-		<Version>3.1.13.1</Version>
+		<Version>3.1.14</Version>
 		<AssemblyName>Senparc.Weixin.Work</AssemblyName>
 		<RootNamespace>Senparc.Weixin.Work</RootNamespace>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -105,6 +105,7 @@
       v3.1.10 支持 Senparc.Weixin 6.1.4
       v3.1.11 菜单按钮类型（ButtonType）改为使用 Senparc.NeuChar.MenuButtonType
       v3.1.12 Senparc.NeuChar v0.2.7
+      v3.1.14 Senparc.NeuChar v0.2.11，升级 MessageHandler
 
     </PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
@@ -271,7 +272,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
+	  <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...n/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/MessageHandlers/WxOpenMessageHandler.cs b/...n/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/MessageHandlers/WxOpenMessageHandler.cs
@@ -145,8 +145,8 @@ public override GlobalMessageContext<TC, IRequestMessageBase, IResponseMessageBa
         /// <param name="postModel">PostModel</param>
         /// <param name="maxRecordCount">上下文最多保留消息（0为保存所有）</param>
         ///// <param name="developerInfo">开发者信息（非必填）</param>
-        public WxOpenMessageHandler(Stream inputStream, PostModel postModel = null, int maxRecordCount = 0)
-            : base(inputStream, maxRecordCount, postModel)
+        public WxOpenMessageHandler(Stream inputStream, PostModel postModel, int maxRecordCount = 0)
+            : base(inputStream, postModel, maxRecordCount)
         {
         }
 
@@ -156,8 +156,8 @@ public WxOpenMessageHandler(Stream inputStream, PostModel postModel = null, int
         /// <param name="requestDocument">XML格式的请求</param>
         /// <param name="postModel">PostModel</param>
         /// <param name="maxRecordCount">上下文最多保留消息（0为保存所有）</param>
-        public WxOpenMessageHandler(XDocument requestDocument, PostModel postModel = null, int maxRecordCount = 0)
-            : base(requestDocument, maxRecordCount, postModel)
+        public WxOpenMessageHandler(XDocument requestDocument, PostModel postModel, int maxRecordCount = 0)
+            : base(requestDocument, postModel, maxRecordCount)
         {
         }
 
@@ -167,8 +167,8 @@ public WxOpenMessageHandler(XDocument requestDocument, PostModel postModel = nul
         /// <param name="requestMessageBase">RequestMessageBase</param>
         /// <param name="postModel">PostModel</param>
         /// <param name="maxRecordCount">上下文最多保留消息（0为保存所有）</param>
-        public WxOpenMessageHandler(RequestMessageBase requestMessageBase, PostModel postModel = null, int maxRecordCount = 0)
-            : base(requestMessageBase, maxRecordCount, postModel)
+        public WxOpenMessageHandler(RequestMessageBase requestMessageBase, PostModel postModel, int maxRecordCount = 0)
+            : base(requestMessageBase, postModel, maxRecordCount)
         {
         }
 
@@ -180,12 +180,12 @@ public WxOpenMessageHandler(RequestMessageBase requestMessageBase, PostModel pos
         /// 初始化数据
         /// </summary>
         /// <param name="postDataDocument"></param>
-        /// <param name="postData"></param>
+        /// <param name="postModel"></param>
         /// <returns></returns>
-        public override XDocument Init(XDocument postDataDocument, object postData = null)
+        public override XDocument Init(XDocument postDataDocument, IEncryptPostModel postModel)
         {
             //进行加密判断并处理
-            _postModel = postData as PostModel;
+            _postModel = postModel as PostModel;
             var postDataStr = postDataDocument.ToString();
 
             XDocument decryptDoc = postDataDocument;

diff --git a/...xOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.vs2017.csproj b/...xOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>3.1.13.2</Version>
+    <Version>3.1.14</Version>
     <AssemblyName>Senparc.Weixin.WxOpen</AssemblyName>
     <RootNamespace>Senparc.Weixin.WxOpen</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -109,7 +109,8 @@
       v3.1.9 支持 Senparc.Weixin 6.1.4
       v3.1.10 Senparc.NeuChar v0.2.7
       v3.1.12 支持 Senparc.NeuChar v0.2.9.1
-      v3.1.13 提供 MessageHandler 的 NeuChar 对接能力 
+      v3.1.13 提供 MessageHandler 的 NeuChar 对接能力
+      v3.1.14 Senparc.NeuChar v0.2.11，升级 MessageHandler
     </PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
@@ -266,7 +267,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
   </ItemGroup>
 
 

diff --git a/src/Senparc.Weixin/Senparc.Weixin/Senparc.Weixin.vs2017.csproj b/src/Senparc.Weixin/Senparc.Weixin/Senparc.Weixin.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>6.1.7</Version>
+    <Version>6.1.8</Version>
     <AssemblyName>Senparc.Weixin</AssemblyName>
     <RootNamespace>Senparc.Weixin</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -278,6 +278,8 @@
       v6.1.4 支持 Senparc.CO2NET v0.2.14，Senparc.NeuChar v0.2.5
       v6.1.5 Senparc.NeuChar v0.2.7
       v6.1.7 支持 Senparc.NeuChar v0.2.9.1
+      v6.1.8 Senparc.NeuChar v0.2.11，升级 MessageHandler
+
     </PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
@@ -367,7 +369,7 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Senparc.CO2NET" Version="0.2.16" />
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">