lsm/DotNetCore.SKIT.FlurlHttpClient.Wechat
1
0
Fork 0
mirror of https://gitee.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat.git synced 2025-04-05 17:37:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): 修复 Configure 方法的问题

Browse Source
This commit is contained in:
Fu Diwei 2021-05-12 18:20:43 +08:00
parent e36d4d2194
commit 9519ff4a39
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs
View File

@ -61,16 +61,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
MerchantV3Secret = options.MerchantV3Secret; MerchantV3Secret = options.MerchantV3Secret;
ProxyFlurlClient.BaseUrl = options.Endpoints ?? WechatTenpayEndpoints.DEFAULT; ProxyFlurlClient.BaseUrl = options.Endpoints ?? WechatTenpayEndpoints.DEFAULT;
ProxyFlurlClient.Configure(settings =>
{
settings.Timeout = TimeSpan.FromMilliseconds(options.Timeout);
});
ProxyFlurlClient.Headers.Remove("Accept"); ProxyFlurlClient.Headers.Remove("Accept");
ProxyFlurlClient.Headers.Remove("Accept-Language"); ProxyFlurlClient.Headers.Remove("Accept-Language");
ProxyFlurlClient.Headers.Remove("User-Agent"); ProxyFlurlClient.Headers.Remove("User-Agent");
ProxyFlurlClient.WithHeader("Accept", "application/json"); ProxyFlurlClient.WithHeader("Accept", "application/json");
ProxyFlurlClient.WithHeader("Accept-Language", options.AcceptLanguage); ProxyFlurlClient.WithHeader("Accept-Language", options.AcceptLanguage);
ProxyFlurlClient.WithHeader("User-Agent", options.UserAgent); ProxyFlurlClient.WithHeader("User-Agent", options.UserAgent);
ProxyFlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout));
var interceptorAuthenticator = new Interceptors.WechatTenpayAuthenticator( var interceptorAuthenticator = new Interceptors.WechatTenpayAuthenticator(
scheme: options.AuthScheme, scheme: options.AuthScheme,

8
src/SKIT.FlurlHttpClient.Wechat/WechatClientBase.cs
View File

@ -36,14 +36,14 @@ namespace SKIT.FlurlHttpClient.Wechat
public void Configure(Action<WechatClientSettings> configure) public void Configure(Action<WechatClientSettings> configure)
{ {
if (configure == null) throw new ArgumentNullException(nameof(configure)); if (configure == null) throw new ArgumentNullException(nameof(configure));
ProxyFlurlClient.Configure(flurlSettings => ProxyFlurlClient.Configure(flurlSettings =>
{ {
var settings = new WechatClientSettings(); var settings = new WechatClientSettings();
settings.Timeout = flurlSettings.Defaults.Timeout; settings.Timeout = flurlSettings.Timeout;
settings.ConnectionLeaseTimeout = flurlSettings.ConnectionLeaseTimeout; settings.ConnectionLeaseTimeout = flurlSettings.ConnectionLeaseTimeout;
settings.JsonSerializer = flurlSettings.Defaults.JsonSerializer; settings.JsonSerializer = flurlSettings.JsonSerializer;
settings.UrlEncodedSerializer = flurlSettings.Defaults.UrlEncodedSerializer; settings.UrlEncodedSerializer = flurlSettings.UrlEncodedSerializer;
settings.HttpClientFactory = flurlSettings.HttpClientFactory; settings.HttpClientFactory = flurlSettings.HttpClientFactory;
configure.Invoke(settings); configure.Invoke(settings);