😁更新依赖版本及其他细节调整

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -21,20 +21,20 @@
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.1.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.31" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.31" />
-    <PackageReference Include="Furion.Pure" Version="4.8.7.31" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.33" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.33" />
+    <PackageReference Include="Furion.Pure" Version="4.8.7.33" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.3" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.15" />
     <PackageReference Include="NEST" Version="7.17.5" />
-    <PackageReference Include="NewLife.Redis" Version="5.2.2023.301" />
+    <PackageReference Include="NewLife.Redis" Version="5.3.2023.401" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.26.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.16.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.63" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.17.0" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.64" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.2" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarPagedList.cs

@@ -60,7 +60,7 @@ public static class SqlSugarPagedExtensions
     {
         var total = 0;
         var items = entity.ToPageList(pageIndex, pageSize, ref total);
-        var totalPages = pageSize>0?(int)Math.Ceiling(total / (double)pageSize):0;
+        var totalPages = pageSize > 0 ? (int)Math.Ceiling(total / (double)pageSize) : 0;
         return new SqlSugarPagedList<TEntity>
         {
             Page = pageIndex,
@@ -85,7 +85,7 @@ public static class SqlSugarPagedExtensions
     {
         RefAsync<int> total = 0;
         var items = await entity.ToPageListAsync(pageIndex, pageSize, total);
-        var totalPages = pageSize>0?(int)Math.Ceiling(total / (double)pageSize):0;
+        var totalPages = pageSize > 0 ? (int)Math.Ceiling(total / (double)pageSize) : 0;
         return new SqlSugarPagedList<TEntity>
         {
             Page = pageIndex,

Admin.NET/Admin.NET.Web.Core/Handlers/JwtHandler.cs

@@ -5,8 +5,8 @@ using Furion.Authorization;
 using Furion.DataEncryption;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using System.Threading.Tasks;
 
 namespace Admin.NET.Web.Core
 {
@@ -52,23 +52,17 @@ namespace Admin.NET.Web.Core
         /// <returns></returns>
         private static async Task<bool> CheckAuthorzieAsync(DefaultHttpContext httpContext)
         {
-            // 路由/按钮名称
-            var routeName = httpContext.Request.Path.Value[1..].Replace("/", ":");
-
-            string accountType = App.User.FindFirst(ClaimConst.AccountType)?.Value;
-            string superAdmin = ((int)AccountTypeEnum.SuperAdmin).ToString();
-
-            // 只有超管可以操作数据库
-            if (routeName.Contains("sysDatabase") && accountType != superAdmin) return false;
-            
             // 登录模式判断PC、APP
             if (App.User.FindFirst(ClaimConst.LoginMode)?.Value == ((int)LoginModeEnum.APP).ToString())
                 return true;
 
             // 排除超管
-            if (accountType == superAdmin)
+            if (App.User.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString())
                 return true;
 
+            // 路由/按钮名称
+            var routeName = httpContext.Request.Path.Value[1..].Replace("/", ":");
+
             // 获取用户拥有按钮权限集合
             var ownBtnPermList = await App.GetService<SysMenuService>().GetOwnBtnPermList();
             // 获取系统所有按钮权限集合