Ver Fonte

😎1、升级依赖 2、整理代码

zuohuaijun há 1 ano atrás
pai
commit
93dcc51b37

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

@@ -14,14 +14,14 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.1.2" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.448" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.481" />
     <PackageReference Include="AngleSharp" Version="1.2.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.3" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.38" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.38" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.38" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.4" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.39" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.39" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.39" />
 	<PackageReference Include="Hardware.Info" Version="101.0.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -39,14 +39,14 @@
     <PackageReference Include="QRCoder" Version="1.6.0" />
     <PackageReference Include="RabbitMQ.Client" Version="7.1.2" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.4" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.7.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.8.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.11.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.188" />
     <PackageReference Include="SSH.NET" Version="2024.2.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
     <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.1215" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1217" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
@@ -66,9 +66,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.2.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.2.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.4" />
 	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.0" />
   </ItemGroup>
 

+ 3 - 2
Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs

@@ -325,13 +325,14 @@ public class SysRegionService : IDynamicApiController, ITransient
                         Level = 3
                     };
                     if (city.Code.IsNullOrEmpty())
-                    {//省直辖县级行政单位 节点无Code编码处理
+                    {
+                        // 省直辖县级行政单位 节点无Code编码处理
                         city.Code = county.Code.Substring(0, 3).PadRight(6, '0');
                     }
                     list.Add(county);
                 }
             }
-            //按省份同步快速写入提升同步效率,全部一次性写入容易出现从统计局获取数据失败
+            // 按省份同步快速写入提升同步效率,全部一次性写入容易出现从统计局获取数据失败
             await _sysRegionRep.Context.Fastest<SysRegion>().BulkCopyAsync(list);
         }
 

+ 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.38" />
+      <PackageReference Include="Furion.Xunit" Version="4.9.7.39" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
       <PackageReference Include="Selenium.Support" Version="4.31.0" />
       <PackageReference Include="Selenium.WebDriver" Version="4.31.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.3" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.4" />
   </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.13.0" />
-    <PackageReference Include="Rezero.Api" Version="1.8.5" />
+    <PackageReference Include="Rezero.Api" Version="1.8.7" />
   </ItemGroup>
 
   <ItemGroup>

+ 13 - 13
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.04.01",
+	"lastBuildTime": "2025.04.10",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -24,7 +24,7 @@
 		"@vue-office/docx": "^1.6.3",
 		"@vue-office/excel": "^1.7.14",
 		"@vue-office/pdf": "^2.0.10",
-		"@vueuse/core": "^13.0.0",
+		"@vueuse/core": "^13.1.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
@@ -47,7 +47,7 @@
 		"monaco-editor": "^0.52.2",
 		"mqtt": "^5.10.4",
 		"nprogress": "^0.2.0",
-		"pinia": "^3.0.1",
+		"pinia": "^3.0.2",
 		"print-js": "^1.6.0",
 		"push.js": "^1.0.12",
 		"qrcodejs2-fixes": "^0.0.2",
@@ -64,7 +64,7 @@
 		"vue-demi": "^0.14.10",
 		"vue-draggable-plus": "^0.6.0",
 		"vue-grid-layout": "3.0.0-beta1",
-		"vue-i18n": "^11.1.2",
+		"vue-i18n": "^11.1.3",
 		"vue-json-pretty": "^2.4.0",
 		"vue-plugin-hiprint": "^0.0.60",
 		"vue-router": "^4.5.0",
@@ -75,29 +75,29 @@
 	"devDependencies": {
 		"@plugin-web-update-notification/vite": "^2.0.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.13.15",
+		"@types/node": "^22.14.0",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.29.0",
-		"@typescript-eslint/parser": "^8.29.0",
+		"@typescript-eslint/eslint-plugin": "^8.29.1",
+		"@typescript-eslint/parser": "^8.29.1",
 		"@vitejs/plugin-vue": "^5.2.3",
 		"@vitejs/plugin-vue-jsx": "^4.1.2",
 		"@vue/compiler-sfc": "^3.5.13",
 		"code-inspector-plugin": "^0.20.7",
-		"eslint": "^9.23.0",
+		"eslint": "^9.24.0",
 		"eslint-plugin-vue": "^10.0.0",
 		"globals": "^16.0.0",
-		"less": "^4.2.2",
+		"less": "^4.3.0",
 		"prettier": "^3.5.3",
 		"rollup-plugin-visualizer": "^5.14.0",
-		"sass": "^1.86.1",
+		"sass": "^1.86.3",
 		"terser": "^5.39.0",
-		"typescript": "^5.8.2",
-		"vite": "^6.2.4",
+		"typescript": "^5.8.3",
+		"vite": "^6.2.5",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-compression2": "^1.3.3",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
-		"vue-eslint-parser": "^10.1.1"
+		"vue-eslint-parser": "^10.1.3"
 	},
 	"browserslist": [
 		"> 1%",