解决冲突，更新版本号：Work v3.15.5 调整批量获取客户详情返回值 #2655 感谢 @ccccccmd

JeffreySu · Jun 20, 2022 · 7fc87c5 · 7fc87c5
2 parents fb516a5 + 4788608
commit 7fc87c5
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 83 deletions.
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/MessageHandlers/MessageHandlersTest.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/MessageHandlers/MessageHandlersTest.cs
@@ -245,6 +245,27 @@ public void SyncTest()
             Assert.AreEqual(messageHandlers1.GlobalMessageContext.GetHashCode(), messageHandlers2.GlobalMessageContext.GetHashCode());
         }
 
+        [TestMethod]
+        public void RegexTest()
+        {
+            string regexXmlText = @"<?xml version=""1.0"" encoding=""utf-8""?>
+<xml>
+    <ToUserName><![CDATA[gh_a96a4a619366]]></ToUserName>
+    <FromUserName><![CDATA[olPjZjsXuQPJoV0HlruZkNzKc91E]]></FromUserName>
+    <CreateTime>1357986928</CreateTime>
+    <MsgType><![CDATA[text]]></MsgType>
+    <Content><![CDATA[13987654321]]></Content>
+    <MsgId>5832509444155992351</MsgId>
+</xml>
+";
+            var messageHandler = new CustomMessageHandlers(XDocument.Parse(regexXmlText));
+            messageHandler.DefaultMessageHandlerAsyncEvent = NeuChar.MessageHandlers.DefaultMessageHandlerAsyncEvent.SelfSynicMethod;
+            messageHandler.ExecuteAsync(new CancellationToken()).GetAwaiter().GetResult();
+            Assert.IsNotNull(messageHandler.ResponseMessage);
+            Assert.IsInstanceOfType(messageHandler.ResponseMessage, typeof(ResponseMessageText));
+            Console.WriteLine(messageHandler.ResponseMessage.ToJson(true));
+        }
+
         [TestMethod]
         public void ContextTest()
         {

diff --git a/...rc.Weixin.MP/Senparc.Weixin.MP.Test/MessageHandlers/TestEntities/CustomMessageHandlers.cs b/...rc.Weixin.MP/Senparc.Weixin.MP.Test/MessageHandlers/TestEntities/CustomMessageHandlers.cs
@@ -44,11 +44,11 @@ public override IResponseMessageBase OnTextRequest(RequestMessageText requestMes
 
 
             var requestHandler = requestMessage.StartHandler();
-            requestHandler.Keyword("代理", () =>
-            {
-                responseMessage.Content = "收到关键字：代理";
-                return responseMessage;
-            })
+                requestHandler.Keyword("代理", () =>
+                {
+                    responseMessage.Content = "收到关键字：代理";
+                    return responseMessage;
+                })
                 .SelectMenuKeyword("101", () =>
                 {
                     responseMessage.Content = $"选择菜单：{requestMessage.bizmsgmenuid}，文字：{requestMessage.Content}";
@@ -59,6 +59,11 @@ public override IResponseMessageBase OnTextRequest(RequestMessageText requestMes
                     responseMessage.Content = $"选择菜单：{requestMessage.bizmsgmenuid}，文字：{requestMessage.Content}";
                     return responseMessage;
                 })
+                .Regex("^[1][3-9]{1}[0-9]{9}$", () =>
+                {
+                    responseMessage.Content = $"正则：{requestMessage.Content}";
+                    return responseMessage;
+                })
                 .Default(() =>
                 {
                     responseMessage.Content = "文字信息";

diff --git a/...eixin.TenPay/Senparc.Weixin.TenPayV3/Apis/BasePay/Entities/ReturnJson/RefundReturnJson.cs b/...eixin.TenPay/Senparc.Weixin.TenPayV3/Apis/BasePay/Entities/ReturnJson/RefundReturnJson.cs
@@ -26,7 +26,10 @@ and limitations under the License.
     
     
     创建标识：Senparc - 20210813
-    
+  
+    修改标识：Senparc - 20220526
+    修改描述：v0.6.2.3 修复 RefundReturnJson.Amount.refund 参数类型
+
 ----------------------------------------------------------------*/
 
 
@@ -158,7 +161,7 @@ public class Amount
             /// 退款金额	
             /// 退款标价金额，单位为分，可以做部分退款
             /// 示例值：100
-            public string refund { get; set; }
+            public int refund { get; set; }
 
             /// <summary>
             /// 退款出资的账户类型及金额信息

diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net6.csproj b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.6.2.2-beta1</Version>
+    <Version>0.6.2.3-beta1</Version>
     <AssemblyName>Senparc.Weixin.TenPayV3</AssemblyName>
     <RootNamespace>Senparc.Weixin.TenPayV3</RootNamespace>
     <LangVersion>10.0</LangVersion>

diff --git a/...nparc.Weixin.Work/AdvancedAPIs/External/ExternalJson/GetExternalContactInfoBatchResult.cs b/...nparc.Weixin.Work/AdvancedAPIs/External/ExternalJson/GetExternalContactInfoBatchResult.cs
@@ -11,7 +11,7 @@
     修改描述：v3.9.102 修复“批量获取客户详情 返回结果”参数名称
 
     修改标识：ccccccmd - 20220620
-    修改描述：v3.15.4 调整批量获取客户详情返回值
+    修改描述：v3.15.5 调整批量获取客户详情返回值
     
 ----------------------------------------------------------------*/
 

diff --git a/src/Senparc.Weixin.Work/Senparc.Weixin.Work/AdvancedAPIs/MailList/Member/MemberBase.cs b/src/Senparc.Weixin.Work/Senparc.Weixin.Work/AdvancedAPIs/MailList/Member/MemberBase.cs
@@ -9,6 +9,9 @@
 
     修改标识：WangDrama - 20200922
     修改描述：v3.7.603 企业微信通讯录模块， 更新（成员）实体新增别名，删除isleader ，新增is_leader_in_dept
+   
+    修改标识：Senparc - 20220526
+    修改描述：v3.15.4 添加 MailList.Member 下的 biz_mail 属性
 
 ----------------------------------------------------------------*/
 
@@ -59,6 +62,10 @@ public abstract class MemberBase
         /// 邮箱。长度不超过64个字节，且为有效的email格式。企业内必须唯一，mobile/email二者不能同时为空
         /// </summary>
         public string email { get; set; }
+        /// <summary>
+        /// 企业邮箱。仅对开通企业邮箱的企业有效。长度6~64个字节，且为有效的企业邮箱格式。企业内必须唯一。未填写则系统会为用户生成默认企业邮箱（可修改一次，2022年4月25日之后创建的成员需通过企业管理后台-协作-邮件-邮箱管理-成员邮箱修改）
+        /// </summary>
+        public string biz_mail { get; set; }
         ///// <summary>
         ///// 上级字段，标识是否为上级。在审批等应用里可以用来标识上级审批人
         ///// </summary>

diff --git a/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.net6.csproj b/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.net6.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(Net35FrameworkPathOverride)</FrameworkPathOverride>
-    <Version>3.15.4-beta3</Version>
+    <Version>3.15.5-beta3</Version>
     <LangVersion>10.0</LangVersion>
     <AssemblyName>Senparc.Weixin.Work</AssemblyName>
     <RootNamespace>Senparc.Weixin.Work</RootNamespace>
@@ -13,17 +13,17 @@
 			Senparc.Weixin SDK 开源项目：
 			https://github.com/JeffreySu/WeiXinMPSDK
 		</Description>
-    <Copyright>Senparc Copyright © 2004~2022</Copyright>
-    <PackageTags>微信,weixin,公众号,企业微信,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,企业号</PackageTags>
-    <Authors>Jeffrey Su</Authors>
-    <Owners>Senparc</Owners>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
-    <Title>Senparc.Weixin.Work.dll</Title>
-    <Summary>微信公众号SDK for C#</Summary>
-    <PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
-    <PackageIcon>icon.jpg</PackageIcon>
-    <PackageReleaseNotes>
+		<Copyright>Senparc Copyright © 2004~2022</Copyright>
+		<PackageTags>微信,weixin,公众号,企业微信,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,企业号</PackageTags>
+		<Authors>Jeffrey Su</Authors>
+		<Owners>Senparc</Owners>
+		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+		<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
+		<Title>Senparc.Weixin.Work.dll</Title>
+		<Summary>微信公众号SDK for C#</Summary>
+		<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
+		<PackageIcon>icon.jpg</PackageIcon>
+		<PackageReleaseNotes>
 			v0.1.0 完成从Senparc.Weixin.Work.dll的初步移植，添加Work（企业微信）中的新接口
 
 			v0.2.0 1、整理类名，MessageHandler跑通
@@ -173,66 +173,67 @@
 			v3.14.3 修正“批量获取客户详情”接口传入参数
 			v3.14.6 添加“审批申请状态变化回调通知”接口
 			v3.14.7 添加“自建应用&gt;审批流程引擎”接口及 Sample
-		v3.14.8 为 JsApiTicket 提供 IsAgentConfig 参数
-		v3.14.10 添加异步方法
-		v3.14.11 优化OAuth相关接口
-		v3.15.1 修复 LoginCheckResultJson 缺少 open_userid
-		v3.15.2 添加“用户标签管理”接口
-		v3.15.4 调整批量获取客户详情返回值
-</PackageReleaseNotes>
-    <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
-    <SignAssembly>False</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\BuildOutPut</OutputPath>
-    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\BuildOutPut</OutputPath>
-    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-    <DocumentationFile>..\..\BuildOutPut\Senparc.Weixin.Work.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
-    <OutputPath>..\..\BuildOutPut\</OutputPath>
-    <DocumentationFile>..\..\BuildOutPut\net462\Senparc.Weixin.Work.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
-    <OutputPath>..\..\BuildOutPut\</OutputPath>
-    <DocumentationFile>..\..\BuildOutPut\netstandard2.0\Senparc.Weixin.Work.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
-    <OutputPath>..\..\BuildOutPut\</OutputPath>
-    <DocumentationFile>..\..\BuildOutPut\netstandard2.1\Senparc.Weixin.Work.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
+			v3.14.8 为 JsApiTicket 提供 IsAgentConfig 参数
+			v3.14.10 添加异步方法
+			v3.14.11 优化OAuth相关接口
+			v3.15.1 修复 LoginCheckResultJson 缺少 open_userid
+			v3.15.2 添加“用户标签管理”接口
+			v3.15.4 添加 MailList.Member 下的 biz_mail 属性
+			v3.15.5 调整批量获取客户详情返回值
+		</PackageReleaseNotes>
+		<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
+		<SignAssembly>False</SignAssembly>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<OutputPath>..\..\BuildOutPut</OutputPath>
+		<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+		<OutputPath>..\..\BuildOutPut</OutputPath>
+		<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+		<DocumentationFile>..\..\BuildOutPut\Senparc.Weixin.Work.XML</DocumentationFile>
+		<Optimize>true</Optimize>
+		<DebugType>pdbonly</DebugType>
+		<ErrorReport>prompt</ErrorReport>
+		<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
+		<OutputPath>..\..\BuildOutPut\</OutputPath>
+		<DocumentationFile>..\..\BuildOutPut\net462\Senparc.Weixin.Work.xml</DocumentationFile>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+		<OutputPath>..\..\BuildOutPut\</OutputPath>
+		<DocumentationFile>..\..\BuildOutPut\netstandard2.0\Senparc.Weixin.Work.xml</DocumentationFile>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
+		<OutputPath>..\..\BuildOutPut\</OutputPath>
+		<DocumentationFile>..\..\BuildOutPut\netstandard2.1\Senparc.Weixin.Work.xml</DocumentationFile>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Include="..\..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
+	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+		<Reference Include="System.Core" />
+		<Reference Include="System.Data" />
+		<Reference Include="System.Data.DataSetExtensions" />
+		<Reference Include="System.Net.Http" />
+		<Reference Include="System.Runtime.Serialization" />
+		<Reference Include="System.Web" />
+		<Reference Include="System.Web.Extensions" />
+		<Reference Include="System.Xml" />
+		<Reference Include="System.Xml.Linq" />
+	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
+		<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+		<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+	</ItemGroup>
 </Project>