😁代码调整

Admin.NET/Admin.NET.Application/Configuration/Cache.json

@@ -7,7 +7,7 @@
     "Redis": {
       "Configuration": "server=127.0.0.1:6379;password=;db=5;", // Redis连接字符串
       "Prefix": "adminnet_", // Redis前缀（目前没用）
-      "MaxMessageSize": "1048576" //最大消息大小 默认1024 * 1024
+      "MaxMessageSize": "1048576" // 最大消息大小 默认1024 * 1024
     }
   },
   "Cluster": { // 集群配置

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

@@ -29,9 +29,9 @@
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.23" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.23" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.23" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.24" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.24" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.24" />
     <PackageReference Include="NEST" Version="7.17.5" />
     <PackageReference Include="NewLife.Redis" Version="5.5.2023.1001" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
@@ -41,7 +41,7 @@
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.23" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.24" />
   </ItemGroup>
 
   <ItemGroup>

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -467,8 +467,9 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             await _db.Deleteable<SysMenu>().Where(u => listIds.Contains(u.Id)).ExecuteCommandAsync();
             await _db.Deleteable<SysRoleMenu>().Where(u => listIds.Contains(u.MenuId)).ExecuteCommandAsync();
         }
+
         var pid1 = (await _db.Insertable(menuType1).ExecuteReturnEntityAsync()).Id;
-        int menuOrder = 101;
+        int menuOrder = 100;
         // 按钮-page
         var menuType2 = new SysMenu
         {
@@ -478,7 +479,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             Permission = className[..1].ToLower() + className[1..] + ":page",
             OrderNo = menuOrder
         };
-        menuOrder += 3;
+        menuOrder += 10;
 
         // 按钮-detail
         var menuType2_1 = new SysMenu
@@ -489,7 +490,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             Permission = className[..1].ToLower() + className[1..] + ":detail",
             OrderNo = menuOrder
         };
-        menuOrder += 3;
+        menuOrder += 10;
 
         // 按钮-add
         var menuType2_2 = new SysMenu
@@ -500,7 +501,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             Permission = className[..1].ToLower() + className[1..] + ":add",
             OrderNo = menuOrder
         };
-        menuOrder += 3;
+        menuOrder += 10;
 
         // 按钮-delete
         var menuType2_3 = new SysMenu
@@ -511,7 +512,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             Permission = className[..1].ToLower() + className[1..] + ":delete",
             OrderNo = menuOrder
         };
-        menuOrder += 3;
+        menuOrder += 10;
 
         // 按钮-edit
         var menuType2_4 = new SysMenu
@@ -522,7 +523,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             Permission = className[..1].ToLower() + className[1..] + ":edit",
             OrderNo = menuOrder
         };
-        menuOrder += 3;
+        menuOrder += 10;
 
         var menuList = new List<SysMenu>() { menuType2, menuType2_1, menuType2_2, menuType2_3, menuType2_4 };
         // 加入fk、Upload、ApiTreeSelect 等接口的权限
@@ -538,7 +539,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
                 Permission = className[..1].ToLower() + className[1..] + ":" + column.FkEntityName + column.ColumnName + "Dropdown",
                 OrderNo = menuOrder
             };
-            menuOrder += 3;
+            menuOrder += 10;
             menuList.Add(menuType);
         }
         var treeSelectTableList = tableFieldList.Where(u => u.EffectType == "ApiTreeSelect").ToList();
@@ -552,7 +553,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
                 Permission = className[..1].ToLower() + className[1..] + ":" + column.FkEntityName + "Tree",
                 OrderNo = menuOrder
             };
-            menuOrder += 3;
+            menuOrder += 10;
             menuList.Add(menuType);
         }
         var uploadTableList = tableFieldList.Where(u => u.EffectType == "Upload").ToList();
@@ -566,7 +567,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
                 Permission = className[..1].ToLower() + className[1..] + ":Upload" + column.ColumnName,
                 OrderNo = menuOrder
             };
-            menuOrder += 3;
+            menuOrder += 10;
             menuList.Add(menuType);
         }
         await _db.Insertable(menuList).ExecuteCommandAsync();

Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -236,8 +236,8 @@ public class SysFileService : IDynamicApiController, ITransient
 
                 case OSSProvider.Minio:
                     // 获取Minio文件的下载或者预览地址
-                    //newFile.Url = await GetMinioPreviewFileUrl(newFile.BucketName, filePath);// 这种方法生成的Url是有7天有效期的，不能这样使用
-                    // 需要在MinIO中的Buckets开通对Anonymous 的readonly权限
+                    // newFile.Url = await GetMinioPreviewFileUrl(newFile.BucketName, filePath);// 这种方法生成的Url是有7天有效期的，不能这样使用
+                    // 需要在MinIO中的Buckets开通对 Anonymous 的readonly权限
                     newFile.Url = $"{(_OSSProviderOptions.IsEnableHttps ? "https" : "http")}://{_OSSProviderOptions.Endpoint}/{newFile.BucketName}/{filePath}";
                     break;
             }