Skip to content

Commit

Permalink
Merge pull request #3104 from JeffreySu/Developer
Browse files Browse the repository at this point in the history 
Developer
  • Loading branch information
@JeffreySu
JeffreySu authored Nov 29, 2024
2 parents 5335b9e + 7fca2da commit c4b9cb0
Show file tree
Hide file tree
Showing 38 changed files with 342 additions and 174 deletions.
2 changes: 1 addition & 1 deletion ...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net8Sample.CommonService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Senparc.AI.Agents" Version="0.4.0" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.21.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
Expand Down
6 changes: 3 additions & 3 deletions Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Senparc.Weixin.Sample.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Senparc.AI.Agents" Version="0.4.0" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.21.0" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="2.0.0-beta3" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.5.0" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.6.0" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="2.0.2-beta3" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.5.1" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.6.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
Expand Down
9 changes: 2 additions & 7 deletions src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.net8.csproj
View file
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;net8.0</TargetFrameworks>
<Version>1.1.5</Version>
<Version>1.1.6</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -104,17 +104,12 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
<!--<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />-->
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<!--<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />-->
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="3.0.0-beta3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Senparc.CO2NET" Version="3.0.1-beta3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.All/Senparc.Weixin.All.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>2024.11.19</Version>
<Version>2024.11.29</Version>
<LangVersion>10.0</LangVersion>
<AssemblyName>Senparc.Weixin.All</AssemblyName>
<RootNamespace>Senparc.Weixin.All</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net8.csproj
View file
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>1.4.6</Version>
<Version>1.4.7</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<!--<OutputType>Library</OutputType>-->
Expand Down Expand Up @@ -74,7 +74,7 @@
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.6.0" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.6.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions ...enparc.Weixin.Cache/Senparc.Weixin.Cache.CsRedis/Senparc.Weixin.Cache.CsRedis.net8.csproj
View file
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>1.1.4</Version>
<Version>1.1.5</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="2.0.1-beta1" />
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="2.1.1-beta1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.Cache/Senparc.Weixin.Cache.Dapr/Senparc.Weixin.Cache.Dapr.net8.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<Version>0.2.4-beta1</Version>
<Version>0.2.5-beta1</Version>
<AssemblyName>Senparc.Weixin.Cache.Dapr</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Dapr</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -56,7 +56,7 @@
<None Include="..\..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.Cache.Dapr" Version="1.0.0-beta1" />
<PackageReference Include="Senparc.CO2NET.Cache.Dapr" Version="1.0.1-beta1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions ...rc.Weixin.Cache/Senparc.Weixin.Cache.Memcached/Senparc.Weixin.Cache.Memcached.net8.csproj
View file
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.18.5</Version>
<Version>2.18.6</Version>
<AssemblyName>Senparc.Weixin.Cache.Memcached</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Memcached</RootNamespace>
<Description>
Expand Down Expand Up @@ -143,7 +143,7 @@
<Compile Remove="MamcachedCacheLock.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="5.0.0-beta1" />
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="5.0.1-beta1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.Cache/Senparc.Weixin.Cache.Redis/Senparc.Weixin.Cache.Redis.net8.csproj
View file
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.20.5</Version>
<Version>2.20.6</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="5.0.1-beta1" />
<PackageReference Include="Senparc.CO2NET.Cache.Redis" Version="5.1.1-beta1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<!--<PackageReference Include="StackExchange.Redis" Version="1.2.6" />-->
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net8.csproj
View file
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;net8.0</TargetFrameworks>
<Version>1.4.6</Version>
<Version>1.4.7</Version>
<AssemblyName>Senparc.Weixin.MP.Middleware</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.Middleware</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -72,7 +72,7 @@
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.6.0" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.6.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.net8.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions ...MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.net8.csproj
View file
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;net8.0</TargetFrameworks>
<Version>7.16.6</Version>
<Version>7.16.7</Version>
<AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -148,7 +148,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="2.5.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin.AspNet\Senparc.Weixin.AspNet.net8.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Media/MediaApi.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ public static async Task<UploadTemporaryMediaResult> UploadTemporaryMediaAsync(s
var url = string.Format(Config.ApiMpHost + "/cgi-bin/media/upload?access_token={0}&type={1}", accessToken.AsUrlData(), type.ToString().AsUrlData());
var fileDictionary = new Dictionary<string, string>();
fileDictionary["media"] = file;
return await CO2NET.HttpUtility.Post.PostFileGetJsonAsync<UploadTemporaryMediaResult>(CommonDI.CommonSP, url, null, fileDictionary, null, null, null, false, timeOut: timeOut).ConfigureAwait(false);
return await CO2NET.HttpUtility.Post.PostFileGetJsonAsync<UploadTemporaryMediaResult>(CommonDI.CommonSP, url, null, fileDictionary, timeOut: timeOut).ConfigureAwait(false);

}, accessTokenOrAppId).ConfigureAwait(false);
}
Expand Down
2 changes: 2 additions & 0 deletions ...enparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/OAuth/OAuthJson/OAuthAccessTokenResult.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ and limitations under the License.
修改标识：Senparc - 20220910
修改说明：v16.18.6 OAuth 的 AccessToken 获取接口添加 is_snapshotuser 返回值
----------------------------------------------------------------*/

