style: clean code

This commit is contained in:
Fu Diwei 2022-02-23 21:37:31 +08:00
parent d7e65a05ce
commit 0432c74a01
8 changed files with 37 additions and 38 deletions

View File

@ -86,8 +86,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
try try
{ {
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {
@ -115,9 +115,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
flurlRequest.Verb == HttpMethod.Head || flurlRequest.Verb == HttpMethod.Head ||
flurlRequest.Verb == HttpMethod.Options; flurlRequest.Verb == HttpMethod.Options;
using IFlurlResponse flurlResponse = isSimpleRequest ? using IFlurlResponse flurlResponse = isSimpleRequest ?
await base.SendRequestAsync(flurlRequest, null, cancellationToken).ConfigureAwait(false) : await base.SendRequestAsync(flurlRequest, null, cancellationToken) :
await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken).ConfigureAwait(false); await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {

View File

@ -75,8 +75,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
try try
{ {
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {
@ -104,9 +104,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
flurlRequest.Verb == HttpMethod.Head || flurlRequest.Verb == HttpMethod.Head ||
flurlRequest.Verb == HttpMethod.Options; flurlRequest.Verb == HttpMethod.Options;
using IFlurlResponse flurlResponse = isSimpleRequest ? using IFlurlResponse flurlResponse = isSimpleRequest ?
await base.SendRequestAsync(flurlRequest, null, cancellationToken).ConfigureAwait(false) : await base.SendRequestAsync(flurlRequest, null, cancellationToken) :
await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken).ConfigureAwait(false); await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {

View File

@ -76,8 +76,8 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
try try
{ {
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {
@ -112,9 +112,9 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
flurlRequest.Verb == HttpMethod.Head || flurlRequest.Verb == HttpMethod.Head ||
flurlRequest.Verb == HttpMethod.Options; flurlRequest.Verb == HttpMethod.Options;
using IFlurlResponse flurlResponse = isSimpleRequest ? using IFlurlResponse flurlResponse = isSimpleRequest ?
await base.SendRequestAsync(flurlRequest, null, cancellationToken).ConfigureAwait(false) : await base.SendRequestAsync(flurlRequest, null, cancellationToken) :
await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken).ConfigureAwait(false); await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {
@ -146,9 +146,8 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
using IFlurlResponse flurlResponse = await flurlRequest using IFlurlResponse flurlResponse = await flurlRequest
.WithClient(FlurlClient) .WithClient(FlurlClient)
.AllowAnyHttpStatus() .AllowAnyHttpStatus()
.SendUrlEncodedAsync(flurlRequest.Verb, data, cancellationToken) .SendUrlEncodedAsync(flurlRequest.Verb, data, cancellationToken);
.ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {

View File

@ -92,8 +92,8 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
try try
{ {
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {
@ -121,9 +121,9 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
flurlRequest.Verb == HttpMethod.Head || flurlRequest.Verb == HttpMethod.Head ||
flurlRequest.Verb == HttpMethod.Options; flurlRequest.Verb == HttpMethod.Options;
using IFlurlResponse flurlResponse = isSimpleRequest ? using IFlurlResponse flurlResponse = isSimpleRequest ?
await base.SendRequestAsync(flurlRequest, null, cancellationToken).ConfigureAwait(false) : await base.SendRequestAsync(flurlRequest, null, cancellationToken) :
await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken).ConfigureAwait(false); await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {

View File

@ -139,8 +139,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2
flurlRequest.Verb == HttpMethod.Options; flurlRequest.Verb == HttpMethod.Options;
if (isSimpleRequest) if (isSimpleRequest)
{ {
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, null, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, null, cancellationToken);
return await WrapResponseWithXmlAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithXmlAsync<T>(flurlResponse, cancellationToken);
} }
else else
{ {
@ -148,8 +148,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2
string xml = Utilities.XmlUtility.ConvertFromJson(json); string xml = Utilities.XmlUtility.ConvertFromJson(json);
using HttpContent httpContent = new StringContent(xml, Encoding.UTF8, "text/xml"); using HttpContent httpContent = new StringContent(xml, Encoding.UTF8, "text/xml");
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken);
return await WrapResponseWithXmlAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithXmlAsync<T>(flurlResponse, cancellationToken);
} }
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)

View File

@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Interceptors
var httpContent = formdataContent.SingleOrDefault(e => Constants.FormDataFields.FORMDATA_META.Equals(e.Headers.ContentDisposition?.Name?.Trim('\"'))); var httpContent = formdataContent.SingleOrDefault(e => Constants.FormDataFields.FORMDATA_META.Equals(e.Headers.ContentDisposition?.Name?.Trim('\"')));
if (httpContent != null) if (httpContent != null)
{ {
body = await httpContent.ReadAsStringAsync().ConfigureAwait(false); body = await httpContent.ReadAsStringAsync();
} }
} }
else else

View File

@ -114,8 +114,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
try try
{ {
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {
@ -143,9 +143,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
flurlRequest.Verb == HttpMethod.Head || flurlRequest.Verb == HttpMethod.Head ||
flurlRequest.Verb == HttpMethod.Options; flurlRequest.Verb == HttpMethod.Options;
using IFlurlResponse flurlResponse = isSimpleRequest ? using IFlurlResponse flurlResponse = isSimpleRequest ?
await base.SendRequestAsync(flurlRequest, null, cancellationToken).ConfigureAwait(false) : await base.SendRequestAsync(flurlRequest, null, cancellationToken) :
await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken).ConfigureAwait(false); await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {

View File

@ -76,8 +76,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
try try
{ {
using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {
@ -105,9 +105,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
flurlRequest.Verb == HttpMethod.Head || flurlRequest.Verb == HttpMethod.Head ||
flurlRequest.Verb == HttpMethod.Options; flurlRequest.Verb == HttpMethod.Options;
using IFlurlResponse flurlResponse = isSimpleRequest ? using IFlurlResponse flurlResponse = isSimpleRequest ?
await base.SendRequestAsync(flurlRequest, null, cancellationToken).ConfigureAwait(false) : await base.SendRequestAsync(flurlRequest, null, cancellationToken) :
await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken).ConfigureAwait(false); await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken);
return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken).ConfigureAwait(false); return await WrapResponseWithJsonAsync<T>(flurlResponse, cancellationToken);
} }
catch (FlurlHttpException ex) catch (FlurlHttpException ex)
{ {