Skip to content

Developer #3140

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 30, 2025
Merged

Developer #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a271d
更新独立 Samples 中的基础库
JeffreySu May 30, 2025
665cded
Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK …
JeffreySu May 30, 2025
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
4 changes: 2 additions & 2 deletions ...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net8Sample.CommonService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<None Remove="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.AI.Agents" Version="0.5.2" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.23.0" />
<PackageReference Include="Senparc.AI.Agents" Version="0.5.5" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.23.4" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Senparc.Weixin.Sample.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Senparc.AI.Agents" Version="0.5.2" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.23.0" />
<PackageReference Include="Senparc.AI.Agents" Version="0.5.5" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.23.4" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="2.1.0.1" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.5.2" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.6.2" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/MP/Senparc.Weixin.Sample.MP.Simple/Senparc.Weixin.Sample.MP.Simple.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.Weixin.All" Version="2025.1.21" />
<PackageReference Include="Senparc.Weixin.All" Version="2025.2.16" />
</ItemGroup>
<!-- 此节点为 Sample 共享文件需要而添加，实际项目无需添加 -->
<Import Project="..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems" Label="Shared" />
Expand Down
8 changes: 4 additions & 4 deletions Samples/MP/Senparc.Weixin.Sample.MP/Senparc.Weixin.Sample.MP.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.23.6.1" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.16.7.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.9" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.23.8" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.4.9" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.16.9" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
8 changes: 4 additions & 4 deletions Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Senparc.Weixin.Sample.TenPayV2.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.23.6.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.16.7.1" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.17.6.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.9" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.23.8" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.16.9" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.17.8" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions Samples/TenPayV3/Senparc.Weixin.Sample.TenPayV3/Controllers/TenPayApiV3Controller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public static TenPayV3Info TenPayV3Info
/// </summary>
public static ConcurrentDictionary<string, string> TradeNumberToTransactionId = new ConcurrentDictionary<string, string>();

private static bool _isPublicKey = false;

public TenPayApiV3Controller(SenparcHttpClient httpClient)
{
Expand Down Expand Up @@ -297,7 +298,7 @@ public async Task<IActionResult> JsApi(int productId, int hc)
}

//获取 UI 信息包
var jsApiUiPackage = TenPaySignHelper.GetJsApiUiPackage(TenPayV3Info.AppId, result.prepay_id);
var jsApiUiPackage = TenPaySignHelper.GetJsApiUiPackage(TenPayV3Info.AppId, result.prepay_id, _tenpayV3Setting);
ViewData["jsApiUiPackage"] = jsApiUiPackage;

//临时记录订单信息，留给退款申请接口测试使用（分布式情况下请注意数据同步）
Expand All @@ -324,7 +325,7 @@ public async Task<IActionResult> PayNotifyUrl()
{
//获取微信服务器异步发送的支付通知信息
var resHandler = new TenPayNotifyHandler(HttpContext);
var orderReturnJson = await resHandler.DecryptGetObjectAsync<OrderReturnJson>();
var orderReturnJson = await resHandler.DecryptGetObjectAsync<OrderReturnJson>(_isPublicKey);

//记录日志
Senparc.Weixin.WeixinTrace.SendCustomLog("PayNotifyUrl 接收到消息", orderReturnJson.ToJson(true));
Expand Down Expand Up @@ -552,7 +553,7 @@ public async Task<IActionResult> RefundNotifyUrl()
try
{
var resHandler = new TenPayNotifyHandler(HttpContext);
var refundNotifyJson = await resHandler.DecryptGetObjectAsync<RefundNotifyJson>();
var refundNotifyJson = await resHandler.DecryptGetObjectAsync<RefundNotifyJson>(_isPublicKey);

WeixinTrace.SendCustomLog("跟踪RefundNotifyUrl信息", refundNotifyJson.ToJson());

Expand Down
8 changes: 4 additions & 4 deletions Samples/TenPayV3/Senparc.Weixin.Sample.TenPayV3/Senparc.Weixin.Sample.TenPayV3.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.23.6.1" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.16.7.1" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.7.8.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.9" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.23.8" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.16.9" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="2.0.1" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Samples/Work/Senparc.Weixin.Sample.Work/Senparc.Weixin.Sample.Work.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.25.2.1" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.9" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.25.5" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.4.9" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
8 changes: 4 additions & 4 deletions Samples/WxOpen/Senparc.Weixin.Sample.WxOpen/Senparc.Weixin.Sample.WxOpen.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.7.8.1" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.23.2.1" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.4.7.1" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.4.9" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="2.0.1" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.23.4" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.4.9" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="3.1.2" />
<PackageReference Include="Senparc.CO2NET" Version="3.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin/Senparc.Weixin/Senparc.Weixin.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Senparc.CO2NET" Version="3.1.2" />
<PackageReference Include="Senparc.CO2NET" Version="3.1.3" />
<PackageReference Include="Senparc.NeuChar" Version="2.5.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
Expand Down