using System;
Expand Down
8 changes: 4 additions & 4 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.net8.csproj
View file
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.23.5</Version>
<Version>16.23.6</Version>
<AssemblyName>Senparc.Weixin.MP</AssemblyName>
<RootNamespace>Senparc.Weixin.MP</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -576,9 +576,9 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.APM" Version="2.0.0-beta1" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.0" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.5.0" />
<PackageReference Include="Senparc.CO2NET.APM" Version="2.0.1-beta1" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.1" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
11 changes: 11 additions & 0 deletions src/Senparc.Weixin.Open/Senparc.Weixin.Open/OAuthAPIs/OAuthJson/OAuthAccessTokenResult.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
修改标识：Senparc - 20161216
修改描述：v2.3.5 添加序列化特性
修改标识：Senparc - 20241129
修改描述：v4.21.8 返回值添加参数 is_snapshotuser 和 unionid
----------------------------------------------------------------*/

Expand Down Expand Up @@ -44,5 +47,13 @@ public class OAuthAccessTokenResult : WxJsonResult
/// 用户授权的作用域，使用逗号（,）分隔
/// </summary>
public string scope { get; set; }
/// <summary>
/// 用户统一标识（针对一个微信开放平台账号下的应用，同一用户的 unionid 是唯一的），只有当scope为"snsapi_userinfo"时返回
/// </summary>
public string unionid { get; set; }
/// <summary>
/// 是否为快照页模式虚拟账号，只有当用户是快照页模式虚拟账号是返回，值为1
/// </summary>
public int? is_snapshotuser { get; set; }
}
}
5 changes: 3 additions & 2 deletions src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.net8.csproj
View file
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>4.21.7</Version>
<Version>4.21.9</Version>
<AssemblyName>Senparc.Weixin.Open</AssemblyName>
<RootNamespace>Senparc.Weixin.Open</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -227,6 +227,7 @@
[2024-08-11] v4.20.0.0 1、添加查询小程序是否已完成交易结算管理确认 2、添加第三方小程序订单页设置结果及审核结果事件通知 #3055 感谢 @mc7246
[2024-09-10] v4.20.2 icp verifytask 接口 data 不能为 null 的问题处理 #3067 感谢 @mojinxun
[2024-11-03] v4.20.6 fix wxa ap is get qr code async Issue #3089, PR #3090 感谢 @JaneConan
[2024-11-29] v4.21.8 返回值添加参数 is_snapshotuser 和 unionid #3100 感谢 @ccccccmd
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
</PropertyGroup>
Expand Down Expand Up @@ -270,7 +271,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="2.5.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPay/Senparc.Weixin.TenPay.net8.csproj
View file
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>1.17.5</Version>
<Version>1.17.6</Version>
<AssemblyName>Senparc.Weixin.TenPay</AssemblyName>
<RootNamespace>Senparc.Weixin.TenPay</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -97,7 +97,7 @@
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.AspNet" Version="2.0.0-beta1" />
<PackageReference Include="Senparc.CO2NET.AspNet" Version="2.0.1-beta1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net8.csproj" />
Expand Down
1 change: 1 addition & 0 deletions ...rc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Apis/Profitsharing/ProfitsharingApisTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

