From 733a3878cedb91e5e08ad563f1a685ce65da9d24 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 12 Aug 2021 20:23:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(wxapi):=20=E4=BF=AE=E5=A4=8D=E6=9F=90?= =?UTF-8?q?=E4=BA=9B=E5=9C=BA=E6=99=AF=E4=B8=8B=E7=94=9F=E6=88=90=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/WechatApiClientEventExtensions.cs | 2 +- .../Extensions/WechatApiClientParameterExtensions.cs | 2 +- .../Utilities/WxBizMsgCryptor.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs index 1a214fa1..1b187b5f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs @@ -286,7 +286,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (callbackNonce == null) throw new ArgumentNullException(nameof(callbackNonce)); if (callbackSignature == null) throw new ArgumentNullException(nameof(callbackSignature)); - ISet set = new SortedSet() { client.Credentials.PushToken!, callbackTimestamp, callbackNonce }; + ISet set = new SortedSet(StringComparer.Ordinal) { client.Credentials.PushToken!, callbackTimestamp, callbackNonce }; string sign = Security.SHA1Utility.Hash(string.Concat(set)); return string.Equals(sign, callbackSignature, StringComparison.InvariantCultureIgnoreCase); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs index 6f8cee46..1b06da87 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs @@ -60,7 +60,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api string nonce = Guid.NewGuid().ToString("N"); string cardType = "INVOICE"; - SortedSet sortedParams = new SortedSet(); + ISet sortedParams = new SortedSet(StringComparer.Ordinal); sortedParams.Add(cardType); sortedParams.Add(timestamp); sortedParams.Add(client.Credentials.AppId); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/WxBizMsgCryptor.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/WxBizMsgCryptor.cs index 926026b8..5224bc6b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/WxBizMsgCryptor.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/WxBizMsgCryptor.cs @@ -231,7 +231,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Utilities if (sNonce == null) throw new ArgumentNullException(nameof(sNonce)); if (sMsgEncrypt == null) throw new ArgumentNullException(nameof(sMsgEncrypt)); - ISet set = new SortedSet(); + ISet set = new SortedSet(StringComparer.Ordinal); set.Add(sToken); set.Add(sTimestamp); set.Add(sNonce);