Sfoglia il codice sorgente

😎1、优化Redis缓存查找方法 2、升级依赖及清理代码

zuohuaijun 5 mesi fa
parent
commit
d74960d70e

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

@@ -14,15 +14,15 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.1" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.809" />
-    <PackageReference Include="AngleSharp" Version="1.3.0" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.874" />
+    <PackageReference Include="AngleSharp" Version="1.3.1" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.10" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.130" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.130" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.130" />
-    <PackageReference Include="Hardware.Info" Version="101.1.0" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.2.1" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.137" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.137" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.137" />
+    <PackageReference Include="Hardware.Info" Version="101.1.0.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" />
@@ -38,17 +38,17 @@
     <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.1.2" />
+    <PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.12.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.15.0" />
-    <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.266" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.205" />
-    <PackageReference Include="SSH.NET" Version="2025.0.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.9" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.16.0" />
+    <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.271" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.207" />
+    <PackageReference Include="SSH.NET" Version="2025.1.0" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.10" />
     <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.1330" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1339" />
     <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" />
@@ -69,8 +69,8 @@
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.10" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.3" />
-    <PackageReference Include="XiHan.Framework.Utils" Version="1.3.5" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
+    <PackageReference Include="XiHan.Framework.Utils" Version="1.4.3" />
   </ItemGroup>
 
 </Project>

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

@@ -53,7 +53,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     {
         return _cacheProvider.Cache == Cache.Default
             ? [.. _cacheProvider.Cache.Keys.Where(u => u.StartsWith(_cacheOptions.Prefix)).Select(u => u[_cacheOptions.Prefix.Length..]).OrderBy(u => u)]
-            : [.. ((FullRedis)_cacheProvider.Cache).Search($"{_cacheOptions.Prefix}*", int.MaxValue).Select(u => u[_cacheOptions.Prefix.Length..]).OrderBy(u => u)];
+            : [.. ((FullRedis)_cacheProvider.Cache).Search($"{_cacheOptions.Prefix}*", 0, int.MaxValue).Select(u => u[_cacheOptions.Prefix.Length..]).OrderBy(u => u)];
     }
 
     /// <summary>
@@ -232,7 +232,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     {
         var delKeys = _cacheProvider.Cache == Cache.Default
             ? _cacheProvider.Cache.Keys.Where(u => u.StartsWith($"{_cacheOptions.Prefix}{prefixKey}")).ToArray()
-            : ((FullRedis)_cacheProvider.Cache).Search($"{_cacheOptions.Prefix}{prefixKey}*", int.MaxValue).ToArray();
+            : ((FullRedis)_cacheProvider.Cache).Search($"{_cacheOptions.Prefix}{prefixKey}*", 0, int.MaxValue).ToArray();
         return _cacheProvider.Cache.Remove(delKeys);
     }
 
@@ -246,7 +246,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     {
         return _cacheProvider.Cache == Cache.Default
             ? _cacheProvider.Cache.Keys.Where(u => u.StartsWith($"{_cacheOptions.Prefix}{prefixKey}")).Select(u => u[_cacheOptions.Prefix.Length..]).ToList()
-            : ((FullRedis)_cacheProvider.Cache).Search($"{_cacheOptions.Prefix}{prefixKey}*", int.MaxValue).Select(u => u[_cacheOptions.Prefix.Length..]).ToList();
+            : ((FullRedis)_cacheProvider.Cache).Search($"{_cacheOptions.Prefix}{prefixKey}*", 0, int.MaxValue).Select(u => u[_cacheOptions.Prefix.Length..]).ToList();
     }
 
     /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -119,7 +119,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         catch (Exception ex)
         {
             _db.AsTenant().RollbackTran();
-            throw ex;
+            throw Oops.Oh(ex);
         }
     }
 

+ 1 - 0
Admin.NET/Admin.NET.Core/Service/LangText/SysLangTextService.cs

@@ -383,6 +383,7 @@ public partial class SysLangTextService : IDynamicApiController, ITransient
     /// <summary>
     /// 生成提示词
     /// </summary>
+    /// <param name="sourceLang"></param>
     /// <param name="targetLang"></param>
     /// <returns></returns>
     private static string BuildSystemPrompt(string sourceLang, string targetLang)

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

@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.7.130" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.7.137" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="Selenium.Support" Version="4.36.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.36.0" />
+    <PackageReference Include="Selenium.Support" Version="4.38.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.38.0" />
     <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="141.0.3537.71" />
     <PackageReference Include="xunit.assert" Version="2.9.3" />
   </ItemGroup>

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

@@ -24,9 +24,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
+    <PackageReference Include="ClosedXML" Version="0.105.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
-    <PackageReference Include="Rezero.Api" Version="1.8.27" />
+    <PackageReference Include="Rezero.Api" Version="1.8.30" />
   </ItemGroup>
 
   <ItemGroup>

