Skip to content

Commit cba0f87

Browse files
committed
fix
1 parent 6231ba8 commit cba0f87

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

csharp/ToolGood.Algorithm.Test/PetaTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,8 +1385,8 @@ public Tag SetAttribute(string name, string value)
13851385

13861386
public Tag AddClass(string className)
13871387
{
1388-
if (Attributes.ContainsKey("class"))
1389-
Attributes["class"] = Attributes["class"] + " " + className;
1388+
if (Attributes.TryGetValue("class", out string value))
1389+
Attributes["class"] = value + " " + className;
13901390
else
13911391
Attributes["class"] = className;
13921392
return this;

csharp/ToolGood.Algorithm/Internals/Hash.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,13 @@ public static string GetMd5String(byte[] buffer)
111111
#if WebAssembly
112112
return MD5.MDString(buffer);
113113
#else
114+
#if NETSTANDARD2_1
114115
System.Security.Cryptography.MD5 md5 = MD5.Create();
115116
byte[] retVal = md5.ComputeHash(buffer);
116117
md5.Dispose();
117-
#if NETSTANDARD2_1
118118
return BitConverter.ToString(retVal).Replace("-", "");
119119
#else
120+
var retVal = MD5.HashData(buffer);
120121
return Convert.ToHexString(retVal);
121122
#endif
122123
#endif
@@ -128,12 +129,14 @@ public static string GetMd5String(byte[] buffer)
128129

129130
public static string GetSha1String(byte[] buffer)
130131
{
132+
133+
#if NETSTANDARD2_1
131134
SHA1 sha512 = SHA1.Create();
132135
byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
133136
sha512.Dispose();
134-
#if NETSTANDARD2_1
135137
return BitConverter.ToString(retVal).Replace("-", "");
136138
#else
139+
var retVal = SHA1.HashData(buffer);
137140
return Convert.ToHexString(retVal);
138141
#endif
139142
}
@@ -144,12 +147,13 @@ public static string GetSha1String(byte[] buffer)
144147

145148
public static string GetSha256String(byte[] buffer)
146149
{
150+
#if NETSTANDARD2_1
147151
SHA256 sha512 = SHA256.Create();
148152
byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
149153
sha512.Dispose();
150-
#if NETSTANDARD2_1
151154
return BitConverter.ToString(retVal).Replace("-", "");
152155
#else
156+
var retVal = SHA256.HashData(buffer);
153157
return Convert.ToHexString(retVal);
154158
#endif
155159
}
@@ -160,20 +164,20 @@ public static string GetSha256String(byte[] buffer)
160164

161165
public static string GetSha512String(byte[] buffer)
162166
{
167+
#if NETSTANDARD2_1
163168
SHA512 sha512 = SHA512.Create();
164169
byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
165170
sha512.Dispose();
166-
#if NETSTANDARD2_1
167171
return BitConverter.ToString(retVal).Replace("-", "");
168172
#else
173+
var retVal = SHA512.HashData(buffer);
169174
return Convert.ToHexString(retVal);
170175
#endif
171176
}
172177

173178
#endregion SHA512
174179

175180
#region HMACMD5
176-
177181
public static string GetHmacMd5String(byte[] buffer, string secret)
178182
{
179183
#if WebAssembly

0 commit comments

Comments
 (0)