Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Developer #2761

Merged
merged 2 commits into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="2.1.3.2" />
<PackageReference Include="Senparc.NeuChar" Version="2.1.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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.3.2.3" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.1.4.2" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.3.3.4" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.1.4.3" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.3.4" />

<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.4" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.18.9" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="0.8.4" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.4" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.5.2" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.18.10.1" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="0.8.5.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.5.1" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.4" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.18.9" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.4" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.12.4" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.5.2" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.18.10.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.5.1" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.12.5.2" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.8" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.4" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.18.9" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.4" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="0.6.7-beta1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.5.2" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.18.10.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.12.5.1" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="0.6.8.4" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.8" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.4" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.15.14" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="0.8.5" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.5.2" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.15.14.1" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="0.8.5.1" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.4" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="0.6.8" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.15.11" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="0.8.5" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="0.8.5.2" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="0.6.8.4" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.15.11.1" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="0.8.5.1" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<Version>0.17.5.1</Version>
<Version>0.17.5.2</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -132,7 +132,7 @@
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="2.1.4.2" />
<PackageReference Include="Senparc.CO2NET" Version="2.1.6" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net7.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1<!--;net6.0;net7.0--></TargetFrameworks>
<Version>0.8.5.2</Version>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>0.8.5.3</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<!--<OutputType>Library</OutputType>-->
Expand All @@ -28,7 +28,7 @@
1、优化 UseSenparcWeixin()
2、添加 WeixinResult、FixWeixinBugWeixinResult
v0.8.5.2 修复证书传入参数可能为 null 的问题
</PackageReleaseNotes>
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
<PackageId>Senparc.Weixin.AspNet</PackageId>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>0.8.5.1</Version>
<Version>0.8.5.2</Version>
<AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -61,7 +61,7 @@
<ItemGroup>
<!--<PackageReference Include="Senparc.Weixin.Cache.Redis.RedLock" Version="0.1.0" />-->
<!--<PackageReference Include="BinaryFormatter" Version="2.1.4" />-->
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="1.1.2.2" />
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="1.1.3.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>2.13.5.1</Version>
<Version>2.13.5.2</Version>
<AssemblyName>Senparc.Weixin.Cache.Memcached</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Memcached</RootNamespace>
<Description>
Expand Down Expand Up @@ -144,7 +144,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="4.1.1.2" />
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="4.1.2.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>2.15.5.1</Version>
<Version>2.15.5.2</Version>
<AssemblyName>Senparc.Weixin.Cache.Redis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Redis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -133,7 +133,7 @@
</ItemGroup>
<ItemGroup>
<!--<PackageReference Include="BinaryFormatter" Version="2.1.4" />-->
<PackageReference Include="Senparc.CO2NET.Cache.Redis" Version="4.1.1.2" />
<PackageReference Include="Senparc.CO2NET.Cache.Redis" Version="4.1.2.3" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<!--<PackageReference Include="StackExchange.Redis" Version="1.2.6" />-->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<Version>0.8.5.1</Version>
<Version>0.8.5.2</Version>
<AssemblyName>Senparc.Weixin.MP.Middleware</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.Middleware</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<Version>7.12.5.1</Version>
<Version>7.12.5.2</Version>
<AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -151,7 +151,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="2.1.3.2" />
<PackageReference Include="Senparc.NeuChar" Version="2.1.3.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin.AspNet\Senparc.Weixin.AspNet.net7.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>16.18.10.1</Version>
<Version>16.18.10.2</Version>
<AssemblyName>Senparc.Weixin.MP</AssemblyName>
<RootNamespace>Senparc.Weixin.MP</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -577,9 +577,9 @@
<!--<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />-->
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.APM" Version="1.2.3.2" />
<PackageReference Include="Senparc.NeuChar" Version="2.1.3.2" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.1.4.2" />
<PackageReference Include="Senparc.CO2NET.APM" Version="1.2.4.3" />
<PackageReference Include="Senparc.NeuChar" Version="2.1.3.3" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.1.4.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net451;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>16.12.5.1</Version>
<Version>16.12.5.2</Version>
<AssemblyName>Senparc.Weixin.MP</AssemblyName>
<RootNamespace>Senparc.Weixin.MP</RootNamespace>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="Senparc.CO2NET.AspNet" Version="1.1.3.4" />
<PackageReference Include="Senparc.CO2NET.AspNet" Version="1.1.4.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
修改标识:mc7246 - 20220402
修改描述:v4.13.9 添加试用小程序接口

修改标识:Senparc - 20230110
修改描述:v4.14.14 添加接口:设置第三方平台服务器域名

----------------------------------------------------------------*/

