Переглянути джерело

😎1、问题整改 2、升级依赖

zuohuaijun 1 місяць тому
батько
коміт
ebee41179c

+ 1 - 0
.gitignore

@@ -45,3 +45,4 @@ node_modules/
 /Admin.NET/Admin.NET.sln.DotSettings.user
 Admin.NET/Admin.NET.Application/Configuration/DeepSeek.json
 *.user
+/Admin.NET/.github

+ 16 - 16
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -14,14 +14,14 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.3.0" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.971" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.1036" />
     <PackageReference Include="AngleSharp" Version="1.4.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.3.0" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.8.18" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.8.18" />
-    <PackageReference Include="Furion.Pure" Version="4.9.8.18" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.3.2" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.8.24" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.8.24" />
+    <PackageReference Include="Furion.Pure" Version="4.9.8.24" />
     <PackageReference Include="Hardware.Info" Version="101.1.1.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -31,22 +31,22 @@
     <PackageReference Include="Magicodes.IE.Excel" Version="2.8.0" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.8.0" />
     <PackageReference Include="Magicodes.IE.Word" Version="2.8.0" />
-    <PackageReference Include="MailKit" Version="4.15.0" />
-    <PackageReference Include="MiniExcel" Version="1.42.0" />
+    <PackageReference Include="MailKit" Version="4.15.1" />
+    <PackageReference Include="MiniExcel" Version="1.43.0" />
     <PackageReference Include="MiniWord" Version="0.9.2" />
-    <PackageReference Include="NewLife.Redis" Version="6.4.2026.201" />
+    <PackageReference Include="NewLife.Redis" Version="6.5.2026.303" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
     <PackageReference Include="QRCoder" Version="1.7.0" />
-    <PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="7.2.1" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.14.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.16.0" />
     <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.277" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.211" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.214" />
     <PackageReference Include="SSH.NET" Version="2025.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.1" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1375" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1385" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
@@ -64,11 +64,11 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="10.0.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="10.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.3" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
-    <PackageReference Include="XiHan.Framework.Utils" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.5" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.5" />
+    <PackageReference Include="XiHan.Framework.Utils" Version="2.3.3" />
   </ItemGroup>	
 
 </Project>

+ 5 - 0
Admin.NET/Admin.NET.Core/Job/OnlineUserJob.cs

@@ -42,5 +42,10 @@ public class OnlineUserJob : IJob
 
         // 缓存租户列表
         await serviceScope.ServiceProvider.GetRequiredService<SysTenantService>().CacheTenant();
+
+        // 加载动态程序集
+        await serviceScope.ServiceProvider.GetRequiredService<SysPluginService>().LoadAllAssembly();
+        msg = $"【启动任务】加载动态程序集 {DateTime.Now}";
+        Console.WriteLine(msg);
     }
 }

+ 14 - 0
Admin.NET/Admin.NET.Core/Service/Plugin/SysPluginService.cs

@@ -123,4 +123,18 @@ public class SysPluginService : IDynamicApiController, ITransient
     {
         _provider.RemoveAssembliesWithNotifyChanges(assemblyName);
     }
+
+    /// <summary>
+    /// 加载所有动态程序集/接口
+    /// </summary>
+    /// <returns></returns>
+    [NonAction]
+    public async Task LoadAllAssembly()
+    {
+        var plugins = await _sysPluginRep.GetListAsync();
+        foreach (var plugin in plugins)
+        {
+            CompileAssembly(plugin.CsharpCode, plugin.AssemblyName);
+        }
+    }
 }

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

@@ -12,11 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.8.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.8.24" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageReference Include="Selenium.Support" Version="4.41.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.41.0" />
-    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="145.0.3800.58" />
+    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="145.0.3800.82" />
     <PackageReference Include="xunit.v3.assert" Version="3.2.2" />
   </ItemGroup>
 

+ 1 - 1
Admin.NET/Admin.NET.Test/BaseTest.cs

@@ -44,7 +44,7 @@ public class BaseTest : IDisposable
     /// </summary>
     /// <param name="account"></param>
     /// <param name="password"></param>
