Просмотр исходного кода

😁调整WechatApiClient相关代码

zuohuaijun 2 лет назад
Родитель
Сommit
1317e117f6

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatService.cs

@@ -17,7 +17,7 @@ public class SysWechatService : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<SysWechatUser> _sysWechatUserRep;
     private readonly SysConfigService _sysConfigService;
-    private readonly WechatApiHttpClientFactory _wechatApiHttpClient;
+    private readonly WechatApiHttpClientFactory _wechatApiHttpClientFactory;
     private readonly WechatApiClient _wechatApiClient;
 
     public SysWechatService(SqlSugarRepository<SysWechatUser> sysWechatUserRep,
@@ -26,7 +26,7 @@ public class SysWechatService : IDynamicApiController, ITransient
     {
         _sysWechatUserRep = sysWechatUserRep;
         _sysConfigService = sysConfigService;
-        _wechatApiHttpClient = wechatApiHttpClientFactory;
+        _wechatApiHttpClientFactory = wechatApiHttpClientFactory;
         _wechatApiClient = wechatApiHttpClientFactory.CreateWechatClient();
     }
 
@@ -161,7 +161,7 @@ public class SysWechatService : IDynamicApiController, ITransient
             Url = input.Url,
             MiniProgram = new CgibinMessageTemplateSendRequest.Types.MiniProgram
             {
-                AppId = _wechatApiHttpClient._wechatOptions.WechatAppId,
+                AppId = _wechatApiHttpClientFactory._wechatOptions.WechatAppId,
                 PagePath = input.MiniProgramPagePath,
             },
             // Data = input.Data.ToDictionary(k => k.Key, k => (CgibinMessageTemplateSendRequest.Types.DataItem)k.Value)

+ 6 - 7
Admin.NET/Admin.NET.Core/Service/Wechat/WechatApiHttpClient.cs

@@ -7,10 +7,9 @@
 // 软件按“原样”提供,不提供任何形式的明示或暗示的保证,包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下,作者或版权持有人均不对任何索赔、损害或其他责任负责,无论是因合同、侵权或其他方式引起的,与软件或其使用或其他交易有关。
 
-using Flurl.Http.Configuration;
-using Flurl.Http;
 using Flurl;
-using System.Net.Http;
+using Flurl.Http;
+using Flurl.Http.Configuration;
 
 namespace Admin.NET.Core.Service;
 
@@ -87,14 +86,14 @@ public partial class WechatApiHttpClientFactory
             _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
         }
 
-        public void Dispose()
+        public IFlurlClient Get(Url url)
         {
-            // Do Nothing
+            return new FlurlClient(_httpClientFactory.CreateClient(url.ToUri().Host));
         }
 
-        public IFlurlClient Get(Url url)
+        public void Dispose()
         {
-            return new FlurlClient(_httpClientFactory.CreateClient(url.ToUri().Host));
+            // Do Nothing
         }
     }
 }