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-03-23 14:40:53 +08:00
parent f60b6735fb
commit 16a49a8540
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.3" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.3" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.26" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.29" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.26" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.29" />
<PackageReference Include="Furion.Pure" Version="4.9.7.26" /> <PackageReference Include="Furion.Pure" Version="4.9.7.29" />
<PackageReference Include="Hardware.Info" Version="101.0.1" /> <PackageReference Include="Hardware.Info" Version="101.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />

3
Admin.NET/Admin.NET.Core/Service/User/SysUserRoleService.cs
View File

@ -106,8 +106,7 @@ public class SysUserRoleService : ITransient
/// <returns></returns> /// <returns></returns>
public async Task<List<SysRole>> GetUserRoleList(long userId) public async Task<List<SysRole>> GetUserRoleList(long userId)
{ {
var sysUserRoleList = await _sysUserRoleRep.AsQueryable() var sysUserRoleList = await _sysUserRoleRep.AsQueryable().Includes(u => u.SysRole)
.Includes(u => u.SysRole)
.Where(u => u.UserId == userId).ToListAsync(); .Where(u => u.UserId == userId).ToListAsync();
return sysUserRoleList.Where(u => u.SysRole != null).Select(u => u.SysRole).ToList(); return sysUserRoleList.Where(u => u.SysRole != null).Select(u => u.SysRole).ToList();
} }

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

@ -31,7 +31,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="PaddleOCRSharp" Version="4.4.0.2" /> <PackageReference Include="PaddleOCRSharp" Version="4.5.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.03.21", "lastBuildTime": "2025.03.23",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -46,7 +46,7 @@
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"jwchat": "^2.0.3", "jwchat": "^2.0.3",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"md-editor-v3": "^5.4.3", "md-editor-v3": "^5.4.4",
"mitt": "^3.0.1", "mitt": "^3.0.1",
"monaco-editor": "^0.52.2", "monaco-editor": "^0.52.2",
"mqtt": "^5.10.4", "mqtt": "^5.10.4",
@ -76,7 +76,7 @@
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-flag-icons": "^0.0.3", "vue3-flag-icons": "^0.0.3",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.4.21", "vxe-pc-ui": "^4.4.22",
"vxe-table": "^4.11.28", "vxe-table": "^4.11.28",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7", "vxe-table-plugin-export-xlsx": "^4.0.7",
@ -87,7 +87,7 @@
"@iconify/vue": "^4.3.0", "@iconify/vue": "^4.3.0",
"@plugin-web-update-notification/vite": "^2.0.0", "@plugin-web-update-notification/vite": "^2.0.0",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.17.24", "@types/node": "^20.17.25",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.27.0", "@typescript-eslint/eslint-plugin": "^8.27.0",
@ -96,7 +96,7 @@
"@vitejs/plugin-vue-jsx": "^4.1.2", "@vitejs/plugin-vue-jsx": "^4.1.2",
"@vue/compiler-sfc": "^3.5.13", "@vue/compiler-sfc": "^3.5.13",
"code-inspector-plugin": "^0.20.6", "code-inspector-plugin": "^0.20.6",
"eslint": "^9.22.0", "eslint": "^9.23.0",
"eslint-plugin-vue": "^10.0.0", "eslint-plugin-vue": "^10.0.0",
"globals": "^16.0.0", "globals": "^16.0.0",
"less": "^4.2.2", "less": "^4.2.2",