-    protected async Task Login(string account = "superadmin", string password = "123456")
+    protected async Task Login(string account = "superAdmin.NET", string password = "Admin.NET++010101")
     {
         await GoToUrlAsync("/#/login");
         var inputList = Driver.FindElements(By.CssSelector("#pane-account input"));

+ 2 - 2
Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Scalar.AspNetCore" Version="2.12.46" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.3" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.13.8" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.5" />
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 2
Admin.NET/Admin.NET.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36705.20 d17.14
+# Visual Studio Version 18
+VisualStudioVersion = 18.5.11605.296 insiders
 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 - 2
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -25,8 +25,8 @@
 
   <ItemGroup>
     <PackageReference Include="ClosedXML" Version="0.105.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
-    <PackageReference Include="Rezero.Api" Version="1.8.30" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
+    <PackageReference Include="Rezero.Api" Version="1.8.32" />
   </ItemGroup>
 
   <ItemGroup>

+ 23 - 23
Web/package.json

@@ -2,8 +2,8 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"packageManager": "pnpm@10.28.2",
-	"lastBuildTime": "2026.02.24",
+	"packageManager": "pnpm@10.32.1",
+	"lastBuildTime": "2026.03.15",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -38,20 +38,20 @@
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
 		"async-validator": "^4.2.5",
-		"axios": "^1.13.5",
-		"countup.js": "^2.9.0",
+		"axios": "^1.13.6",
+		"countup.js": "^2.10.0",
 		"cropperjs": "^1.6.2",
 		"echarts": "^6.0.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.13.2",
+		"element-plus": "^2.13.5",
 		"ezuikit-js": "^8.2.6",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"json-editor-vue": "^0.18.1",
 		"jsplumb": "^2.15.6",
 		"lodash-es": "^4.17.23",
-		"md-editor-v3": "^6.3.1",
+		"md-editor-v3": "^6.4.0",
 		"mitt": "^3.0.1",
 		"monaco-editor": "^0.55.1",
 		"mqtt": "^5.15.0",
@@ -68,12 +68,12 @@
 		"splitpanes": "^4.0.4",
 		"vcrontab-3": "^3.3.22",
 		"vform3-builds": "^3.0.10",
-		"vue": "^3.5.28",
+		"vue": "^3.5.30",
 		"vue-clipboard3": "^2.0.0",
 		"vue-demi": "^0.14.10",
 		"vue-draggable-plus": "^0.6.1",
 		"vue-grid-layout": "3.0.0-beta1",
-		"vue-i18n": "^11.2.8",
+		"vue-i18n": "^11.3.0",
 		"vue-json-pretty": "^2.6.0",
 		"vue-plugin-hiprint": "^0.0.60",
 		"vue-router": "^5.0.3",
@@ -82,36 +82,36 @@
 		"xlsx-js-style": "^1.2.0"
 	},
 	"devDependencies": {
-		"@eslint/eslintrc": "^3.3.4",
+		"@eslint/eslintrc": "^3.3.5",
 		"@eslint/js": "^10.0.1",
 		"@plugin-web-update-notification/vite": "^2.0.2",
 		"@rollup/pluginutils": "^5.3.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.19.11",
+		"@types/node": "^22.19.15",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.9",
-		"@typescript-eslint/eslint-plugin": "^8.56.1",
-		"@typescript-eslint/parser": "^8.56.1",
-		"@vitejs/plugin-vue": "^6.0.4",
-		"@vitejs/plugin-vue-jsx": "^5.1.4",
-		"@vue/compiler-sfc": "^3.5.28",
+		"@typescript-eslint/eslint-plugin": "^8.57.0",
+		"@typescript-eslint/parser": "^8.57.0",
+		"@vitejs/plugin-vue": "^6.0.5",
+		"@vitejs/plugin-vue-jsx": "^5.1.5",
+		"@vue/compiler-sfc": "^3.5.30",
 		"cli-progress": "^3.12.0",
-		"code-inspector-plugin": "^1.4.2",
+		"code-inspector-plugin": "^1.4.4",
 		"colors": "^1.4.0",
 		"dotenv": "^17.3.1",
-		"eslint": "^10.0.2",
+		"eslint": "^10.0.3",
 		"eslint-plugin-vue": "^10.8.0",
-		"globals": "^17.3.0",
-		"less": "^4.5.1",
+		"globals": "^17.4.0",
+		"less": "^4.6.4",
 		"prettier": "^3.8.1",
-		"rollup-plugin-visualizer": "^7.0.0",
-		"sass": "^1.97.3",
+		"rollup-plugin-visualizer": "^7.0.1",
+		"sass": "^1.98.0",
 		"terser": "^5.46.0",
 		"typescript": "^5.9.3",
-		"vite": "^7.3.1",
+		"vite": "^8.0.0",
 		"vite-auto-i18n-plugin": "^1.1.16",
 		"vite-plugin-cdn-import": "^1.0.1",
-		"vite-plugin-compression2": "^2.4.0",
+		"vite-plugin-compression2": "^2.5.1",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
 		"vue-eslint-parser": "^10.4.0"
 	},

+ 1 - 1
Web/src/layout/navBars/tagsView/tagsView.vue

@@ -601,7 +601,7 @@ watch(
 	background-color: var(--el-color-white);
 	border-bottom: 1px solid var(--next-border-color-light);
 	position: relative;
-	z-index: 199;
+	z-index: 100;
 	:deep(.el-scrollbar__wrap) {
 		overflow-x: auto !important;
 	}