/*
Expand Down Expand Up @@ -445,18 +448,18 @@ public static WxJsonResult VerifyBetaWeApp(string componentAccessToken, string e

//var data;
object data = new
{
verify_info = new
{
verify_info = new
{
enterprise_name = entName,
code = entCode,
code_type = codeType,
legal_persona_wechat = legalPersonaWechat,
legal_persona_name = legalPersonaName,
legal_persona_idcard = legalPersonaIDCard,
component_phone = componentPhone
}
};
enterprise_name = entName,
code = entCode,
code_type = codeType,
legal_persona_wechat = legalPersonaWechat,
legal_persona_name = legalPersonaName,
legal_persona_idcard = legalPersonaIDCard,
component_phone = componentPhone
}
};

return CommonJsonSend.Send<WxJsonResult>(null, url, data, CommonJsonSendType.POST, timeOut);
}
Expand Down Expand Up @@ -591,6 +594,42 @@ public static UploadPrivacyExtFileResult UploadPrivacyExtFile(string componentAc
fileDictionary["file"] = file;
return CO2NET.HttpUtility.Post.PostFileGetJson<UploadPrivacyExtFileResult>(serviceProvider ?? CommonDI.CommonSP, url, null, fileDictionary, null, timeOut: timeOut);
}

#region 域名管理

/// <summary>
/// 设置第三方平台服务器域名
/// <para>本接口用于配置第三方平台小程序服务器域名。</para>
/// <para>授权给第三方代开发的小程序,其服务器域名只可以为在第三方平台账号中配置的小程序服务器域名。即调用接口设置小程序服务器域名之前可以调本接口先进行第三方平台小程序服务器域名配置。</para>
/// <para>使用过程中如遇到问题,可在开放平台服务商专区发帖交流。</para>
/// <para>调试工具:https://developers.weixin.qq.com/apiExplorer?apiName=modifyThirdpartyServerDomain&plat=thirdparty</para>
/// <para>文档:https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/thirdparty-management/domain-mgnt/modifyThirdpartyServerDomain.html</para>
/// </summary>
/// <param name="componentAccessToken"></param>
/// <param name="action">操作类型。</param>
/// <param name="wxa_server_domain">最多可以添加1000个服务器域名,以;隔开。注意:域名不需带有http:// 等协议内容,也不能在域名末尾附加详细的 URI 地址,严格按照类似 www.qq.com 的写法。</param>
/// <param name="is_modify_published_together">是否同时修改“全网发布版本的值”。(false:只改“测试版”;true:同时改“测试版”和“全网发布版”)省略时,默认为false。</param>
/// <param name="timeOut"></param>
/// <returns></returns>
public static ModifyWxaServerDomainResult ModifyWxaServerDomain(string componentAccessToken, ModifyWxaServerDomain_Action action, string wxa_server_domain = null, bool? is_modify_published_together = null, int timeOut = Config.TIME_OUT)
{
var url =
string.Format(
Config.ApiMpHost + "/cgi-bin/component/modify_wxa_server_domain?access_token={0}",
componentAccessToken.AsUrlData());

var data = new
{
action = action.ToString(),
wxa_server_domain,
is_modify_published_together
};

return CommonJsonSend.Send<ModifyWxaServerDomainResult>(null, url, data, CommonJsonSendType.POST, timeOut, jsonSetting: new CO2NET.Helpers.Serializers.JsonSetting(true));
}

#endregion

#endregion


Expand Down Expand Up @@ -973,7 +1012,7 @@ public static async Task<WxJsonResult> VerifyBetaWeAppAsync(string componentAcce
/// <param name="name"></param>
/// <param name="timeOut"></param>
/// <returns></returns>
public static async Task< WxJsonResult> SetBetaWeAppNickNameAsync(string componentAccessToken, string name, int timeOut = Config.TIME_OUT)
public static async Task<WxJsonResult> SetBetaWeAppNickNameAsync(string componentAccessToken, string name, int timeOut = Config.TIME_OUT)
{
var url = string.Format(
Config.ApiMpHost + "/wxa/setbetaweappnickname?access_token={0}",
Expand Down Expand Up @@ -1097,6 +1136,42 @@ public static async Task<UploadPrivacyExtFileResult> UploadPrivacyExtFileAsync(s
fileDictionary["file"] = file;
return await CO2NET.HttpUtility.Post.PostFileGetJsonAsync<UploadPrivacyExtFileResult>(serviceProvider ?? CommonDI.CommonSP, url, null, fileDictionary, null, timeOut: timeOut);
}

#region 域名管理

/// <summary>
/// 设置第三方平台服务器域名
/// <para>本接口用于配置第三方平台小程序服务器域名。</para>
/// <para>授权给第三方代开发的小程序,其服务器域名只可以为在第三方平台账号中配置的小程序服务器域名。即调用接口设置小程序服务器域名之前可以调本接口先进行第三方平台小程序服务器域名配置。</para>
/// <para>使用过程中如遇到问题,可在开放平台服务商专区发帖交流。</para>
/// <para>调试工具:https://developers.weixin.qq.com/apiExplorer?apiName=modifyThirdpartyServerDomain&plat=thirdparty</para>
/// <para>文档:https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/thirdparty-management/domain-mgnt/modifyThirdpartyServerDomain.html</para>
/// </summary>
/// <param name="componentAccessToken"></param>
/// <param name="action">操作类型。</param>
/// <param name="wxa_server_domain">最多可以添加1000个服务器域名,以;隔开。注意:域名不需带有http:// 等协议内容,也不能在域名末尾附加详细的 URI 地址,严格按照类似 www.qq.com 的写法。</param>
/// <param name="is_modify_published_together">是否同时修改“全网发布版本的值”。(false:只改“测试版”;true:同时改“测试版”和“全网发布版”)省略时,默认为false。</param>
/// <param name="timeOut"></param>
/// <returns></returns>
public static async Task<ModifyWxaServerDomainResult> ModifyWxaServerDomainAsync(string componentAccessToken, ModifyWxaServerDomain_Action action, string wxa_server_domain = null, bool? is_modify_published_together = null, int timeOut = Config.TIME_OUT)
{
var url =
string.Format(
Config.ApiMpHost + "/cgi-bin/component/modify_wxa_server_domain?access_token={0}",
componentAccessToken.AsUrlData());

var data = new
{
action = action.ToString(),
wxa_server_domain,
is_modify_published_together
};

return await CommonJsonSend.SendAsync<ModifyWxaServerDomainResult>(null, url, data, CommonJsonSendType.POST, timeOut, jsonSetting: new CO2NET.Helpers.Serializers.JsonSetting(true));
}

#endregion

#endregion
}
}
Loading