更新依赖，并修正依赖新版本所做的变更

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -13,15 +13,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
+    <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.1" />
     <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.809" />
     <PackageReference Include="AngleSharp" Version="1.3.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.7" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.126" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.126" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.126" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.10" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.130" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.130" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.130" />
     <PackageReference Include="Hardware.Info" Version="101.1.0" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -31,24 +31,24 @@
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.6" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.6" />
     <PackageReference Include="Magicodes.IE.Word" Version="2.7.6" />
-    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="MailKit" Version="4.14.1" />
     <PackageReference Include="MiniExcel" Version="1.41.4" />
     <PackageReference Include="MiniWord" Version="0.9.2" />
-    <PackageReference Include="NewLife.Redis" Version="6.3.2025.801" />
+    <PackageReference Include="NewLife.Redis" Version="6.3.2025.1001" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
-    <PackageReference Include="QRCoder" Version="1.6.0" />
+    <PackageReference Include="QRCoder" Version="1.7.0" />
     <PackageReference Include="RabbitMQ.Client" Version="7.1.2" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.11.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
-    <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.264" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.202" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.12.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.15.0" />
+    <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.266" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.205" />
     <PackageReference Include="SSH.NET" Version="2025.0.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.7" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.9" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1273" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1330" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
@@ -57,20 +57,20 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.3.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.19" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.19" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.19" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.11" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.21" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.21" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.21" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.12" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-    <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.4.0" />
-    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.9" />
+    <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.4.1" />
+    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.4.1" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.10" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.3" />
-    <PackageReference Include="XiHan.Framework.Utils" Version="1.2.1" />
+    <PackageReference Include="XiHan.Framework.Utils" Version="1.3.5" />
   </ItemGroup>
 
 </Project>

Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs

@@ -31,9 +31,9 @@ public class SysServerService : IDynamicApiController, ITransient
     /// </summary>
     /// <returns></returns>
     [DisplayName("获取服务器硬件信息")]
-    public SystemHardwareInfo HardwareInfo()
+    public SystemInfo HardwareInfo()
     {
-        var hardwareInfo = HardwareInfoManager.GetSystemHardwareInfo();
+        var hardwareInfo = SystemInfoManager.GetSystemInfo();
         return hardwareInfo;
     }
 
@@ -42,9 +42,9 @@ public class SysServerService : IDynamicApiController, ITransient
     /// </summary>
     /// <returns></returns>
     [DisplayName("获取服务器运行时信息")]
-    public SystemRuntimeInfo RuntimeInfo()
+    public XiHan.Framework.Utils.Runtime.RuntimeInfo RuntimeInfo()
     {
-        var systemRuntimeInfo = RuntimeInfoManager.GetSystemRuntimeInfo();
+        var systemRuntimeInfo = new XiHan.Framework.Utils.Runtime.RuntimeInfo();
         return systemRuntimeInfo;
     }
 

Admin.NET/Admin.NET.Core/Update/AutoVersionUpdate.cs

