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

refactor: clean code

Browse Source
This commit is contained in:
Fu Diwei 2021-12-15 15:39:43 +08:00
parent 4b46fa580d
commit f51c2e2be2
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs
View File

@ -123,8 +123,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads
{ {
byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false);
bool jsonable = bool jsonable =
(bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]"
(bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}"
T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T(); T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T();

4
src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs
View File

@ -112,8 +112,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
{ {
byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false);
bool jsonable = bool jsonable =
(bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]"
(bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}"
T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T(); T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T();

4
src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIPlatformClient.cs
View File

@ -152,8 +152,8 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
{ {
byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false);
bool jsonable = bool jsonable =
(bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]"
(bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}"
T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T(); T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T();

4
src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIThirdPartyClient.cs
View File

@ -129,8 +129,8 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI
{ {
byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false);
bool jsonable = bool jsonable =
(bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]"
(bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}"
T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T(); T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T();

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

@ -150,9 +150,15 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
{ {
byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false);
bool jsonable = bool jsonable =
(bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]"
(bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}"
T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T(); T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T();
result.WechatpayRequestId = flurlResponse.Headers.GetAll("Request-ID").FirstOrDefault() ?? string.Empty;
result.WechatpayNonce = flurlResponse.Headers.GetAll("Wechatpay-Nonce").FirstOrDefault() ?? string.Empty;
result.WechatpayTimestamp = flurlResponse.Headers.GetAll("Wechatpay-Timestamp").FirstOrDefault() ?? string.Empty;
result.WechatpaySignature = flurlResponse.Headers.GetAll("Wechatpay-Signature").FirstOrDefault() ?? string.Empty;
result.WechatpayCertSerialNumber = flurlResponse.Headers.GetAll("Wechatpay-Serial").FirstOrDefault() ?? string.Empty;
result.RawStatus = flurlResponse.StatusCode; result.RawStatus = flurlResponse.StatusCode;
result.RawHeaders = new ReadOnlyDictionary<string, string>( result.RawHeaders = new ReadOnlyDictionary<string, string>(
@ -164,11 +170,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
) )
); );
result.RawBytes = bytes; result.RawBytes = bytes;
result.WechatpayRequestId = flurlResponse.Headers.GetAll("Request-ID").FirstOrDefault() ?? string.Empty;
result.WechatpayNonce = flurlResponse.Headers.GetAll("Wechatpay-Nonce").FirstOrDefault() ?? string.Empty;
result.WechatpayTimestamp = flurlResponse.Headers.GetAll("Wechatpay-Timestamp").FirstOrDefault() ?? string.Empty;
result.WechatpaySignature = flurlResponse.Headers.GetAll("Wechatpay-Signature").FirstOrDefault() ?? string.Empty;
result.WechatpayCertSerialNumber = flurlResponse.Headers.GetAll("Wechatpay-Serial").FirstOrDefault() ?? string.Empty;
if (AutoDecryptResponseSensitiveProperty && result.IsSuccessful()) if (AutoDecryptResponseSensitiveProperty && result.IsSuccessful())
{ {

4
src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs
View File

@ -113,8 +113,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
{ {
byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false);
bool jsonable = bool jsonable =
(bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]"
(bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}"
T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T(); T result = jsonable ? JsonSerializer.Deserialize<T>(Encoding.UTF8.GetString(bytes)) : new T();