Merge pull request #2938 from JeffreySu/Developer

Developer
JeffreySu · Oct 26, 2023 · 7fbaded · 7fbaded
2 parents a2cd24a + b97dc42
commit 7fbaded
Show file tree

Hide file tree

Showing 38 changed files with 1,174 additions and 92 deletions.
diff --git a/...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net7Sample.CommonService.csproj b/...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net7Sample.CommonService.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Senparc.NeuChar" Version="2.3.2" />
+	  <PackageReference Include="Senparc.NeuChar" Version="2.3.3" />
 	  <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
 	  <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
 	  <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />

diff --git a/Samples/All/net7-mvc/Senparc.Weixin.Sample.Net7/Senparc.Weixin.Sample.Net7.csproj b/Samples/All/net7-mvc/Senparc.Weixin.Sample.Net7/Senparc.Weixin.Sample.Net7.csproj
@@ -9,8 +9,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.4.2" />
-		<PackageReference Include="Senparc.NeuChar.App" Version="1.3.2" />
-		<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.3.2.1" />
+		<PackageReference Include="Senparc.NeuChar.App" Version="1.3.3" />
+		<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.3.3" />
 
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" />

diff --git a/Samples/MP/Senparc.Weixin.Sample.MP/Senparc.Weixin.Sample.MP.net7.csproj b/Samples/MP/Senparc.Weixin.Sample.MP/Senparc.Weixin.Sample.MP.net7.csproj
@@ -24,10 +24,10 @@
 
 	<!--引用 Nuget 包-->
 	<ItemGroup>
-	  <PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.4.2-beta1" />
-	  <PackageReference Include="Senparc.Weixin.MP" Version="16.19.2.2" />
-	  <PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.0.5.2-beta1" />
-	  <PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.12.2" />
+	  <PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.5-beta1" />
+	  <PackageReference Include="Senparc.Weixin.MP" Version="16.19.3" />
+	  <PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.0.6-beta1" />
+	  <PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.13" />
 	</ItemGroup>
 
 	<!--直接引用源码-->

diff --git a/Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Senparc.Weixin.Sample.TenPayV2.net7.csproj b/Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Senparc.Weixin.Sample.TenPayV2.net7.csproj
@@ -24,10 +24,10 @@
 
 	<!--引用 Nuget 包-->
 	<ItemGroup>
-	  <PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.4.2-beta1" />
-	  <PackageReference Include="Senparc.Weixin.MP" Version="16.19.2.2" />
-	  <PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.12.2" />
-	  <PackageReference Include="Senparc.Weixin.TenPay" Version="1.12.13.2" />
+	  <PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.5-beta1" />
+	  <PackageReference Include="Senparc.Weixin.MP" Version="16.19.3" />
+	  <PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.13" />
+	  <PackageReference Include="Senparc.Weixin.TenPay" Version="1.12.14" />
 	  <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
 	  <PackageReference Include="ZXing.Net" Version="0.16.8" />
 	</ItemGroup>

diff --git a/Samples/TenPayV3/Senparc.Weixin.Sample.TenPayV3/Senparc.Weixin.Sample.TenPayV3.net7.csproj b/Samples/TenPayV3/Senparc.Weixin.Sample.TenPayV3/Senparc.Weixin.Sample.TenPayV3.net7.csproj
@@ -25,10 +25,10 @@
 
 	<!--引用 Nuget 包-->
 	<ItemGroup>
-		<PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.4.2-beta1" />
-		<PackageReference Include="Senparc.Weixin.MP" Version="16.19.2.2" />
-		<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.12.2" />
-		<PackageReference Include="Senparc.Weixin.TenpayV3" Version="0.7.10.4" />
+		<PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.5-beta1" />
+		<PackageReference Include="Senparc.Weixin.MP" Version="16.19.3" />
+		<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.13" />
+		<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.1.0-beta1" />
 		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
 		<PackageReference Include="ZXing.Net" Version="0.16.8" />
 	</ItemGroup>