@@ -38,29 +38,29 @@ public static class AutoVersionUpdate
     /// <returns></returns>
     public static IApplicationBuilder UseAutoVersionUpdate(this IApplicationBuilder app)
     {
-        ConsoleLogger.Info("AutoVersionUpdate 中间件运行");
+        LogHelper.Info("AutoVersionUpdate 中间件运行");
 
         var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
         if (snowIdOpt.WorkerId != 1)
         {
-            ConsoleLogger.Handle("非主节点，不执行脚本");
+            LogHelper.Handle("非主节点，不执行脚本");
             return app;
         }
 
         var currentVersion = GetEntryAssemblyCurrentVersion();
-        ConsoleLogger.Handle($"当前版本：{currentVersion}");
+        LogHelper.Handle($"当前版本：{currentVersion}");
 
         var historyVersionInfo = GetEntryAssemblyHistoryVersionInfo();
         var historyVersion = historyVersionInfo.Version;
         var historyDate = historyVersionInfo.Date;
         var historyIsRunScript = historyVersionInfo.IsRunScript;
 
-        ConsoleLogger.Handle($"历史版本：{historyVersion},更新时间：{historyDate}，是否已执行{historyIsRunScript}");
+        LogHelper.Handle($"历史版本：{historyVersion},更新时间：{historyDate}，是否已执行{historyIsRunScript}");
 
         // 历史版本为空、版本号相同，不执行脚本
         if (historyVersion == string.Empty)
         {
-            ConsoleLogger.Handle("历史版本为空，默认为最新版本，不执行脚本");
+            LogHelper.Handle("历史版本为空，默认为最新版本，不执行脚本");
 
             // 保存当前版本信息
             SetEntryAssemblyCurrentVersion(currentVersion, true);
@@ -69,7 +69,7 @@ public static class AutoVersionUpdate
         }
         else if (currentVersion.CompareTo(historyVersion) <= 0 && historyIsRunScript)
         {
-            ConsoleLogger.Handle("当前版本号与历史版本号相同，且已执行过脚本，不再执行");
+            LogHelper.Handle("当前版本号与历史版本号相同，且已执行过脚本，不再执行");
 
             // 保存当前版本信息
             SetEntryAssemblyCurrentVersion(currentVersion, false);
@@ -78,14 +78,14 @@ public static class AutoVersionUpdate
         }
         else
         {
-            ConsoleLogger.Handle("当前版本号与历史版本号不同，或版本号相同但未执行过脚本，开始执行脚本");
+            LogHelper.Handle("当前版本号与历史版本号不同，或版本号相同但未执行过脚本，开始执行脚本");
 
             var scriptSqlVersions = GetScriptSqlVersions();
 
             // 若不存在当前版本的脚本，则只保存当前版本信息，不执行脚本
             if (scriptSqlVersions.All(s => s.Version.CompareTo(currentVersion) < 0))
             {
-                ConsoleLogger.Handle("不存在当前版本的脚本，只保存当前版本信息，不执行脚本");
+                LogHelper.Handle("不存在当前版本的脚本，只保存当前版本信息，不执行脚本");
 
                 // 保存当前版本信息
                 SetEntryAssemblyCurrentVersion(currentVersion, false);
@@ -101,12 +101,12 @@ public static class AutoVersionUpdate
                 // 只执行大于历史版本的脚本，或者当前版本但未执行过
                 if (sqlVersion.CompareTo(historyVersion) < 0)
                 {
-                    ConsoleLogger.Handle($"版本{sqlVersion}低于历史版本，跳过");
+                    LogHelper.Handle($"版本{sqlVersion}低于历史版本，跳过");
                     continue;
                 }
                 if (sqlVersion == historyVersion && historyIsRunScript)
                 {
-                    ConsoleLogger.Handle($"版本{sqlVersion}等于历史版本，且已执行过脚本，跳过");
+                    LogHelper.Handle($"版本{sqlVersion}等于历史版本，且已执行过脚本，跳过");
                     continue;
                 }
 
@@ -114,14 +114,14 @@ public static class AutoVersionUpdate
                 var sql = File.ReadAllText(sqlFileInfo.FilePath);
                 if (sql != null)
                 {
-                    ConsoleLogger.Handle($"执行版本{sqlVersion}脚本");
+                    LogHelper.Handle($"执行版本{sqlVersion}脚本");
 
                     HandleSqlScript(app, sql, sqlVersion);
                 }
             }
         }
 
-        ConsoleLogger.Success("AutoVersionUpdate 中间件结束");
+        LogHelper.Success("AutoVersionUpdate 中间件结束");
 
         return app;
     }
@@ -219,7 +219,7 @@ public static class AutoVersionUpdate
         catch (Exception ex)
         {
             dbContext.Ado.RollbackTran();
-            ConsoleLogger.Error($"AutoVersionUpdate 执行 SQL 脚本出错，版本：{sqlVersion}，错误：{ex.Message}");
+            LogHelper.Error($"AutoVersionUpdate 执行 SQL 脚本出错，版本：{sqlVersion}，错误：{ex.Message}");
         }
         finally
         {

Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj

@@ -12,11 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.7.126" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="Selenium.Support" Version="4.35.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.35.0" />
-    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="140.0.3485.66" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.7.130" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Selenium.Support" Version="4.36.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.36.0" />
+    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="141.0.3537.71" />
     <PackageReference Include="xunit.assert" Version="2.9.3" />
   </ItemGroup>
 

Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.9" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.10" />
   </ItemGroup>
 
   <ItemGroup>