Selaa lähdekoodia

😎1、升级依赖 2、清理格式化代码

zuohuaijun 6 kuukautta sitten
vanhempi
commit
b143cdf3d0

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

@@ -14,15 +14,15 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.799" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.809" />
     <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.1.6" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.119" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.119" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.119" />
-    <PackageReference Include="Hardware.Info" Version="101.0.1.1" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.7" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.126" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.126" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.126" />
+    <PackageReference Include="Hardware.Info" Version="101.1.0" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
@@ -32,7 +32,7 @@
     <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="MiniExcel" Version="1.41.4" />
     <PackageReference Include="MiniWord" Version="0.9.2" />
     <PackageReference Include="NewLife.Redis" Version="6.3.2025.801" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
@@ -42,7 +42,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.258" />
+    <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.264" />
     <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" />
@@ -66,10 +66,10 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.4.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.4.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.PowerShell.SDK" Version="7.5.2" />
+    <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="Microsoft.PowerShell.SDK" Version="7.5.3" />
     <PackageReference Include="XiHan.Framework.Utils" Version="1.2.1" />
   </ItemGroup>
 

+ 5 - 2
Admin.NET/Admin.NET.Core/Option/LocalizationSettingsOptions.cs

@@ -5,18 +5,21 @@
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
 
 namespace Admin.NET.Core;
+
 public sealed class LocalizationSettingsOptions : IConfigurableOptions
 {
     /// <summary>
     /// 语言列表
     /// </summary>
-    public List<string> SupportedCultures { get; set; } 
+    public List<string> SupportedCultures { get; set; }
+
     /// <summary>
     /// 默认语言
     /// </summary>
     public string DefaultCulture { get; set; }
+
     /// <summary>
     /// 固定时间区域为特定时区(多语言)
     /// </summary>
     public string DateTimeFormatCulture { get; set; }
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/APIJSON/APIJSONService.cs

@@ -40,7 +40,7 @@ public class APIJSONService : IDynamicApiController, ITransient
         var database = jobject["@database"]?.ToString();
         if (!string.IsNullOrEmpty(database))
         {
-            // 设置数据库 
+            // 设置数据库
             var provider = _db.AsTenant().GetConnectionScope(database);
             jobject.Remove("@database");
             return new SelectTable(_identityService, _tableMapper, provider).Query(jobject);

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -424,7 +424,7 @@ public class SysAuthService : IDynamicApiController, ITransient
         _captcha.Generate(input.CodeId.ToString());
 
         // 登录时隐藏租户,查找对应租户信息
-        input.TenantId = input.TenantId <= 0? (await _sysTenantService.GetCurrentTenantSysInfo()).Id : input.TenantId;
+        input.TenantId = input.TenantId <= 0 ? (await _sysTenantService.GetCurrentTenantSysInfo()).Id : input.TenantId;
 
         // 判断租户是否有效且启用注册功能
         var tenant = await _sysUserRep.Context.Queryable<SysTenant>().FirstAsync(u => u.Id == input.TenantId && u.Status == StatusEnum.Enable);

+ 4 - 3
Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -221,7 +221,8 @@ public class SysMenuService : IDynamicApiController, ITransient
         var sysMenu = input.Adapt<SysMenu>();
         CheckMenuParam(sysMenu);
 
-        await _sysMenuRep.AsTenant().UseTranAsync(async () => {
+        await _sysMenuRep.AsTenant().UseTranAsync(async () =>
+        {
             // 更新菜单
             await _sysMenuRep.AsUpdateable(sysMenu).ExecuteCommandAsync();
 
@@ -239,10 +240,10 @@ public class SysMenuService : IDynamicApiController, ITransient
                     Content = sysMenu.Title
                 });
             }
-        }, err => {
+        }, err =>
+        {
             Oops.Oh("更新数据时发生错误", err.Message);
         });
-        
 
         // 清除缓存
         DeleteMenuCache();

+ 5 - 4
Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs

@@ -153,13 +153,14 @@ public class SysRegionService : IDynamicApiController, ITransient
         var syncLevel = await _sysConfigService.GetConfigValue<int>(ConfigConst.SysRegionSyncLevel);
         if (syncLevel is < 1 or > 5) syncLevel = 3;//默认区县级
 
-        await _sysRegionRep.AsTenant().UseTranAsync(async () => {
+        await _sysRegionRep.AsTenant().UseTranAsync(async () =>
+        {
             await _sysRegionRep.DeleteAsync(u => u.Id > 0);
             await SyncByMap(syncLevel);
-        }, err => {
+        }, err =>
+        {
             throw Oops.Oh(ErrorCodeEnum.R2005);
         });
-        
 
         // var context = BrowsingContext.New(AngleSharp.Configuration.Default.WithDefaultLoader());
         // var dom = await context.OpenAsync(_url);
@@ -349,7 +350,7 @@ public class SysRegionService : IDynamicApiController, ITransient
                     list.Add(county);
                 }
             }
-            
+
             // 按省份同步快速写入提升同步效率,全部一次性写入容易出现从统计局获取数据失败
             // 仅当数据量大于1000或非Oracle数据库时采用大数据量写入方式(SqlSugar官方已说明,数据量小于1000时,其性能不如普通插入, oracle此方法不支持事务)
             if (list.Count > 1000 || _sysRegionRep.Context.CurrentConnectionConfig.DbType != SqlSugar.DbType.Oracle)

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

@@ -12,11 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.7.119" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.7.126" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="Selenium.Support" Version="4.35.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.35.0" />
-    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="139.0.3405.125" />
+    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="140.0.3485.66" />
     <PackageReference Include="xunit.assert" Version="2.9.3" />
   </ItemGroup>
 

+ 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.8" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup>

+ 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.26" />
+    <PackageReference Include="Rezero.Api" Version="1.8.27" />
   </ItemGroup>
 
   <ItemGroup>

+ 26 - 26
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.08.30",
+	"lastBuildTime": "2025.09.23",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -25,34 +25,34 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.2",
-		"@logicflow/core": "^2.1.1",
-		"@logicflow/extension": "^2.1.2",
+		"@logicflow/core": "^2.1.2",
+		"@logicflow/extension": "^2.1.3",
 		"@microsoft/signalr": "^9.0.6",
 		"@vue-office/docx": "^1.6.3",
 		"@vue-office/excel": "^1.7.14",
 		"@vue-office/pdf": "^2.0.10",
-		"@vueuse/core": "^13.8.0",
+		"@vueuse/core": "^13.9.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.11.0",
+		"axios": "^1.12.2",
 		"countup.js": "^2.8.2",
 		"cropperjs": "^1.6.2",
 		"echarts": "^6.0.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.11.1",
-		"ezuikit-js": "^8.1.14",
+		"element-plus": "^2.11.3",
+		"ezuikit-js": "^8.1.15",
 		"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.8.4",
+		"md-editor-v3": "^6.0.1",
 		"mitt": "^3.0.1",
-		"monaco-editor": "^0.52.2",
-		"mqtt": "^5.14.0",
+		"monaco-editor": "^0.53.0",
+		"mqtt": "^5.14.1",
 		"nprogress": "^0.2.0",
 		"pinia": "^3.0.3",
 		"print-js": "^1.6.0",
@@ -61,17 +61,17 @@
 		"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",
 		"vcrontab-3": "^3.3.22",
 		"vform3-builds": "^3.0.10",
-		"vue": "^3.5.20",
+		"vue": "^3.5.21",
 		"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.11",
+		"vue-i18n": "^11.1.12",
 		"vue-json-pretty": "^2.5.0",
 		"vue-plugin-hiprint": "^0.0.60",
 		"vue-router": "^4.5.1",
@@ -81,32 +81,32 @@
 	},
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.1",
-		"@eslint/js": "^9.34.0",
+		"@eslint/js": "^9.36.0",
 		"@plugin-web-update-notification/vite": "^2.0.1",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.18.0",