diff --git a/Samples/Work/Senparc.Weixin.Sample.Work/Senparc.Weixin.Sample.Work.net7.csproj b/Samples/Work/Senparc.Weixin.Sample.Work/Senparc.Weixin.Sample.Work.net7.csproj
@@ -25,9 +25,9 @@
 
 	<!--引用 Nuget 包-->
 	<ItemGroup>
-	  <PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.4.2-beta1" />
-	  <PackageReference Include="Senparc.Weixin.Work" Version="3.16.2.2" />
-	  <PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.0.5.2-beta1" />
+	  <PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.5-beta1" />
+	  <PackageReference Include="Senparc.Weixin.Work" Version="3.16.4" />
+	  <PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.0.6-beta1" />
 	</ItemGroup>
 
 	<!--直接引用源码-->

diff --git a/Samples/WxOpen/Senparc.Weixin.Sample.WxOpen/Senparc.Weixin.Sample.WxOpen.net7.csproj b/Samples/WxOpen/Senparc.Weixin.Sample.WxOpen/Senparc.Weixin.Sample.WxOpen.net7.csproj
@@ -25,10 +25,10 @@
 
 	<!--引用 Nuget 包-->
 	<ItemGroup>
-		<PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.4.2-beta1" />
-		<PackageReference Include="Senparc.Weixin.TenPayV3" Version="0.7.10.4" />
-		<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.16.2.2" />
-		<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.0.5.2-beta1" />
+		<PackageReference Include="Senparc.Weixin.AspNet" Version="1.0.5-beta1" />
+		<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.1.0-beta1" />
+		<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.16.4" />
+		<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.0.6-beta1" />
 	</ItemGroup>
 
 	<!--直接引用源码-->

diff --git a/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net7.csproj b/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net7.csproj
@@ -76,7 +76,7 @@
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.9" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.3.2.1" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />

diff --git a/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net7.csproj b/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net7.csproj
@@ -75,7 +75,7 @@
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.9" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.3.2.1" />
+    <PackageReference Include="Senparc.NeuChar.AspNet" Version="1.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.net7.csproj" />

diff --git a/...MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.net7.csproj b/...MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.net7.csproj
@@ -151,7 +151,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="2.3.2" />
+    <PackageReference Include="Senparc.NeuChar" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Senparc.Weixin.AspNet\Senparc.Weixin.AspNet.net7.csproj" />

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.net7.csproj b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.net7.csproj
@@ -583,8 +583,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Senparc.CO2NET.APM" Version="1.2.5.7" />
-    <PackageReference Include="Senparc.NeuChar" Version="2.3.2" />
-    <PackageReference Include="Senparc.NeuChar.App" Version="1.3.2" />
+    <PackageReference Include="Senparc.NeuChar" Version="2.3.3" />
+    <PackageReference Include="Senparc.NeuChar.App" Version="1.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />

diff --git a/...parc.Weixin.Open/Senparc.Weixin.Open/Entities/Request/RequestMessageThirdFasteRegister.cs b/...parc.Weixin.Open/Senparc.Weixin.Open/Entities/Request/RequestMessageThirdFasteRegister.cs
@@ -13,8 +13,15 @@
 
     修改标识：Senparc - 20190530
     修改描述：v4.5.4.1 GetAuditStatusResultJson 改名为 GetAuditResultJson，保持全局命名唯一性
+
+    修改标识：Senparc - 20231026
+    修改描述：v4.16.0 1、处理三方推送消息枚举
+		              2、添加“小程序发货信息管理服务”
+
 ----------------------------------------------------------------*/
 
+using Senparc.NeuChar.Entities;
+
 namespace Senparc.Weixin.Open
 {
     /// <summary>
@@ -52,50 +59,4 @@ public override RequestInfoType InfoType
         /// </summary>
         public ThirdFasteRegisterInfo info {get;set;}
     }