namespace Senparc.Weixin.TenPayV3.Test.net6.Apis
{
[TestClass()]
public class ProfitsharingApisTest : BaseTenPayTest
{
#region 分账接口
Expand Down
5 changes: 0 additions & 5 deletions ...nparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Senparc.Weixin.TenPayV3.Test.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="appsettings.Test.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
Expand Down
2 changes: 2 additions & 0 deletions src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/appsettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
"TenPayV3_PrivateKey": "#{TenPayV3_PrivateKey}#", //（新）证书私钥
"TenPayV3_SerialNumber": "#{TenPayV3_SerialNumber}#", //（新）证书序列号
"TenPayV3_ApiV3Key": "#{TenPayV3_APIv3Key}#", //（新）APIv3 密钥
"TenPayV3_TenPayPubKey": "#{TenPayV3_TenPayPubKey}#", // （新）微信支付公钥证书-验证微信支付身份，支持本地项目路径/字符串，空则代表使用原来的平台证书，如：D:\\cert\\cert.pem
"TenPayV3_TenPayPubKeyID": "#{TenPayV3_TenPayPubKeyID}#", // (新）微信支付公钥ID-验证微信支付身份，空则代表使用原来的平台证书，如PUB_KEY_ID_0000000000000000000000
//如果不设置TenPayV3_WxOpenTenpayNotify，默认在 TenPayV3_TenpayNotify 的值最后加上 "WxOpen"
"TenPayV3_WxOpenTenpayNotify": "#{TenPayV3_WxOpenTenpayNotify}#", //http://YourDomainName/TenpayV3/PayNotifyUrlWxOpen
//开放平台
Expand Down
15 changes: 11 additions & 4 deletions src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/BasePay/BasePayApis.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ internal static string GetPayApiUrl(string urlFormat, string sp_mchid = "")
/// <returns></returns>
public async Task<CertificatesResultJson> CertificatesAsync(string algorithmType = "RSA", int timeOut = Config.TIME_OUT)
{
var url = BasePayApis.GetPayApiUrl(Senparc.Weixin.Config.TenPayV3Host + "/{0}v3/certificates?algorithm_type=" + algorithmType);
var url = GetPayApiUrl(Senparc.Weixin.Config.TenPayV3Host + "/{0}v3/certificates?algorithm_type=" + algorithmType);
TenPayApiRequest tenPayApiRequest = new(_tenpayV3Setting);
//var responseMessge = await tenPayApiRequest.GetHttpResponseMessageAsync(url, null, timeOut);
//return await responseMessge.Content.ReadAsStringAsync();
Expand All @@ -132,7 +132,15 @@ public async Task<CertificatesResultJson> CertificatesAsync(string algorithmType
/// <returns></returns>
public async Task<PublicKeyCollection> GetPublicKeysAsync(/*int timeOut = Config.TIME_OUT*/)
{
string algorithmType = _tenpayV3Setting.EncryptionType == CertType.SM.ToString() ? "SM2" : "RSA";
PublicKeyCollection keys = new();

if (_tenpayV3Setting.TenPayV3_TenPayPubKeyEnable)
{
keys[_tenpayV3Setting.TenPayV3_TenPayPubKeyID] = SecurityHelper.GetUnwrapCertKey(_tenpayV3Setting.TenPayV3_TenPayPubKey);
return keys;
}

var algorithmType = _tenpayV3Setting.EncryptionType == CertType.SM.ToString() ? "SM2" : "RSA";
var certificates = await CertificatesAsync(algorithmType);
if (!certificates.ResultCode.Success)
{
Expand All @@ -144,12 +152,11 @@ public async Task<PublicKeyCollection> GetPublicKeysAsync(/*int timeOut = Config
throw new TenpayApiRequestException("Certificates 获取结果为空");
}

PublicKeyCollection keys = new();
//var tenpayV3Setting = Senparc.Weixin.Config.SenparcWeixinSetting.TenpayV3Setting;//TODO:改成从构造函数配置

foreach (var cert in certificates.data)
{
if(cert.encrypt_certificate.algorithm == "AEAD_AES_256_GCM")
if (cert.encrypt_certificate.algorithm == "AEAD_AES_256_GCM")
{
var publicKey = SecurityHelper.AesGcmDecryptCiphertext(_tenpayV3Setting.TenPayV3_APIv3Key, cert.encrypt_certificate.nonce,
cert.encrypt_certificate.associated_data, cert.encrypt_certificate.ciphertext);
Expand Down
Loading

0 comments on commit c4b9cb0

Please sign in to comment.