diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs index 7b04d265..bcccecc3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs @@ -61,16 +61,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 MerchantV3Secret = options.MerchantV3Secret; ProxyFlurlClient.BaseUrl = options.Endpoints ?? WechatTenpayEndpoints.DEFAULT; - ProxyFlurlClient.Configure(settings => - { - settings.Timeout = TimeSpan.FromMilliseconds(options.Timeout); - }); ProxyFlurlClient.Headers.Remove("Accept"); ProxyFlurlClient.Headers.Remove("Accept-Language"); ProxyFlurlClient.Headers.Remove("User-Agent"); ProxyFlurlClient.WithHeader("Accept", "application/json"); ProxyFlurlClient.WithHeader("Accept-Language", options.AcceptLanguage); ProxyFlurlClient.WithHeader("User-Agent", options.UserAgent); + ProxyFlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout)); var interceptorAuthenticator = new Interceptors.WechatTenpayAuthenticator( scheme: options.AuthScheme, diff --git a/src/SKIT.FlurlHttpClient.Wechat/WechatClientBase.cs b/src/SKIT.FlurlHttpClient.Wechat/WechatClientBase.cs index 5db829c1..c95cf1f2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat/WechatClientBase.cs +++ b/src/SKIT.FlurlHttpClient.Wechat/WechatClientBase.cs @@ -36,14 +36,14 @@ namespace SKIT.FlurlHttpClient.Wechat public void Configure(Action configure) { if (configure == null) throw new ArgumentNullException(nameof(configure)); - + ProxyFlurlClient.Configure(flurlSettings => { var settings = new WechatClientSettings(); - settings.Timeout = flurlSettings.Defaults.Timeout; + settings.Timeout = flurlSettings.Timeout; settings.ConnectionLeaseTimeout = flurlSettings.ConnectionLeaseTimeout; - settings.JsonSerializer = flurlSettings.Defaults.JsonSerializer; - settings.UrlEncodedSerializer = flurlSettings.Defaults.UrlEncodedSerializer; + settings.JsonSerializer = flurlSettings.JsonSerializer; + settings.UrlEncodedSerializer = flurlSettings.UrlEncodedSerializer; settings.HttpClientFactory = flurlSettings.HttpClientFactory; configure.Invoke(settings);