夜鹰 il y a 7 mois
Parent
commit
cf5f6d78c5

+ 8 - 9
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -14,19 +14,20 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.751" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.799" />
     <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.6" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.114" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.114" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.114" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.119" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.119" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.119" />
     <PackageReference Include="Hardware.Info" Version="101.0.1.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="log4net" Version="3.2.0" />
+    <PackageReference Include="Lazy.Captcha.Core" Version="2.2.2" />
     <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" />
@@ -41,8 +42,8 @@
     <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.255" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.200" />
+    <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.258" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.202" />
     <PackageReference Include="SSH.NET" Version="2025.0.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.7" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
@@ -56,7 +57,6 @@
   <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="Lazy.Captcha.Core" Version="2.2.2" />
     <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" />
@@ -66,12 +66,11 @@
   <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="Lazy.Captcha.Core" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.8" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.2" />
-    <PackageReference Include="XiHan.Framework.Utils" Version="0.11.7" />
+    <PackageReference Include="XiHan.Framework.Utils" Version="1.2.1" />
   </ItemGroup>
 
 </Project>

+ 2 - 3
Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs

@@ -6,9 +6,8 @@
 
 #if NET9_0_OR_GREATER
 
-using XiHan.Framework.Utils.HardwareInfos;
+using XiHan.Framework.Utils.Core;
 using XiHan.Framework.Utils.Reflections;
-using XiHan.Framework.Utils.Runtime;
 using ReflectionHelper = XiHan.Framework.Utils.Reflections.ReflectionHelper;
 
 #endif // NET9_0_OR_GREATER
@@ -45,7 +44,7 @@ public class SysServerService : IDynamicApiController, ITransient
     [DisplayName("获取服务器运行时信息")]
     public SystemRuntimeInfo RuntimeInfo()
     {
-        var systemRuntimeInfo = RuntimeInfoManger.GetSystemRuntimeInfo();
+        var systemRuntimeInfo = RuntimeInfoManager.GetSystemRuntimeInfo();
         return systemRuntimeInfo;
     }
 

+ 2 - 2
Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj

@@ -12,11 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.7.114" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.7.119" />
     <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="139.0.3405.102" />
+    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="139.0.3405.125" />
     <PackageReference Include="xunit.assert" Version="2.9.3" />
   </ItemGroup>
 

+ 1 - 1
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -26,7 +26,7 @@
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
-    <PackageReference Include="Rezero.Api" Version="1.8.25" />
+    <PackageReference Include="Rezero.Api" Version="1.8.26" />
   </ItemGroup>
 
   <ItemGroup>