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-02 01:13:54 +08:00
parent da86d48d86
commit 461e6f5913
3 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,10 +27,10 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.0" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.53" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.53" />
<PackageReference Include="Furion.Pure" Version="4.9.7.53" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.1" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.57" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.57" />
<PackageReference Include="Furion.Pure" Version="4.9.7.57" />
<PackageReference Include="Hardware.Info" Version="101.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />
@ -39,7 +39,7 @@
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
<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.11.0" />
<PackageReference Include="MailKit" Version="4.12.0" />
<PackageReference Include="MiniExcel" Version="1.41.1" />
<PackageReference Include="MiniWord" Version="0.9.2" />
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
@ -56,7 +56,7 @@
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.2" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1229" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1232" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>
@ -73,13 +73,13 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.2.0" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.2.0" />
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.3.0" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.3.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.4" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.0" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.1" />
<PackageReference Include="My.Extensions.Localization.Json" Version="3.4.0" />
</ItemGroup>

25
Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs
View File

@ -378,31 +378,6 @@ public static class RepositoryExtension
return ignore ? queryable.ClearFilter<ITenantIdFilter>() : queryable;
}
/// <summary>
/// 导航+子表过滤 创建一个扩展函数，默认是Class不支持Where
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="thisValue"></param>
/// <param name="whereExpression"></param>
/// <returns></returns>
public static List<T> Where<T>(this T thisValue, Func<T, bool> whereExpression) where T : class, new()
{
return [thisValue];
}
/// <summary>
/// 导航+子表过滤 创建一个扩展函数，默认是Class不支持WhereIF
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="thisValue"></param>
/// <param name="isWhere"></param>
/// <param name="whereExpression"></param>
/// <returns></returns>
public static List<T> WhereIF<T>(this T thisValue, bool isWhere, Func<T, bool> whereExpression) where T : class, new()
{
return [thisValue];
}
/// <summary>
/// 只更新某些列
/// </summary>

14
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.04.29",
"lastBuildTime": "2025.05.01",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -80,13 +80,13 @@
"vue-signature-pad": "^3.0.2",
"vue3-flag-icons": "^0.0.3",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.5.32",
"vxe-table": "^4.13.14",
"vxe-pc-ui": "^4.5.35",
"vxe-table": "^4.13.16",
"xe-utils": "^3.7.4",
"xlsx-js-style": "^1.2.0"
},
"devDependencies": {
"@iconify/vue": "^4.3.0",
"@iconify/vue": "^5.0.0",
"@plugin-web-update-notification/vite": "^2.0.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.17.32",
@ -99,16 +99,16 @@
"@vue/compiler-sfc": "^3.5.13",
"code-inspector-plugin": "^0.20.10",
"eslint": "^9.25.1",
"eslint-plugin-vue": "^10.0.0",
"eslint-plugin-vue": "^10.1.0",
"globals": "^16.0.0",
"less": "^4.3.0",
"openapi-ts-request": "^1.3.3",
"openapi-ts-request": "^1.3.4",
"prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.87.0",
"terser": "^5.39.0",
"typescript": "^5.8.3",
"vite": "^6.3.3",
"vite": "^6.3.4",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.3",
"vite-plugin-vue-setup-extend": "^0.4.0",