+		"@types/node": "^22.18.6",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.41.0",
-		"@typescript-eslint/parser": "^8.41.0",
+		"@typescript-eslint/eslint-plugin": "^8.44.1",
+		"@typescript-eslint/parser": "^8.44.1",
 		"@vitejs/plugin-vue": "^6.0.1",
 		"@vitejs/plugin-vue-jsx": "^5.1.1",
 		"cli-progress": "^3.12.0",
-		"@vue/compiler-sfc": "^3.5.20",
-		"code-inspector-plugin": "^1.2.6",
+		"@vue/compiler-sfc": "^3.5.21",
+		"code-inspector-plugin": "^1.2.10",
 		"colors": "^1.4.0",
-		"dotenv": "^17.2.0",
-		"eslint": "^9.34.0",
-		"eslint-plugin-vue": "^10.4.0",
-		"globals": "^16.3.0",
+		"dotenv": "^17.2.2",
+		"eslint": "^9.36.0",
+		"eslint-plugin-vue": "^10.5.0",
+		"globals": "^16.4.0",
 		"less": "^4.4.1",
 		"prettier": "^3.6.2",
 		"rollup-plugin-visualizer": "^6.0.3",
-		"sass": "^1.91.0",
-		"terser": "^5.43.1",
+		"sass": "^1.93.1",
+		"terser": "^5.44.0",
 		"typescript": "^5.9.2",
 		"vite-auto-i18n-plugin": "^1.1.9",
-		"vite": "^7.1.3",
+		"vite": "^7.1.7",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-compression2": "^2.2.1",
 		"vite-plugin-vue-setup-extend": "^0.4.0",