mirror of
https://gitee.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat.git
synced 2026-03-10 00:13:36 +08:00
feat(wxapi): 升级公共组件
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
@@ -17,20 +17,20 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.BackgroundServices
|
||||
private readonly ILogger _logger;
|
||||
private readonly Options.WechatOptions _wechatOptions;
|
||||
private readonly DistributedLock.IDistributedLockFactory _distributedLockFactory;
|
||||
private readonly HttpClients.IWechatApiHttpClientFactory _wechatApiHttpClientFactory;
|
||||
private readonly HttpClients.IWechatApiClientFactory _wechatApiClientFactory;
|
||||
private readonly Repositories.IWechatAccessTokenEntityRepository _wechatAccessTokenEntityRepository;
|
||||
|
||||
public WechatAccessTokenRefreshingBackgroundService(
|
||||
ILoggerFactory loggerFactory,
|
||||
IOptions<Options.WechatOptions> wechatOptions,
|
||||
DistributedLock.IDistributedLockFactory distributedLockFactory,
|
||||
HttpClients.IWechatApiHttpClientFactory wechatApiHttpClientFactory,
|
||||
HttpClients.IWechatApiClientFactory wechatApiClientFactory,
|
||||
Repositories.IWechatAccessTokenEntityRepository wechatAccessTokenEntityRepository)
|
||||
{
|
||||
_logger = loggerFactory.CreateLogger(GetType());
|
||||
_wechatOptions = wechatOptions.Value;
|
||||
_distributedLockFactory = distributedLockFactory;
|
||||
_wechatApiHttpClientFactory = wechatApiHttpClientFactory;
|
||||
_wechatApiClientFactory = wechatApiClientFactory;
|
||||
_wechatAccessTokenEntityRepository = wechatAccessTokenEntityRepository;
|
||||
}
|
||||
|
||||
@@ -64,14 +64,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.BackgroundServices
|
||||
if (lockHandler == null)
|
||||
return; // 未取得锁
|
||||
|
||||
var client = _wechatApiHttpClientFactory.Create(appId);
|
||||
var client = _wechatApiClientFactory.Create(appId);
|
||||
var request = new CgibinTokenRequest();
|
||||
var response = await client.ExecuteCgibinTokenAsync(request, cancellationToken);
|
||||
if (!response.IsSuccessful())
|
||||
{
|
||||
_logger.LogWarning(
|
||||
"刷新 AppId 为 {0} 微信 AccessToken 失败(状态码:{1},错误代码:{2},错误描述:{3})。",
|
||||
appId, response.RawStatus, response.ErrorCode, response.ErrorMessage
|
||||
appId, response.GetRawStatus(), response.ErrorCode, response.ErrorMessage
|
||||
);
|
||||
return; // 请求失败
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.HttpClients
|
||||
{
|
||||
public interface IWechatApiClientFactory
|
||||
{
|
||||
WechatApiClient Create(string appId);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.HttpClients
|
||||
{
|
||||
public interface IWechatApiHttpClientFactory
|
||||
{
|
||||
WechatApiClient Create(string appId);
|
||||
}
|
||||
}
|
||||
@@ -1,20 +1,16 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.HttpClients.Implements
|
||||
{
|
||||
internal partial class WechatApiHttpClientFactory : IWechatApiHttpClientFactory
|
||||
internal partial class WechatApiClientFactory : IWechatApiClientFactory
|
||||
{
|
||||
private readonly IHttpClientFactory _httpClientFactory;
|
||||
private readonly Options.WechatOptions _wechatOptions;
|
||||
|
||||
public WechatApiHttpClientFactory(
|
||||
IHttpClientFactory httpClientFactory,
|
||||
public WechatApiClientFactory(
|
||||
IOptions<Options.WechatOptions> wechatOptions)
|
||||
{
|
||||
_httpClientFactory = httpClientFactory;
|
||||
_wechatOptions = wechatOptions.Value;
|
||||
}
|
||||
|
||||
@@ -36,26 +32,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.HttpClients.Implements
|
||||
PushToken = _wechatOptions.CallbackToken
|
||||
};
|
||||
var wechatApiClient = new WechatApiClient(wechatApiClientOptions);
|
||||
wechatApiClient.Configure((settings) => settings.FlurlHttpClientFactory = new DelegatingFlurlClientFactory(_httpClientFactory));
|
||||
return wechatApiClient;
|
||||
}
|
||||
}
|
||||
|
||||
internal partial class WechatApiHttpClientFactory
|
||||
{
|
||||
internal class DelegatingFlurlClientFactory : Flurl.Http.Configuration.DefaultHttpClientFactory
|
||||
{
|
||||
private readonly IHttpClientFactory _httpClientFactory;
|
||||
|
||||
public DelegatingFlurlClientFactory(IHttpClientFactory httpClientFactory)
|
||||
{
|
||||
_httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
|
||||
}
|
||||
|
||||
public override HttpClient CreateHttpClient(HttpMessageHandler handler)
|
||||
{
|
||||
return _httpClientFactory.CreateClient();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user