-
-    /// <summary>
-    /// 注册时提交的资料信息
-    /// </summary>
-    public class ThirdFasteRegisterInfo
-    {
-        /// <summary>
-        /// 企业小程序 - 企业名称
-        /// </summary>
-        public string name { get; set; }
-        /// <summary>
-        /// 企业小程序 - 企业代码
-        /// </summary>
-        public string code { get; set; }
-        /// <summary>
-        /// 企业小程序 - 企业代码类型 
-        /// </summary>
-        public CodeType code_type { get; set; }
-        /// <summary>
-        /// 企业小程序 - 法人微信号
-        /// </summary>
-        public string legal_persona_wechat { get; set; }
-        /// <summary>
-        /// 企业小程序 - 法人姓名
-        /// </summary>
-        public string legal_persona_name { get; set; }
-
-        #region 公共
-        /// <summary>
-        /// 公共 - 第三方联系电话
-        /// </summary>
-        public string component_phone { get; set; }
-        #endregion
-
-
-        #region 个人 
-        /// <summary>
-        /// 个人小程序 - 用户微信号
-        /// </summary>
-        public string wxuser { get; set; }
-        /// <summary>
-        /// 个人小程序 - 用户姓名
-        /// </summary>
-        public string idname { get; set; }
-        #endregion
-    }
 }
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.net6.csproj b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.net6.csproj
@@ -255,7 +255,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Senparc.NeuChar" Version="2.1.3.5" />
+    <PackageReference Include="Senparc.NeuChar" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />

diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.net7.csproj b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.net7.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>4.15.0</Version>
+    <Version>4.16.0</Version>
     <AssemblyName>Senparc.Weixin.Open</AssemblyName>
     <RootNamespace>Senparc.Weixin.Open</RootNamespace>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -216,6 +216,9 @@
 		3、解决问题：设置DNS预解析域名data参数错误
 
 		v4.15.0 发布“第三方服务商小程序备案”接口
+		v4.16.0
+		1、处理三方推送消息枚举
+		2、添加“小程序发货信息管理服务”
 	</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
@@ -264,7 +267,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="2.3.2" />
+    <PackageReference Include="Senparc.NeuChar" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />

diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeApi.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeApi.cs
@@ -59,6 +59,7 @@ and limitations under the License.
 using Senparc.CO2NET.Extensions;
 using Senparc.NeuChar;
 using Senparc.Weixin.Entities;
+using Senparc.Weixin.Open.WxaAPIs.Code;
 
 namespace Senparc.Weixin.Open.WxaAPIs
 {

diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeJson/SubmitAuditPageInfo.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeJson/SubmitAuditPageInfo.cs
@@ -39,7 +39,7 @@ and limitations under the License.
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Senparc.Weixin.Open.WxaAPIs
+namespace Senparc.Weixin.Open.WxaAPIs.Code
 {
     public class SubmitAuditPageInfo
     {

diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeJson/SubmitAuditPreviewInfo.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeJson/SubmitAuditPreviewInfo.cs
@@ -37,7 +37,7 @@ and limitations under the License.
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Senparc.Weixin.Open.WxaAPIs
+namespace Senparc.Weixin.Open.WxaAPIs.Code
 {
     /// <summary>
     /// 预览信息（小程序页面截图和操作录屏）

diff --git a/...enparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeJson/SubmitAuditUgcDeclareInfo.cs b/...enparc.Weixin.Open/Senparc.Weixin.Open/WxaAPIs/Code/CodeJson/SubmitAuditUgcDeclareInfo.cs
@@ -29,7 +29,7 @@ and limitations under the License.
 
 ----------------------------------------------------------------*/
 
-namespace Senparc.Weixin.Open.WxaAPIs
+namespace Senparc.Weixin.Open.WxaAPIs.Code
 {
     /// <summary>
     /// 用户生成内容场景（UGC）信息安全声明