Skip to content

Commit d4ce1eb

Browse files
ldqkldqk
committed
增加SHA-512支持
1 parent 5415580 commit d4ce1eb

9 files changed

Lines changed: 57 additions & 25 deletions

File tree

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>2025.6.5</Version>
3+
<Version>2026.1</Version>
44
<Deterministic>true</Deterministic>
55
</PropertyGroup>
66
</Project>

‎Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@
5151
<PackageReference Include="AngleSharp.Css" Version="1.0.0-beta.151" />
5252
<PackageReference Include="DnsClient" Version="1.8.0" />
5353
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
54-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
54+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
5555
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
56-
<PackageReference Include="System.Management" Version="10.0.0" />
56+
<PackageReference Include="System.Management" Version="10.0.1" />
5757
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
58-
<PackageReference Include="SharpCompress" Version="0.42.0" />
5958
</ItemGroup>
6059

6160
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
6261
<PackageReference Include="Castle.Core" Version="5.2.1" />
6362
<PackageReference Include="IndexRange" Version="1.1.0" />
6463
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="[1.0.0]" />
6564
<PackageReference Include="SixLabors.ImageSharp" Version="[2.1.11]" />
66-
<PackageReference Include="System.Collections.Immutable" Version="9.0.10" />
65+
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
6766
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
6867
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="[7.0.0]" />
68+
<PackageReference Include="SharpCompress" Version="[0.42.0]" />
6969
</ItemGroup>
7070

7171
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
@@ -74,40 +74,45 @@
7474
<PackageReference Include="System.Memory" Version="4.6.3" />
7575
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="[1.0.0]" />
7676
<PackageReference Include="SixLabors.ImageSharp" Version="[2.1.11]" />
77-
<PackageReference Include="System.Collections.Immutable" Version="9.0.10" />
77+
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
7878
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
7979
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="[7.0.0]" />
80+
<PackageReference Include="SharpCompress" Version="[0.42.0]" />
8081
</ItemGroup>
8182

8283
<ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
8384
<PackageReference Include="Castle.Core" Version="5.1.1" />
8485
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="[7.0.0]" />
85-
<PackageReference Include="System.Collections.Immutable" Version="9.0.10" />
86+
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
8687
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
8788
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
89+
<PackageReference Include="SharpCompress" Version="[0.42.0]" />
8890
</ItemGroup>
8991

9092
<ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
9193
<PackageReference Include="Castle.Core" Version="5.2.1" />
92-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.10" />
93-
<PackageReference Include="System.Collections.Immutable" Version="9.0.10" />
94+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.1" />
95+
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
9496
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
9597
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
98+
<PackageReference Include="SharpCompress" Version="0.43.0" />
9699
</ItemGroup>
97100

98101
<ItemGroup Condition=" '$(TargetFramework)' == 'net9'">
99102
<PackageReference Include="Castle.Core" Version="5.2.1" />
100-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.10" />
101-
<PackageReference Include="System.Collections.Immutable" Version="9.0.10" />
103+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.1" />
104+
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
102105
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
103106
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
107+
<PackageReference Include="SharpCompress" Version="0.43.0" />
104108
</ItemGroup>
105109
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0'">
106110
<PackageReference Include="Castle.Core" Version="5.2.1" />
107-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10" />
108-
<PackageReference Include="System.Collections.Immutable" Version="10" />
111+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.1" />
112+
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
109113
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
110114
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
115+
<PackageReference Include="SharpCompress" Version="0.43.0" />
111116
</ItemGroup>
112117

113118
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -124,6 +129,7 @@
124129
<PackageReference Include="System.Net.Http" Version="[4.3.4]" />
125130
<PackageReference Include="System.Runtime.Numerics" version="[4.3.0]" targetFramework="net461" />
126131
<PackageReference Include="System.ValueTuple" version="[4.6.1]" targetFramework="net461" />
132+
<PackageReference Include="SharpCompress" Version="[0.42.0]" />
127133
</ItemGroup>
128134

129135
<ItemGroup>

‎Masuit.Tools.Abstractions/Security/Encrypt.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,19 @@ public static string SHA256(this string str)
653653
return Convert.ToBase64String(result); //返回长度为44字节的字符串
654654
}
655655

656+
/// <summary>
657+
/// SHA512函数
658+
/// </summary>
659+
/// <param name="str">原始字符串</param>
660+
/// <returns>SHA512结果(返回长度为44字节的字符串)</returns>
661+
public static string SHA512(this string str)
662+
{
663+
byte[] shaData = Encoding.UTF8.GetBytes(str);
664+
using var sha512 = System.Security.Cryptography.SHA512.Create();
665+
byte[] result = sha512.ComputeHash(shaData);
666+
return Convert.ToBase64String(result); //返回长度为44字节的字符串
667+
}
668+
656669
#region MD5摘要算法
657670

658671
#region 对字符串进行MD5摘要
@@ -754,6 +767,19 @@ public static string SHA256(this Stream stream)
754767
return BitConverter.ToString(checksum).Replace("-", string.Empty);
755768
}
756769

770+
/// <summary>
771+
/// 计算文件的sha512
772+
/// </summary>
773+
/// <param name="stream"></param>
774+
/// <returns></returns>
775+
public static string SHA512(this Stream stream)
776+
{
777+
var fs = new BufferedStream(stream, 1048576);
778+
using var sha = System.Security.Cryptography.SHA512.Create();
779+
byte[] checksum = sha.ComputeHash(fs);
780+
return BitConverter.ToString(checksum).Replace("-", string.Empty);
781+
}
782+
757783
/// <summary>
758784
/// 获取数据流的MD5摘要值
759785
/// </summary>

‎Masuit.Tools.AspNetCore/Masuit.Tools.AspNetCore.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.32]" />
5656
</ItemGroup>
5757
<ItemGroup Condition=" '$(TargetFramework)' == 'net9'">
58-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
58+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.11" />
5959
</ItemGroup>
6060
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0'">
61-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10" />
61+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
6262
</ItemGroup>
6363
<ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
6464
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.36" />
6565
</ItemGroup>
6666
<ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
67-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.21" />
67+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.22" />
6868
</ItemGroup>
6969
</Project>

‎Masuit.Tools.Core/Masuit.Tools.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ github：https://github.com/ldqk/Masuit.Tools
4545
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1.32]" />
4646
</ItemGroup>
4747
<ItemGroup Condition=" '$(TargetFramework)' == 'net9'">
48-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
48+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
4949
</ItemGroup>
5050
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0'">
51-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0" />
51+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
5252
</ItemGroup>
5353
<ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
5454
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.36" />
5555
</ItemGroup>
5656
<ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
57-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.21" />
57+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.22" />
5858
</ItemGroup>
5959
<ItemGroup>
6060
<Compile Remove="..\Masuit.Tools.Abstractions\Mapping\**" />

‎Masuit.Tools.Excel/Masuit.Tools.Excel.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</None>
3838
</ItemGroup>
3939
<ItemGroup>
40-
<PackageReference Include="EPPlus" Version="8.3.1" />
40+
<PackageReference Include="EPPlus" Version="8.4.0" />
4141
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4242
</ItemGroup>
4343
<ItemGroup>

‎NetCoreTest/NetCoreTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
9+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<Folder Include="Controllers\" />

‎Test/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
26+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎Test/Masuit.Tools.Core.Test/Masuit.Tools.Core.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.1" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.1" />
14+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1616
<PackageReference Include="xunit" Version="2.9.3" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">

0 commit comments

Comments
 (0)