gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎升级依赖与代码优化

Browse Source
This commit is contained in:
zuohuaijun 2025-05-24 10:25:00 +08:00
parent fcd9b2e88f
commit 9336707c46
5 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -22,15 +22,15 @@
<ItemGroup>
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.554" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.585" />
<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="BouncyCastle.Cryptography" Version="2.6.0" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.3" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.69" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.69" />
<PackageReference Include="Furion.Pure" Version="4.9.7.69" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.4" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.71" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.71" />
<PackageReference Include="Furion.Pure" Version="4.9.7.71" />
<PackageReference Include="Hardware.Info" Version="101.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />
@ -40,7 +40,7 @@
<PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.2" />
<PackageReference Include="Magicodes.IE.Word" Version="2.7.5.2" />
<PackageReference Include="MailKit" Version="4.12.1" />
<PackageReference Include="MiniExcel" Version="1.41.1" />
<PackageReference Include="MiniExcel" Version="1.41.2" />
<PackageReference Include="MiniWord" Version="0.9.2" />
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
<PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.9" />
@ -56,7 +56,7 @@
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.4" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1244" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1246" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>
@ -73,8 +73,8 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.3.0" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.3.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.5" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.5" />

9
Admin.NET/Admin.NET.Core/Extension/EnumExtension.cs
View File

@ -151,8 +151,7 @@ public static class EnumExtension
/// <returns></returns>
public static string GetDescription(this Enum value)
{
if (value == null) return "";
return value.GetType().GetField(value.ToString())?.GetCustomAttribute<DescriptionAttribute>()?.Description;
return value == null ? "" : (value.GetType().GetField(value.ToString())?.GetCustomAttribute<DescriptionAttribute>()?.Description);
}
/// <summary>
@ -162,8 +161,7 @@ public static class EnumExtension
/// <returns></returns>
public static string GetDescription(this object value)
{
if (value == null) return "";
return value.GetType().GetField(value.ToString()!)?.GetCustomAttribute<DescriptionAttribute>()?.Description;
return value == null ? "" : (value.GetType().GetField(value.ToString()!)?.GetCustomAttribute<DescriptionAttribute>()?.Description);
}
/// <summary>
@ -173,8 +171,7 @@ public static class EnumExtension
/// <returns></returns>
public static string GetTheme(this object value)
{
if (value == null) return "";
return value.GetType().GetField(value.ToString()!)?.GetCustomAttribute<ThemeAttribute>()?.Theme;
return value == null ? "" : (value.GetType().GetField(value.ToString()!)?.GetCustomAttribute<ThemeAttribute>()?.Theme);
}
/// <summary>

2
Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Admin.NET.Plugin.PaddleOCR.csproj
View File

@ -25,7 +25,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="PaddleOCRSharp" Version="5.0.0" />
<PackageReference Include="PaddleOCRSharp" Version="5.0.0.1" />
<PackageReference Include="Paddle.Runtime.win_x64" Version="3.0.0" />
</ItemGroup>

2
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj
View File

@ -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.16" />
<PackageReference Include="Rezero.Api" Version="1.8.19" />
</ItemGroup>
<ItemGroup>

10
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.05.20",
"lastBuildTime": "2025.05.24",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -39,7 +39,7 @@
"echarts": "^5.6.0",
"echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.1.0",
"element-plus": "^2.9.10",
"element-plus": "^2.9.11",
"exceljs": "^4.4.0",
"ezuikit-js": "^8.1.9-beta.3",
"gcoord": "^1.0.7",
@ -50,7 +50,7 @@
"jsplumb": "^2.15.6",
"jwchat": "^2.0.3",
"lodash-es": "^4.17.21",
"md-editor-v3": "^5.5.1",
"md-editor-v3": "^5.6.0",
"mitt": "^3.0.1",
"monaco-editor": "^0.52.2",
"mqtt": "^5.13.0",
@ -65,7 +65,7 @@
"screenfull": "^6.0.2",
"sm-crypto-v2": "^1.11.0",
"sortablejs": "^1.15.6",
"splitpanes": "^4.0.3",
"splitpanes": "^4.0.4",
"vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10",
"vue": "^3.5.14",
@ -110,7 +110,7 @@
"typescript": "^5.8.3",
"vite": "^6.3.5",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.3",
"vite-plugin-compression2": "^1.4.0",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vue-eslint-parser": "^10.1.3"
},