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

😎1、增加定时任务看板登录逻辑 2、升级依赖

zuohuaijun 10 місяців тому
батько
коміт
9502aed54e

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

@@ -19,9 +19,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.6" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.82" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.82" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.82" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.85" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.85" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.85" />
 	<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" />
@@ -41,12 +41,12 @@
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.10.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.12.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.195" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.196" />
     <PackageReference Include="SSH.NET" Version="2025.0.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.5" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.6" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1254" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1259" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" />
@@ -66,11 +66,11 @@
     <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" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.5" />
-    <PackageReference Include="XiHan.Framework.Utils" Version="0.9.10" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.6" />
 	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.1" />
+	<PackageReference Include="XiHan.Framework.Utils" Version="0.9.12" />
   </ItemGroup>
 
 </Project>

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

@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Furion.Xunit" Version="4.9.7.82" />
+      <PackageReference Include="Furion.Xunit" Version="4.9.7.85" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
       <PackageReference Include="Selenium.Support" Version="4.33.0" />
       <PackageReference Include="Selenium.WebDriver" Version="4.33.0" />

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

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.5" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>

+ 14 - 5
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -247,13 +247,13 @@ public class Startup : AppStartup
             options.EnableForHttps = true;
             options.Providers.Add<BrotliCompressionProvider>();
             options.Providers.Add<GzipCompressionProvider>();
-            options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[]
-            {
+            options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(
+            [
                     "text/html; charset=utf-8",
                     "application/xhtml+xml",
                     "application/atom+xml",
                     "image/svg+xml"
-             });
+             ]);
         });
 
         // 注册虚拟文件系统服务
@@ -330,11 +330,20 @@ public class Startup : AppStartup
         // 任务调度看板
         app.UseScheduleUI(options =>
         {
-            options.RequestPath = "/schedule";  // 必须以 / 开头且不以 / 结尾
-            options.DisableOnProduction = true; // 生产环境关闭
+            options.RequestPath = "/schedule"; // 必须以 / 开头且不以 / 结尾
+            options.DisableOnProduction = true; // 是否在生产环境关闭
             options.DisplayEmptyTriggerJobs = true; // 是否显示空作业触发器的作业
             options.DisplayHead = false; // 是否显示页头
             options.DefaultExpandAllJobs = false; // 是否默认展开所有作业
+            options.EnableDirectoryBrowsing = false; // 是否启用目录浏览
+            options.Title = "定时任务看板"; // 自定义看板标题
+
+            options.LoginHandle = async (username, password, httpContext) =>
+            {
+                var res = await httpContext.RequestServices.GetRequiredService<SysAuthService>().SwaggerSubmitUrl(new SpecificationAuth { UserName = username, Password = password });
+                return res == 200;
+            };
+            options.LoginSessionKey = "schedule_session_key"; // 登录客户端存储的 Session 键
         });
 
         // 配置Swagger-Knife4UI(路由前缀一致代表独立,不同则代表共存)

+ 7 - 7
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.06.08",
+	"lastBuildTime": "2025.06.12",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -18,8 +18,8 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@logicflow/core": "^2.0.14",
-		"@logicflow/extension": "^2.0.19",
+		"@logicflow/core": "^2.0.15",
+		"@logicflow/extension": "^2.0.20",
 		"@microsoft/signalr": "^8.0.7",
 		"@vue-office/docx": "^1.6.3",
 		"@vue-office/excel": "^1.7.14",
@@ -80,8 +80,8 @@
 		"@types/node": "^22.15.30",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.32.1",
-		"@typescript-eslint/parser": "^8.32.1",
+		"@typescript-eslint/eslint-plugin": "^8.34.0",
+		"@typescript-eslint/parser": "^8.34.0",
 		"@vitejs/plugin-vue": "^5.2.4",
 		"@vitejs/plugin-vue-jsx": "^4.2.0",
 		"@vue/compiler-sfc": "^3.5.14",
@@ -92,8 +92,8 @@
 		"less": "^4.3.0",
 		"prettier": "^3.5.3",
 		"rollup-plugin-visualizer": "^6.0.3",
-		"sass": "^1.89.0",
-		"terser": "^5.41.0",
+		"sass": "^1.89.2",
+		"terser": "^5.42.0",
 		"typescript": "^5.8.3",
 		"vite": "^6.3.5",
 		"vite-plugin-cdn-import": "^1.0.1",