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-09-14 11:11:04 +08:00
parent 3a76b2a0fc
commit 0bac43bc87
10 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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.786" />
<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="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.6" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.117" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.117" />
<PackageReference Include="Furion.Pure" Version="4.9.7.117" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.7" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.121" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.121" />
<PackageReference Include="Furion.Pure" Version="4.9.7.121" />
<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" />
@ -52,7 +52,7 @@
<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="SqlSugar.MongoDbCore" Version="5.1.4.260" />
<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" />
@ -60,15 +60,15 @@
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1273" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
<PackageReference Include="microsoft.semantickernel" Version="1.64.0" />
<PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="1.64.0" />
<PackageReference Include="microsoft.semantickernel" Version="1.65.0" />
<PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="1.65.0" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Amazon" Version="1.56.0-alpha" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Google" Version="1.54.0-alpha" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.HuggingFace" Version="1.56.0-preview" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.54.0-alpha" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.54.0-preview" />
<PackageReference Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.64.0" />
<PackageReference Include="Microsoft.SemanticKernel.Yaml" Version="1.64.0" />
<PackageReference Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.65.0" />
<PackageReference Include="Microsoft.SemanticKernel.Yaml" Version="1.65.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
@ -85,9 +85,9 @@
<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.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="My.Extensions.Localization.Json" Version="3.4.0" />
</ItemGroup>
</Project>

2
Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs
View File

@ -412,7 +412,7 @@ public class SysRoleService : IDynamicApiController, ITransient
// 超管账号获取所有接口
if (_userManager.SuperAdmin)
{
var allApiList = _sysCommonService.GetApiList();
var allApiList = _sysCommonService.GetSysAllApiList();
foreach (var apiOutput in allApiList)
{
foreach (var controller in apiOutput.Children)

4
Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj
View File

@ -14,8 +14,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Furion.Xunit" Version="4.9.7.117" />
<PackageReference Include="Furion.Pure" Version="4.9.7.117">
<PackageReference Include="Furion.Xunit" Version="4.9.7.121" />
<PackageReference Include="Furion.Pure" Version="4.9.7.121">
<ExcludeAssets>compile</ExcludeAssets>
</PackageReference>
<PackageReference Include="xunit.assert" Version="2.9.3" />

2
Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj
View File

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

8
Admin.NET/Admin.NET.Web.Core/Handlers/JwtHandler.cs
View File

@ -132,15 +132,13 @@ namespace Admin.NET.Web.Core
}
// 获取当前用户按钮权限集合和接口黑名单
var sysRoleService = serviceScope.ServiceProvider.GetRequiredService<SysRoleService>();
var roleApis = await sysRoleService.GetUserApiList();
var userApiList = await serviceScope.ServiceProvider.GetRequiredService<SysRoleService>().GetUserApiList();
// 若当前路由在按钮权限集合里面则放行
if (roleApis[0].Exists(u => path.EndsWith(u, StringComparison.CurrentCultureIgnoreCase)))
return true;
if (userApiList[0].Exists(u => path.EndsWith(u, StringComparison.CurrentCultureIgnoreCase))) return true;
// 若当前路由在已接口黑名单里面则禁止
return roleApis[1].TrueForAll(u => !path.EndsWith(u, StringComparison.CurrentCultureIgnoreCase));
return userApiList[1].TrueForAll(u => !path.EndsWith(u, StringComparison.CurrentCultureIgnoreCase));
}
}
}

4
Admin.NET/Admin.NET.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32112.339
# Visual Studio Version 18
VisualStudioVersion = 18.0.11010.61 d18.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.NET.Application", "Admin.NET.Application\Admin.NET.Application.csproj", "{C3F5AEC5-ACEE-4109-94E3-3F981DC18268}"
EndProject

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.25" />
<PackageReference Include="Rezero.Api" Version="1.8.26" />
</ItemGroup>
<ItemGroup>

2
Web/README.md
View File

@ -35,7 +35,7 @@
#### 🚧 安装 cnpm、yarn
- 复制代码(桌面 cmd 运行) `npm install -g pnpm --registry=https://registry.npm.taobao.org`
- 复制代码(桌面 cmd 运行) `npm install -g pnpm --registry=https://registry.npmmirror.com`
#### 🏭 环境支持

