From d3db43f38a7af1dada38e8e4ea6fd9c54b393f49 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 11 Nov 2021 12:19:37 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E4=BF=AE=E6=94=B9=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E6=AF=94=E8=BE=83=E7=9A=84=E9=BB=98=E8=AE=A4=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E6=80=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StringTypedNullableBooleanConverter.cs | 9 +++------ .../WechatApiClientEventExtensions.cs | 4 +--- .../StringTypedNullableBooleanConverter.cs | 9 +++------ .../CodeStyleUtil.cs | 17 ++++++++--------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs index 1449345b..b17c469b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text.Json; -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace System.Text.Json.Converters { @@ -27,9 +24,9 @@ namespace System.Text.Json.Converters if (value == null) return null; - if ("true".Equals(value, StringComparison.InvariantCultureIgnoreCase)) + if ("true".Equals(value, StringComparison.OrdinalIgnoreCase)) return true; - else if ("false".Equals(value, StringComparison.InvariantCultureIgnoreCase)) + else if ("false".Equals(value, StringComparison.OrdinalIgnoreCase)) return false; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs index 1dd08e7f..3c5cad94 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.IO; using System.Xml.Linq; -using System.Xml.Serialization; namespace SKIT.FlurlHttpClient.Wechat.Api { @@ -271,7 +269,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api ISet set = new SortedSet(StringComparer.Ordinal) { client.Credentials.PushToken!, callbackTimestamp, callbackNonce }; string sign = Utilities.SHA1Utility.Hash(string.Concat(set)); - return string.Equals(sign, callbackSignature, StringComparison.InvariantCultureIgnoreCase); + return string.Equals(sign, callbackSignature, StringComparison.OrdinalIgnoreCase); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs index 1449345b..b17c469b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text.Json; -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace System.Text.Json.Converters { @@ -27,9 +24,9 @@ namespace System.Text.Json.Converters if (value == null) return null; - if ("true".Equals(value, StringComparison.InvariantCultureIgnoreCase)) + if ("true".Equals(value, StringComparison.OrdinalIgnoreCase)) return true; - else if ("false".Equals(value, StringComparison.InvariantCultureIgnoreCase)) + else if ("false".Equals(value, StringComparison.OrdinalIgnoreCase)) return false; } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs b/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs index d197772f..748e03a9 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; -using System.Text; using System.Text.RegularExpressions; using System.Xml.Serialization; @@ -215,7 +214,7 @@ namespace SKIT.FlurlHttpClient.Wechat var lstError = new List(); var lstFilePath = TestIOUtil.GetAllFiles(workdir) - .Where(e => string.Equals(Path.GetExtension(e), ".json", StringComparison.InvariantCultureIgnoreCase)) + .Where(e => string.Equals(Path.GetExtension(e), ".json", StringComparison.OrdinalIgnoreCase)) .ToList(); if (!lstFilePath.Any()) { @@ -233,7 +232,7 @@ namespace SKIT.FlurlHttpClient.Wechat continue; } - if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.InvariantCultureIgnoreCase)) + if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.OrdinalIgnoreCase)) { string json = File.ReadAllText(filePath); if (!TryJsonize(type, json, out Exception ex)) @@ -263,8 +262,8 @@ namespace SKIT.FlurlHttpClient.Wechat var lstFilePath = TestIOUtil.GetAllFiles(workdir) .Where(e => - string.Equals(Path.GetExtension(e), ".json", StringComparison.InvariantCultureIgnoreCase) || - string.Equals(Path.GetExtension(e), ".xml", StringComparison.InvariantCultureIgnoreCase) + string.Equals(Path.GetExtension(e), ".json", StringComparison.OrdinalIgnoreCase) || + string.Equals(Path.GetExtension(e), ".xml", StringComparison.OrdinalIgnoreCase) ) .ToArray(); if (!lstFilePath.Any()) @@ -283,7 +282,7 @@ namespace SKIT.FlurlHttpClient.Wechat continue; } - if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.InvariantCultureIgnoreCase)) + if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.OrdinalIgnoreCase)) { string json = File.ReadAllText(filePath); @@ -292,7 +291,7 @@ namespace SKIT.FlurlHttpClient.Wechat lstError.Add(ex); } } - else if (string.Equals(Path.GetExtension(filePath), ".xml", StringComparison.InvariantCultureIgnoreCase)) + else if (string.Equals(Path.GetExtension(filePath), ".xml", StringComparison.OrdinalIgnoreCase)) { string xml = File.ReadAllText(filePath); @@ -392,13 +391,13 @@ namespace SKIT.FlurlHttpClient.Wechat var lstError = new List(); var lstExtensionsCodeFile = TestIOUtil.GetAllFiles(workdir) - .Where(e => string.Equals(Path.GetExtension(e), ".cs", StringComparison.InvariantCultureIgnoreCase)) + .Where(e => string.Equals(Path.GetExtension(e), ".cs", StringComparison.OrdinalIgnoreCase)) .Where(e => Path.GetDirectoryName(e).StartsWith(Path.Combine(workdir, "Extensions"))) .Where(e => Path.GetFileNameWithoutExtension(e).Contains("ClientExecute")) .Where(e => Path.GetFileNameWithoutExtension(e).EndsWith("Extensions")) .ToArray(); var lstModelsCodeFile = TestIOUtil.GetAllFiles(workdir) - .Where(e => string.Equals(Path.GetExtension(e), ".cs", StringComparison.InvariantCultureIgnoreCase)) + .Where(e => string.Equals(Path.GetExtension(e), ".cs", StringComparison.OrdinalIgnoreCase)) .Where(e => Path.GetDirectoryName(e).StartsWith(Path.Combine(workdir, "Models"))) .Where(e => Path.GetFileNameWithoutExtension(e).EndsWith("Request") || Path.GetFileNameWithoutExtension(e).EndsWith("Response")) .ToArray();