Bläddra i källkod

😎升级依赖及调整适配

zuohuaijun 1 år sedan
förälder
incheckning
f8948b67c1

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

@@ -14,26 +14,26 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.600" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.627" />
     <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="Elastic.Clients.Elasticsearch" Version="9.0.6" />
-    <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="Elastic.Clients.Elasticsearch" Version="9.0.7" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.93" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.93" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.93" />
 	<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" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="log4net" Version="3.1.0" />
-    <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.12.1" />
-    <PackageReference Include="MiniExcel" Version="1.41.2" />
+    <PackageReference Include="Magicodes.IE.Excel" Version="2.7.6" />
+    <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.6" />
+    <PackageReference Include="Magicodes.IE.Word" Version="2.7.6" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="MiniExcel" Version="1.41.3" />
     <PackageReference Include="MiniWord" Version="0.9.2" />
-    <PackageReference Include="NewLife.Redis" Version="6.2.2025.601" />
+    <PackageReference Include="NewLife.Redis" Version="6.3.2025.701" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
 	<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
     <PackageReference Include="QRCoder" 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.196" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.197" />
     <PackageReference Include="SSH.NET" Version="2025.0.0" />
     <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.1259" />
+    <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="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" />
@@ -59,7 +59,7 @@
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.11" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.11" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.11" />
-	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.7" />  
+	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.11" />  
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
@@ -69,8 +69,8 @@
     <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.13-preview.6" />
+	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.2" />
+	<PackageReference Include="XiHan.Framework.Utils" Version="0.11.3" />
   </ItemGroup>
 
 </Project>

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

@@ -12,11 +12,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Furion.Xunit" Version="4.9.7.85" />
+      <PackageReference Include="Furion.Xunit" Version="4.9.7.93" />
       <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" />
-      <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="136.0.3240.76" />
+      <PackageReference Include="Selenium.Support" Version="4.34.0" />
+      <PackageReference Include="Selenium.WebDriver" Version="4.34.0" />
+      <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="138.0.3351.65" />
       <PackageReference Include="xunit.assert" Version="2.9.3" />
     </ItemGroup>
 

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

@@ -331,19 +331,21 @@ public class Startup : AppStartup
         app.UseScheduleUI(options =>
         {
             options.RequestPath = "/schedule"; // 必须以 / 开头且不以 / 结尾
-            options.DisableOnProduction = true; // 是否在生产环境中关闭
+            options.DisableOnProduction = false; // 是否在生产环境中关闭
             options.DisplayEmptyTriggerJobs = true; // 是否显示空作业触发器的作业
             options.DisplayHead = false; // 是否显示页头
             options.DefaultExpandAllJobs = false; // 是否默认展开所有作业
             options.EnableDirectoryBrowsing = false; // 是否启用目录浏览
             options.Title = "定时任务看板"; // 自定义看板标题
 
-            options.LoginHandle = async (username, password, httpContext) =>
+            options.LoginConfig.OnLoging = 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 键
+            options.LoginConfig.DefaultUsername = "";
+            options.LoginConfig.DefaultPassword = "";
+            options.LoginConfig.SessionKey = "schedule_session_key"; // 登录客户端存储的 Session 键
         });
 
         // 配置Swagger-Knife4UI(路由前缀一致代表独立,不同则代表共存)

+ 1 - 1
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -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.23" />
+    <PackageReference Include="Rezero.Api" Version="1.8.24" />
   </ItemGroup>
 
   <ItemGroup>

+ 27 - 27
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.06.12",
+	"lastBuildTime": "2025.07.06",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -19,31 +19,31 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@logicflow/core": "^2.0.15",
-		"@logicflow/extension": "^2.0.20",
+		"@logicflow/core": "^2.0.16",
+		"@logicflow/extension": "^2.0.21",
 		"@microsoft/signalr": "^8.0.7",
 		"@vue-office/docx": "^1.6.3",
 		"@vue-office/excel": "^1.7.14",
 		"@vue-office/pdf": "^2.0.10",
-		"@vueuse/core": "^13.2.0",
+		"@vueuse/core": "^13.5.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
 		"async-validator": "^4.2.5",
-		"axios": "^1.9.0",
+		"axios": "^1.10.0",
 		"countup.js": "^2.8.2",
 		"cropperjs": "^1.6.2",
 		"echarts": "^5.6.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.10.1",
-		"ezuikit-js": "^8.1.9-beta.3",
+		"element-plus": "^2.10.3",
+		"ezuikit-js": "^8.1.12-beta.1",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"json-editor-vue": "^0.18.1",
 		"jsplumb": "^2.15.6",
 		"lodash-es": "^4.17.21",
-		"md-editor-v3": "^5.6.1",
+		"md-editor-v3": "^5.7.1",
 		"mitt": "^3.0.1",
 		"monaco-editor": "^0.52.2",
 		"mqtt": "^5.13.1",
@@ -60,13 +60,13 @@
 		"splitpanes": "^4.0.4",
 		"vcrontab-3": "^3.3.22",
 		"vform3-builds": "^3.0.10",
-		"vue": "^3.5.14",
+		"vue": "^3.5.17",
 		"vue-clipboard3": "^2.0.0",
 		"vue-demi": "^0.14.10",
 		"vue-draggable-plus": "^0.6.0",
 		"vue-grid-layout": "3.0.0-beta1",
-		"vue-i18n": "^11.1.4",
-		"vue-json-pretty": "^2.4.0",
+		"vue-i18n": "^11.1.9",
+		"vue-json-pretty": "^2.5.0",
 		"vue-plugin-hiprint": "^0.0.60",
 		"vue-router": "^4.5.1",
 		"vue-signature-pad": "^3.0.2",
@@ -75,32 +75,32 @@
 	},
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.1",
-		"@eslint/js": "^9.27.0",
+		"@eslint/js": "^9.30.1",
 		"@plugin-web-update-notification/vite": "^2.0.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.15.30",
+		"@types/node": "^22.15.35",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@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",
-		"code-inspector-plugin": "^0.20.10",
-		"eslint": "^9.27.0",
-		"eslint-plugin-vue": "^10.2.0",
-		"globals": "^16.2.0",
+		"@typescript-eslint/eslint-plugin": "^8.35.1",
+		"@typescript-eslint/parser": "^8.35.1",
+		"@vitejs/plugin-vue": "^6.0.0",
+		"@vitejs/plugin-vue-jsx": "^5.0.1",
+		"@vue/compiler-sfc": "^3.5.17",
+		"code-inspector-plugin": "^0.20.15",
+		"eslint": "^9.30.1",
+		"eslint-plugin-vue": "^10.3.0",
+		"globals": "^16.3.0",
 		"less": "^4.3.0",
-		"prettier": "^3.5.3",
+		"prettier": "^3.6.2",
 		"rollup-plugin-visualizer": "^6.0.3",
 		"sass": "^1.89.2",
-		"terser": "^5.42.0",
+		"terser": "^5.43.1",
 		"typescript": "^5.8.3",
-		"vite": "^6.3.5",
+		"vite": "^7.0.2",
 		"vite-plugin-cdn-import": "^1.0.1",
-		"vite-plugin-compression2": "^2.0.1",
+		"vite-plugin-compression2": "^2.2.0",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
-		"vue-eslint-parser": "^10.1.3"
+		"vue-eslint-parser": "^10.2.0"
 	},
 	"pnpm": {
 		"onlyBuiltDependencies": [