42
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.09.03",
"lastBuildTime": "2025.09.14",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -33,13 +33,13 @@
"@wangeditor/editor-for-vue": "^5.1.12",
"animate.css": "^4.1.1",
"async-validator": "^4.2.5",
"axios": "^1.11.0",
"axios": "^1.12.1",
"compressorjs": "^1.2.1",
"countup.js": "^2.9.0",
"cropperjs": "^1.6.2",
"crypto-js": "^4.2.0",
"echarts": "^6.0.0",
"element-plus": "^2.11.1",
"element-plus": "^2.11.2",
"exceljs": "^4.4.0",
"flag-icons": "^7.5.0",
"franc": "^6.2.0",
@ -48,8 +48,8 @@
"json-editor-vue": "^0.18.1",
"jsplumb": "^2.15.6",
"lodash-es": "^4.17.21",
"magic-string": "^0.30.18",
"md-editor-v3": "^5.8.4",
"magic-string": "^0.30.19",
"md-editor-v3": "^6.0.1",
"mitt": "^3.0.1",
"monaco-editor": "^0.52.2",
"mqtt": "^5.14.0",
@ -62,11 +62,11 @@
"qs": "^6.14.0",
"relation-graph": "^2.2.11",
"screenfull": "^6.0.2",
"sm-crypto-v2": "^1.13.0",
"sm-crypto-v2": "^1.14.0",
"sortablejs": "^1.15.6",
"splitpanes": "^4.0.4",
"sql-formatter": "^15.6.6",
"uuid": "^11.1.0",
"sql-formatter": "^15.6.9",
"uuid": "^13.0.0",
"vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10",
"vue": "^3.5.21",
@ -75,44 +75,44 @@
"vue-draggable-plus": "^0.6.0",
"vue-element-plus-x": "^1.3.7",
"vue-grid-layout": "3.0.0-beta1",
"vue-i18n": "^11.1.11",
"vue-i18n": "^11.1.12",
"vue-json-pretty": "^2.5.0",
"vue-plugin-hiprint": "^0.0.60",
"vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.9.13",
"vxe-table": "^4.16.4",
"xe-utils": "^3.7.8",
"vxe-pc-ui": "^4.9.28",
"vxe-table": "^4.16.11",
"xe-utils": "^3.7.9",
"xlsx-js-style": "^1.2.0"
},
"devDependencies": {
"@iconify/vue": "^5.0.0",
"@plugin-web-update-notification/vite": "^2.0.2",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.18.0",
"@types/node": "^22.18.3",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.42.0",
"@typescript-eslint/parser": "^8.42.0",
"@typescript-eslint/eslint-plugin": "^8.43.0",
"@typescript-eslint/parser": "^8.43.0",
"@vitejs/plugin-vue": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.1.1",
"@vue/compiler-sfc": "^3.5.21",
"cli-progress": "^3.12.0",
"code-inspector-plugin": "^1.2.6",
"code-inspector-plugin": "^1.2.8",
"colors": "^1.4.0",
"dotenv": "^17.2.1",
"eslint": "^9.34.0",
"eslint": "^9.35.0",
"eslint-plugin-vue": "^10.4.0",
"globals": "^16.3.0",
"globals": "^16.4.0",
"less": "^4.4.1",
"prettier": "^3.6.2",
"rollup-plugin-visualizer": "^6.0.3",
"sass": "^1.91.0",
"sass": "^1.92.1",
"terser": "^5.44.0",
"typescript": "^5.9.2",
"vite": "^7.1.4",
"vite-auto-i18n-plugin": "^1.1.8",
"vite": "^7.1.5",
"vite-auto-i18n-plugin": "^1.1.9",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^2.2.1",
"vite-plugin-vue-setup-extend": "^0.4.0",

4
Web/src/views/system/onlineUser/signalR.ts
View File

@ -32,7 +32,7 @@ connection.onclose(async () => {
connection.onreconnecting(() => {
ElNotification({
title: '提示',
message: '服务已下线>>>>>',
message: '服务已下线 >>>>>',
type: 'error',
position: 'bottom-right',
});
@ -41,7 +41,7 @@ connection.onreconnecting(() => {
connection.onreconnected(() => {
ElNotification({
title: '提示',
message: '服务已上线>>>>>',
message: '服务已上线 >>>>>',
type: 'success',
position: 'bottom-right',
});