From f51c2e2be27a977e4ff2c6ce611d6d90824eb70e Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 15 Dec 2021 15:39:43 +0800 Subject: [PATCH] refactor: clean code --- .../WechatAdsClient.cs | 4 ++-- .../WechatApiClient.cs | 4 ++-- .../WechatOpenAIPlatformClient.cs | 6 +++--- .../WechatOpenAIThirdPartyClient.cs | 4 ++-- .../WechatTenpayClient.cs | 17 +++++++++-------- .../WechatWorkClient.cs | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs index e31dc8a0..fb0b4df1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs @@ -123,8 +123,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads { byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); bool jsonable = - (bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" - (bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" + (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]" + (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}" T result = jsonable ? JsonSerializer.Deserialize(Encoding.UTF8.GetString(bytes)) : new T(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs index d7a66d7c..275bc0a9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs @@ -112,8 +112,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api { byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); bool jsonable = - (bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" - (bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" + (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]" + (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}" T result = jsonable ? JsonSerializer.Deserialize(Encoding.UTF8.GetString(bytes)) : new T(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIPlatformClient.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIPlatformClient.cs index 33ecfb67..be86a911 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIPlatformClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIPlatformClient.cs @@ -151,9 +151,9 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI where T : WechatOpenAIPlatformResponse, new() { byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); - bool jsonable = - (bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" - (bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" + bool jsonable = + (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]" + (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}" T result = jsonable ? JsonSerializer.Deserialize(Encoding.UTF8.GetString(bytes)) : new T(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIThirdPartyClient.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIThirdPartyClient.cs index 06535c48..188b1db8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIThirdPartyClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIThirdPartyClient.cs @@ -129,8 +129,8 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI { byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); bool jsonable = - (bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" - (bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" + (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]" + (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}" T result = jsonable ? JsonSerializer.Deserialize(Encoding.UTF8.GetString(bytes)) : new T(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs index 8d3130eb..4e545ddb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs @@ -149,10 +149,16 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 where T : WechatTenpayResponse, new() { byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); - bool jsonable = - (bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" - (bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" + bool jsonable = + (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]" + (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}" + T result = jsonable ? JsonSerializer.Deserialize(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.RawHeaders = new ReadOnlyDictionary( @@ -164,11 +170,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 ) ); 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()) { diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs index 32d1f709..df141dcf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs @@ -113,8 +113,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work { byte[] bytes = await flurlResponse.GetBytesAsync().ConfigureAwait(false); bool jsonable = - (bytes.Length > 1 && bytes[0] == 91 && bytes[bytes.Length - 1] == 93) || // "[...]" - (bytes.Length > 1 && bytes[0] == 123 && bytes[bytes.Length - 1] == 125); // "{...}" + (bytes.FirstOrDefault() == 91 && bytes.LastOrDefault() == 93) || // "[...]" + (bytes.FirstOrDefault() == 123 && bytes.LastOrDefault() == 125); // "{...}" T result = jsonable ? JsonSerializer.Deserialize(Encoding.UTF8.GetString(bytes)) : new T();