+ 34 - 34
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.09.23",
+	"lastBuildTime": "2025.11.08",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -25,26 +25,26 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.2",
-		"@logicflow/core": "^2.1.2",
-		"@logicflow/extension": "^2.1.4",
-		"@logicflow/vue-node-registry": "^1.1.3",
+		"@logicflow/core": "^2.1.3",
+		"@logicflow/extension": "^2.1.5",
+		"@logicflow/vue-node-registry": "^1.1.4",
 		"@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.9.0",
+		"@vueuse/core": "^14.0.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.12.2",
-		"countup.js": "^2.8.2",
+		"axios": "^1.13.2",
+		"countup.js": "^2.9.0",
 		"cropperjs": "^1.6.2",
 		"echarts": "^6.0.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.11.3",
-		"ezuikit-js": "^8.1.15",
+		"element-plus": "^2.11.7",
+		"ezuikit-js": "^8.1.16",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"json-editor-vue": "^0.18.1",
@@ -52,65 +52,65 @@
 		"lodash-es": "^4.17.21",
 		"md-editor-v3": "^6.0.1",
 		"mitt": "^3.0.1",
-		"monaco-editor": "^0.53.0",
+		"monaco-editor": "^0.54.0",
 		"mqtt": "^5.14.1",
 		"nprogress": "^0.2.0",
-		"pinia": "^3.0.3",
+		"pinia": "^3.0.4",
 		"print-js": "^1.6.0",
 		"push.js": "^1.0.12",
 		"qrcodejs2-fixes": "^0.0.2",
 		"qs": "^6.14.0",
 		"relation-graph": "^2.2.11",
 		"screenfull": "^6.0.2",
-		"sm-crypto-v2": "^1.14.0",
+		"sm-crypto-v2": "^1.15.0",
 		"sortablejs": "^1.15.6",
 		"splitpanes": "^4.0.4",
 		"vcrontab-3": "^3.3.22",
 		"vform3-builds": "^3.0.10",
-		"vue": "^3.5.21",
+		"vue": "^3.5.24",
 		"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.12",
-		"vue-json-pretty": "^2.5.0",
+		"vue-json-pretty": "^2.6.0",
 		"vue-plugin-hiprint": "^0.0.60",
-		"vue-router": "^4.5.1",
+		"vue-router": "^4.6.3",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
 		"xlsx-js-style": "^1.2.0"
 	},
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.1",
-		"@eslint/js": "^9.36.0",
-		"@plugin-web-update-notification/vite": "^2.0.1",
+		"@eslint/js": "^9.39.1",
+		"@plugin-web-update-notification/vite": "^2.0.2",
 		"@rollup/pluginutils": "^5.3.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.18.6",
+		"@types/node": "^22.19.0",
 		"@types/nprogress": "^0.2.3",
-		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.44.1",
-		"@typescript-eslint/parser": "^8.44.1",
+		"@types/sortablejs": "^1.15.9",
+		"@typescript-eslint/eslint-plugin": "^8.46.3",
+		"@typescript-eslint/parser": "^8.46.3",
 		"@vitejs/plugin-vue": "^6.0.1",
 		"@vitejs/plugin-vue-jsx": "^5.1.1",
-		"@vue/compiler-sfc": "^3.5.21",
+		"@vue/compiler-sfc": "^3.5.24",
 		"cli-progress": "^3.12.0",
 		"code-inspector-plugin": "^1.2.10",
 		"colors": "^1.4.0",
-		"dotenv": "^17.2.2",
-		"eslint": "^9.36.0",
-		"eslint-plugin-vue": "^10.5.0",
-		"globals": "^16.4.0",
-		"less": "^4.4.1",
+		"dotenv": "^17.2.3",
+		"eslint": "^9.39.1",
+		"eslint-plugin-vue": "^10.5.1",
+		"globals": "^16.5.0",
+		"less": "^4.4.2",
 		"prettier": "^3.6.2",
-		"rollup-plugin-visualizer": "^6.0.3",
-		"sass": "^1.93.1",
-		"terser": "^5.44.0",
-		"typescript": "^5.9.2",
-		"vite": "^7.1.7",
-		"vite-auto-i18n-plugin": "^1.1.9",
+		"rollup-plugin-visualizer": "^6.0.5",
+		"sass": "^1.93.3",
+		"terser": "^5.44.1",
+		"typescript": "^5.9.3",
+		"vite": "^7.2.2",
+		"vite-auto-i18n-plugin": "^1.1.13",
 		"vite-plugin-cdn-import": "^1.0.1",
-		"vite-plugin-compression2": "^2.2.1",
+		"vite-plugin-compression2": "^2.3.1",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
 		"vue-eslint-parser": "^10.2.0"
 	},