!810 使用System.Net.Http.IHttpClientFactory管理WechatApiClient中使用的HttpClient

Merge pull request !810 from capad1946/next

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

@@ -17,17 +17,17 @@ public class SysWechatService : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<SysWechatUser> _sysWechatUserRep;
     private readonly SysConfigService _sysConfigService;
-    private readonly WechatApiHttpClient _wechatApiHttpClient;
+    private readonly WechatApiHttpClientFactory _wechatApiHttpClient;
     private readonly WechatApiClient _wechatApiClient;
 
     public SysWechatService(SqlSugarRepository<SysWechatUser> sysWechatUserRep,
         SysConfigService sysConfigService,
-        WechatApiHttpClient wechatApiHttpClient)
+        WechatApiHttpClientFactory wechatApiHttpClientFactory)
     {
         _sysWechatUserRep = sysWechatUserRep;
         _sysConfigService = sysConfigService;
-        _wechatApiHttpClient = wechatApiHttpClient;
-        _wechatApiClient = wechatApiHttpClient.CreateWechatClient();
+        _wechatApiHttpClient = wechatApiHttpClientFactory;
+        _wechatApiClient = wechatApiHttpClientFactory.CreateWechatClient();
     }
 
     /// <summary>

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

@@ -21,11 +21,11 @@ public class SysWxOpenService : IDynamicApiController, ITransient
 
     public SysWxOpenService(SqlSugarRepository<SysWechatUser> sysWechatUserRep,
         SysConfigService sysConfigService,
-        WechatApiHttpClient wechatApiHttpClient)
+        WechatApiHttpClientFactory wechatApiHttpClientFactory)
     {
         _sysWechatUserRep = sysWechatUserRep;
         _sysConfigService = sysConfigService;
-        _wechatApiClient = wechatApiHttpClient.CreateWxOpenClient();
+        _wechatApiClient = wechatApiHttpClientFactory.CreateWxOpenClient();
     }
 
     /// <summary>

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

@@ -7,18 +7,26 @@
 // 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
 
+using Flurl.Http.Configuration;
+using Flurl.Http;
+using Flurl;
+using System.Net.Http;
+
 namespace Admin.NET.Core.Service;
 
 /// <summary>
 /// 微信API客户端
 /// </summary>
-public partial class WechatApiHttpClient : ITransient
+public partial class WechatApiHttpClientFactory : ISingleton
 {
     public readonly WechatOptions _wechatOptions;
 
-    public WechatApiHttpClient(IOptions<WechatOptions> wechatOptions)
+    public WechatApiHttpClientFactory(IOptions<WechatOptions> wechatOptions,
+        System.Net.Http.IHttpClientFactory httpClientFactory)
     {
         _wechatOptions = wechatOptions.Value;
+
+        FlurlHttp.GlobalSettings.FlurlClientFactory = new DelegatingFlurlClientFactory(httpClientFactory);
     }
 
     /// <summary>
@@ -66,4 +74,27 @@ public partial class WechatApiHttpClient : ITransient
 
         return WechatApiClient;
     }
+}
+
+public partial class WechatApiHttpClientFactory
+{
+    internal class DelegatingFlurlClientFactory : IFlurlClientFactory
+    {
+        private readonly System.Net.Http.IHttpClientFactory _httpClientFactory;
+
+        public DelegatingFlurlClientFactory(System.Net.Http.IHttpClientFactory httpClientFactory)
+        {
+            _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
+        }
+
+        public void Dispose()
+        {
+            // Do Nothing
+        }
+
+        public IFlurlClient Get(Url url)
+        {
+            return new FlurlClient(_httpClientFactory.CreateClient(url.ToUri().Host));
+        }
+    }
 }