😁调整微信相关逻辑

Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs

@@ -18,17 +18,19 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     private readonly SqlSugarRepository<SysWechatPay> _sysWechatPayUserRep;
 
     private readonly WechatPayOptions _wechatPayOptions;
-    public readonly WechatTenpayClient WechatTenpayClient;
     private readonly PayCallBackOptions _payCallBackOptions;
 
+    private readonly WechatTenpayClient _wechatTenpayClient;
+
     public SysWechatPayService(SqlSugarRepository<SysWechatPay> sysWechatPayUserRep,
         IOptions<WechatPayOptions> wechatPayOptions,
         IOptions<PayCallBackOptions> payCallBackOptions)
     {
         _sysWechatPayUserRep = sysWechatPayUserRep;
         _wechatPayOptions = wechatPayOptions.Value;
-        WechatTenpayClient = CreateTenpayClient();
         _payCallBackOptions = payCallBackOptions.Value;
+
+        _wechatTenpayClient = CreateTenpayClient();
     }
 
     /// <summary>
@@ -58,7 +60,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     [DisplayName("生成JSAPI调起支付所需参数")]
     public dynamic GenerateParametersForJsapiPay(WechatPayParaInput input)
     {
-        return WechatTenpayClient.GenerateParametersForJsapiPayRequest(_wechatPayOptions.AppId, input.PrepayId);
+        return _wechatTenpayClient.GenerateParametersForJsapiPayRequest(_wechatPayOptions.AppId, input.PrepayId);
     }
 
     /// <summary>
@@ -79,7 +81,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
             Amount = new CreatePayTransactionJsapiRequest.Types.Amount() { Total = input.Total },
             Payer = new CreatePayTransactionJsapiRequest.Types.Payer() { OpenId = input.OpenId }
         };
-        var response = await WechatTenpayClient.ExecuteCreatePayTransactionJsapiAsync(request);
+        var response = await _wechatTenpayClient.ExecuteCreatePayTransactionJsapiAsync(request);
         if (!response.IsSuccessful())
             throw Oops.Oh(response.ErrorMessage);
 
@@ -126,7 +128,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
             Amount = new CreatePayPartnerTransactionJsapiRequest.Types.Amount() { Total = input.Total },
             Payer = new CreatePayPartnerTransactionJsapiRequest.Types.Payer() { OpenId = input.OpenId }
         };
-        var response = await WechatTenpayClient.ExecuteCreatePayPartnerTransactionJsapiAsync(request);
+        var response = await _wechatTenpayClient.ExecuteCreatePayPartnerTransactionJsapiAsync(request);
         if (!response.IsSuccessful())
             throw Oops.Oh(response.ErrorMessage);
 
@@ -178,10 +180,10 @@ public class SysWechatPayService : IDynamicApiController, ITransient
         var b = ms.ToArray();
         var callbackJson = Encoding.UTF8.GetString(b);
 
-        var callbackModel = WechatTenpayClient.DeserializeEvent(callbackJson);
+        var callbackModel = _wechatTenpayClient.DeserializeEvent(callbackJson);
         if ("TRANSACTION.SUCCESS".Equals(callbackModel.EventType))
         {
-            var callbackResource = WechatTenpayClient.DecryptEventResource<TransactionResource>(callbackModel);
+            var callbackResource = _wechatTenpayClient.DecryptEventResource<TransactionResource>(callbackModel);
 
             // 修改订单支付状态
             var wechatPay = await _sysWechatPayUserRep.GetFirstAsync(u => u.OutTradeNumber == callbackResource.OutTradeNumber
@@ -225,10 +227,10 @@ public class SysWechatPayService : IDynamicApiController, ITransient
         var b = ms.ToArray();
         var callbackJson = Encoding.UTF8.GetString(b);
 
-        var callbackModel = WechatTenpayClient.DeserializeEvent(callbackJson);
+        var callbackModel = _wechatTenpayClient.DeserializeEvent(callbackJson);
         if ("TRANSACTION.SUCCESS".Equals(callbackModel.EventType))
         {
-            var callbackResource = WechatTenpayClient.DecryptEventResource<PartnerTransactionResource>(callbackModel);
+            var callbackResource = _wechatTenpayClient.DecryptEventResource<PartnerTransactionResource>(callbackModel);
 
             // 修改订单支付状态
             var wechatPay = await _sysWechatPayUserRep.GetFirstAsync(u => u.OutTradeNumber == callbackResource.OutTradeNumber

Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatService.cs

@@ -16,18 +16,18 @@ namespace Admin.NET.Core.Service;
 public class SysWechatService : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<SysWechatUser> _sysWechatUserRep;
-    private readonly WechatApiClient _wechatApiClient;
-    private readonly WechatApiHttpClient _wechatApiHttpClient;
     private readonly SysConfigService _sysConfigService;
+    private readonly WechatApiHttpClient _wechatApiHttpClient;
+    private readonly WechatApiClient _wechatApiClient;
 
     public SysWechatService(SqlSugarRepository<SysWechatUser> sysWechatUserRep,
-        WechatApiHttpClient wechatApiHttpClient,
-        SysConfigService sysConfigService)
+        SysConfigService sysConfigService,
+        WechatApiHttpClient wechatApiHttpClient)
     {
         _sysWechatUserRep = sysWechatUserRep;
-        _wechatApiClient = wechatApiHttpClient.CreateWechatClient();
-        _wechatApiHttpClient = wechatApiHttpClient;
         _sysConfigService = sysConfigService;
+        _wechatApiHttpClient = wechatApiHttpClient;
+        _wechatApiClient = wechatApiHttpClient.CreateWechatClient();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs

@@ -16,16 +16,16 @@ namespace Admin.NET.Core.Service;
 public class SysWxOpenService : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<SysWechatUser> _sysWechatUserRep;
-    private readonly WechatApiClient _wechatApiClient;
     private readonly SysConfigService _sysConfigService;
+    private readonly WechatApiClient _wechatApiClient;
 
     public SysWxOpenService(SqlSugarRepository<SysWechatUser> sysWechatUserRep,
-        WechatApiHttpClient wechatApiHttpClient,
-        SysConfigService sysConfigService)
+        SysConfigService sysConfigService,
+        WechatApiHttpClient wechatApiHttpClient)
     {
         _sysWechatUserRep = sysWechatUserRep;
-        _wechatApiClient = wechatApiHttpClient.CreateWxOpenClient();
         _sysConfigService = sysConfigService;
+        _wechatApiClient = wechatApiHttpClient.CreateWxOpenClient();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Wechat/WechatApiHttpClient.cs

@@ -12,7 +12,7 @@ namespace Admin.NET.Core.Service;
 /// <summary>
 /// 微信API客户端
 /// </summary>
-public partial class WechatApiHttpClient : ISingleton
+public partial class WechatApiHttpClient : ITransient
 {
     public readonly WechatOptions _wechatOptions;