lsm/DotNetCore.SKIT.FlurlHttpClient.Wechat
1
0
Fork 0
mirror of https://gitee.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat.git synced 2025-07-15 23:13:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

test: 修改字符串比较的默认区域性设置

Browse Source
This commit is contained in:
Fu Diwei 2021-11-11 12:19:37 +08:00
parent 6baa61bde9
commit d3db43f38a
4 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SKIT.FlurlHttpClient.Wechat.Api/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs
View File

@ -1,7 +1,4 @@
using System; using System.Text.Json.Serialization;
using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace System.Text.Json.Converters namespace System.Text.Json.Converters
{ {
@ -27,9 +24,9 @@ namespace System.Text.Json.Converters
if (value == null) if (value == null)
return null; return null;
if ("true".Equals(value, StringComparison.InvariantCultureIgnoreCase)) if ("true".Equals(value, StringComparison.OrdinalIgnoreCase))
return true; return true;
else if ("false".Equals(value, StringComparison.InvariantCultureIgnoreCase)) else if ("false".Equals(value, StringComparison.OrdinalIgnoreCase))
return false; return false;
} }

4
src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs
View File

@ -1,8 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Xml.Linq; using System.Xml.Linq;
using System.Xml.Serialization;
namespace SKIT.FlurlHttpClient.Wechat.Api namespace SKIT.FlurlHttpClient.Wechat.Api
{ {
@ -271,7 +269,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
ISet<string> set = new SortedSet<string>(StringComparer.Ordinal) { client.Credentials.PushToken!, callbackTimestamp, callbackNonce }; ISet<string> set = new SortedSet<string>(StringComparer.Ordinal) { client.Credentials.PushToken!, callbackTimestamp, callbackNonce };
string sign = Utilities.SHA1Utility.Hash(string.Concat(set)); string sign = Utilities.SHA1Utility.Hash(string.Concat(set));
return string.Equals(sign, callbackSignature, StringComparison.InvariantCultureIgnoreCase); return string.Equals(sign, callbackSignature, StringComparison.OrdinalIgnoreCase);
} }
/// <summary> /// <summary>

9
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/Boolean/StringTypedNullableBooleanConverter.cs
View File

@ -1,7 +1,4 @@
using System; using System.Text.Json.Serialization;
using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace System.Text.Json.Converters namespace System.Text.Json.Converters
{ {
@ -27,9 +24,9 @@ namespace System.Text.Json.Converters
if (value == null) if (value == null)
return null; return null;
if ("true".Equals(value, StringComparison.InvariantCultureIgnoreCase)) if ("true".Equals(value, StringComparison.OrdinalIgnoreCase))
return true; return true;
else if ("false".Equals(value, StringComparison.InvariantCultureIgnoreCase)) else if ("false".Equals(value, StringComparison.OrdinalIgnoreCase))
return false; return false;
} }

17
test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Xml.Serialization; using System.Xml.Serialization;
@ -215,7 +214,7 @@ namespace SKIT.FlurlHttpClient.Wechat
var lstError = new List<Exception>(); var lstError = new List<Exception>();
var lstFilePath = TestIOUtil.GetAllFiles(workdir) 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(); .ToList();
if (!lstFilePath.Any()) if (!lstFilePath.Any())
{ {
@ -233,7 +232,7 @@ namespace SKIT.FlurlHttpClient.Wechat
continue; continue;
} }
if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.InvariantCultureIgnoreCase)) if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.OrdinalIgnoreCase))
{ {
string json = File.ReadAllText(filePath); string json = File.ReadAllText(filePath);
if (!TryJsonize(type, json, out Exception ex)) if (!TryJsonize(type, json, out Exception ex))
@ -263,8 +262,8 @@ namespace SKIT.FlurlHttpClient.Wechat
var lstFilePath = TestIOUtil.GetAllFiles(workdir) var lstFilePath = TestIOUtil.GetAllFiles(workdir)
.Where(e => .Where(e =>
string.Equals(Path.GetExtension(e), ".json", StringComparison.InvariantCultureIgnoreCase) || string.Equals(Path.GetExtension(e), ".json", StringComparison.OrdinalIgnoreCase) ||
string.Equals(Path.GetExtension(e), ".xml", StringComparison.InvariantCultureIgnoreCase) string.Equals(Path.GetExtension(e), ".xml", StringComparison.OrdinalIgnoreCase)
) )
.ToArray(); .ToArray();
if (!lstFilePath.Any()) if (!lstFilePath.Any())
@ -283,7 +282,7 @@ namespace SKIT.FlurlHttpClient.Wechat
continue; continue;
} }
if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.InvariantCultureIgnoreCase)) if (string.Equals(Path.GetExtension(filePath), ".json", StringComparison.OrdinalIgnoreCase))
{ {
string json = File.ReadAllText(filePath); string json = File.ReadAllText(filePath);
@ -292,7 +291,7 @@ namespace SKIT.FlurlHttpClient.Wechat
lstError.Add(ex); 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); string xml = File.ReadAllText(filePath);
@ -392,13 +391,13 @@ namespace SKIT.FlurlHttpClient.Wechat
var lstError = new List<Exception>(); var lstError = new List<Exception>();
var lstExtensionsCodeFile = TestIOUtil.GetAllFiles(workdir) 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.GetDirectoryName(e).StartsWith(Path.Combine(workdir, "Extensions")))
.Where(e => Path.GetFileNameWithoutExtension(e).Contains("ClientExecute")) .Where(e => Path.GetFileNameWithoutExtension(e).Contains("ClientExecute"))
.Where(e => Path.GetFileNameWithoutExtension(e).EndsWith("Extensions")) .Where(e => Path.GetFileNameWithoutExtension(e).EndsWith("Extensions"))
.ToArray(); .ToArray();
var lstModelsCodeFile = TestIOUtil.GetAllFiles(workdir) 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.GetDirectoryName(e).StartsWith(Path.Combine(workdir, "Models")))
.Where(e => Path.GetFileNameWithoutExtension(e).EndsWith("Request") || Path.GetFileNameWithoutExtension(e).EndsWith("Response")) .Where(e => Path.GetFileNameWithoutExtension(e).EndsWith("Request") || Path.GetFileNameWithoutExtension(e).EndsWith("Response"))
.ToArray(); .ToArray();