Sfoglia il codice sorgente

增加GlobalUsings模式调整代码

zuohuaijun 4 anni fa
parent
commit
712748fcf3
100 ha cambiato i file con 5257 aggiunte e 5585 eliminazioni
  1. 1 0
      Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
  2. 69 50
      Admin.NET/Admin.NET.Core/Admin.NET.Core.xml
  3. 6 10
      Admin.NET/Admin.NET.Core/Attribute/NotLogAttribute.cs
  4. 6 10
      Admin.NET/Admin.NET.Core/Attribute/NotTableAttribute.cs
  5. 35 39
      Admin.NET/Admin.NET.Core/Attribute/SqlSugarEntityAttribute.cs
  6. 28 33
      Admin.NET/Admin.NET.Core/Attribute/SqlSugarUnitOfWorkAttribute.cs
  7. 23 28
      Admin.NET/Admin.NET.Core/Cache/CSRedisSetup.cs
  8. 44 45
      Admin.NET/Admin.NET.Core/Const/CacheConst.cs
  9. 54 55
      Admin.NET/Admin.NET.Core/Const/ClaimConst.cs
  10. 28 29
      Admin.NET/Admin.NET.Core/Const/CommonConst.cs
  11. 15 19
      Admin.NET/Admin.NET.Core/Const/SqlSugarConst.cs
  12. 54 58
      Admin.NET/Admin.NET.Core/Entity/EntityBase.cs
  13. 70 74
      Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
  14. 134 138
      Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs
  15. 45 49
      Admin.NET/Admin.NET.Core/Entity/SysConfig.cs
  16. 51 56
      Admin.NET/Admin.NET.Core/Entity/SysDataResource.cs
  17. 38 42
      Admin.NET/Admin.NET.Core/Entity/SysDictData.cs
  18. 33 37
      Admin.NET/Admin.NET.Core/Entity/SysDictType.cs
  19. 41 45
      Admin.NET/Admin.NET.Core/Entity/SysFile.cs
  20. 50 55
      Admin.NET/Admin.NET.Core/Entity/SysLogAudit.cs
  21. 54 58
      Admin.NET/Admin.NET.Core/Entity/SysLogEx.cs
  22. 90 94
      Admin.NET/Admin.NET.Core/Entity/SysLogOp.cs
  23. 56 60
      Admin.NET/Admin.NET.Core/Entity/SysLogVis.cs
  24. 89 94
      Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
  25. 43 48
      Admin.NET/Admin.NET.Core/Entity/SysOrg.cs
  26. 33 37
      Admin.NET/Admin.NET.Core/Entity/SysPos.cs
  27. 38 42
      Admin.NET/Admin.NET.Core/Entity/SysRole.cs
  28. 20 23
      Admin.NET/Admin.NET.Core/Entity/SysRoleMenu.cs
  29. 20 23
      Admin.NET/Admin.NET.Core/Entity/SysRoleOrg.cs
  30. 53 57
      Admin.NET/Admin.NET.Core/Entity/SysTenant.cs
  31. 70 75
      Admin.NET/Admin.NET.Core/Entity/SysTimer.cs
  32. 146 151
      Admin.NET/Admin.NET.Core/Entity/SysUser.cs
  33. 35 38
      Admin.NET/Admin.NET.Core/Entity/SysUserExtOrgPos.cs
  34. 20 23
      Admin.NET/Admin.NET.Core/Entity/SysUserOrg.cs
  35. 20 23
      Admin.NET/Admin.NET.Core/Entity/SysUserRole.cs
  36. 147 151
      Admin.NET/Admin.NET.Core/Entity/WechatPay.cs
  37. 118 122
      Admin.NET/Admin.NET.Core/Entity/WechatUser.cs
  38. 13 16
      Admin.NET/Admin.NET.Core/Enum/CacheTypeEnum.cs
  39. 18 21
      Admin.NET/Admin.NET.Core/Enum/CardTypeEnum.cs
  40. 68 71
      Admin.NET/Admin.NET.Core/Enum/DataOpTypeEnum.cs
  41. 28 31
      Admin.NET/Admin.NET.Core/Enum/DataScopeEnum.cs
  42. 472 475
      Admin.NET/Admin.NET.Core/Enum/ErrorCodeEnum.cs
  43. 13 16
      Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs
  44. 18 21
      Admin.NET/Admin.NET.Core/Enum/JobStatusEnum.cs
  45. 28 31
      Admin.NET/Admin.NET.Core/Enum/LoginTypeEnum.cs
  46. 18 21
      Admin.NET/Admin.NET.Core/Enum/MenuTypeEnum.cs
  47. 23 26
      Admin.NET/Admin.NET.Core/Enum/OrgTypeEnum.cs
  48. 24 25
      Admin.NET/Admin.NET.Core/Enum/RequestTypeEnum.cs
  49. 18 21
      Admin.NET/Admin.NET.Core/Enum/RoleTypeEnum.cs
  50. 13 16
      Admin.NET/Admin.NET.Core/Enum/RunModeEnum.cs
  51. 13 16
      Admin.NET/Admin.NET.Core/Enum/StatusEnum.cs
  52. 18 21
      Admin.NET/Admin.NET.Core/Enum/UserTypeEnum.cs
  53. 263 264
      Admin.NET/Admin.NET.Core/Enum/WeChatReturnCodeEnum.cs
  54. 33 36
      Admin.NET/Admin.NET.Core/Enum/WeChatUserTypeEnum.cs
  55. 13 16
      Admin.NET/Admin.NET.Core/Enum/YesNoEnum.cs
  56. 44 50
      Admin.NET/Admin.NET.Core/EventBus/LogEventSubscriber.cs
  57. 12 16
      Admin.NET/Admin.NET.Core/Extension/LogoExtension.cs
  58. 92 103
      Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs
  59. 38 43
      Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs
  60. 27 35
      Admin.NET/Admin.NET.Core/Filter/LogExceptionHandler.cs
  61. 51 66
      Admin.NET/Admin.NET.Core/Filter/RequestActionFilter.cs
  62. 60 67
      Admin.NET/Admin.NET.Core/Filter/SqlSugarUnitOfWorkFilter.cs
  63. 50 0
      Admin.NET/Admin.NET.Core/GlobalUsings.cs
  64. 15 18
      Admin.NET/Admin.NET.Core/Option/CacheOptions.cs
  65. 55 59
      Admin.NET/Admin.NET.Core/Option/ConnectionStringsOptions.cs
  66. 15 18
      Admin.NET/Admin.NET.Core/Option/OSSProviderOptions.cs
  67. 19 22
      Admin.NET/Admin.NET.Core/Option/PayCallBackOptions.cs
  68. 7 10
      Admin.NET/Admin.NET.Core/Option/RefreshTokenOptions.cs
  69. 7 10
      Admin.NET/Admin.NET.Core/Option/SnowIdOptions.cs
  70. 15 19
      Admin.NET/Admin.NET.Core/Option/UploadOptions.cs
  71. 15 18
      Admin.NET/Admin.NET.Core/Option/WechatOptions.cs
  72. 27 30
      Admin.NET/Admin.NET.Core/Option/WechatPayOptions.cs
  73. 14 18
      Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs
  74. 17 21
      Admin.NET/Admin.NET.Core/SeedData/SysDataResourceSeedData.cs
  75. 40 44
      Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
  76. 14 18
      Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
  77. 12 15
      Admin.NET/Admin.NET.Core/SeedData/SysEmpExtOrgPosSeedData.cs
  78. 121 125
      Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs
  79. 25 29
      Admin.NET/Admin.NET.Core/SeedData/SysOrgSeedData.cs
  80. 20 24
      Admin.NET/Admin.NET.Core/SeedData/SysPosSeedData.cs
  81. 39 42
      Admin.NET/Admin.NET.Core/SeedData/SysRoleMenuSeedData.cs
  82. 16 20
      Admin.NET/Admin.NET.Core/SeedData/SysRoleSeedData.cs
  83. 12 16
      Admin.NET/Admin.NET.Core/SeedData/SysTenantSeedData.cs
  84. 13 16
      Admin.NET/Admin.NET.Core/SeedData/SysUserOrgSeedData.cs
  85. 13 16
      Admin.NET/Admin.NET.Core/SeedData/SysUserRoleSeedData.cs
  86. 14 18
      Admin.NET/Admin.NET.Core/SeedData/SysUserSeedData.cs
  87. 150 166
      Admin.NET/Admin.NET.Core/Service/Auth/AuthService.cs
  88. 15 18
      Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginInput.cs
  89. 16 17
      Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginOutput.cs
  90. 48 51
      Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginUserInfoOutput.cs
  91. 16 20
      Admin.NET/Admin.NET.Core/Service/Cache/ISysCacheService.cs
  92. 212 223
      Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs
  93. 110 120
      Admin.NET/Admin.NET.Core/Service/CodeGen/CodeGenConfigService.cs
  94. 363 379
      Admin.NET/Admin.NET.Core/Service/CodeGen/CodeGenService.cs
  95. 151 152
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenConfig.cs
  96. 152 155
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs
  97. 59 60
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
  98. 54 60
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CustomViewEngine.cs
  99. 16 17
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/DatabaseOutput.cs
  100. 5 6
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/SelectOutput.cs

+ 1 - 0
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <NoWarn>1701;1702;1591</NoWarn>
     <DocumentationFile>Admin.NET.Core.xml</DocumentationFile>
+	<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>

+ 69 - 50
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -518,37 +518,37 @@
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Pid">
              <summary>
-             父节点Id 
+             父节点Id
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Name">
              <summary>
-             名称 
+             名称
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Value">
              <summary>
-             值 
+             值
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Code">
              <summary>
-             节点编码 
+             节点编码
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Order">
              <summary>
-             排序 
+             排序
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Remark">
              <summary>
-             备注 
+             备注
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Status">
              <summary>
-             状态:是否启用 
+             状态
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysDataResource.Children">
@@ -2535,7 +2535,7 @@
             <param name="pi"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Extension.RepositoryExtension.FakeDelete``1(SqlSugar.IUpdateable{``0})">
+        <member name="M:Admin.NET.Core.RepositoryExtension.FakeDelete``1(SqlSugar.IUpdateable{``0})">
             <summary>
             实体假删除 _rep.Context.Updateable(entity).FakeDelete().ExecuteCommandAsync();
             </summary>
@@ -2543,6 +2543,16 @@
             <param name="updateable"></param>
             <returns></returns>
         </member>
+        <member name="M:Admin.NET.Core.RepositoryExtension.OrderBuilder``1(SqlSugar.ISugarQueryable{``0},Admin.NET.Core.BasePageInput,System.String,System.Boolean)">
+            <summary>
+            排序方式(默认降序)
+            </summary>
+            <param name="queryable"></param>
+            <param name="pageInput"> </param>
+            <param name="defualtSortField"> 默认排序字段 </param>
+            <param name="descSort"> 是否降序 </param>
+            <returns> </returns>
+        </member>
         <member name="T:Admin.NET.Core.LogExceptionHandler">
             <summary>
             全局异常处理
@@ -2788,34 +2798,34 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="T:Admin.NET.Core.SeedData.SysDataResourceSeedData">
+        <member name="T:Admin.NET.Core.SysDataResourceSeedData">
             <summary>
             系统数据资源种子数据
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.SeedData.SysDataResourceSeedData.HasData">
+        <member name="M:Admin.NET.Core.SysDataResourceSeedData.HasData">
             <summary>
             种子数据
             </summary>
             <returns></returns>
         </member>
-        <member name="T:Admin.NET.Core.SeedData.SysDictDataSeedData">
+        <member name="T:Admin.NET.Core.SysDictDataSeedData">
             <summary>
             系统字典值表种子数据
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.SeedData.SysDictDataSeedData.HasData">
+        <member name="M:Admin.NET.Core.SysDictDataSeedData.HasData">
             <summary>
             种子数据
             </summary>
             <returns></returns>
         </member>
-        <member name="T:Admin.NET.Core.SeedData.SysDictTypeSeedData">
+        <member name="T:Admin.NET.Core.SysDictTypeSeedData">
             <summary>
             系统字典类型表种子数据
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.SeedData.SysDictTypeSeedData.HasData">
+        <member name="M:Admin.NET.Core.SysDictTypeSeedData.HasData">
             <summary>
             种子数据
             </summary>
@@ -3200,90 +3210,90 @@
             <param name="tableColumnOuputList"></param>
             <param name="codeGenerate"></param>
         </member>
-        <member name="T:Admin.NET.Core.Service.CodeGen.CodeGenService">
+        <member name="T:Admin.NET.Core.Service.CodeGenService">
             <summary>
             代码生成器服务
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.QueryCodeGenPageList(Admin.NET.Core.Service.CodeGenInput)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.QueryCodeGenPageList(Admin.NET.Core.Service.CodeGenInput)">
             <summary>
             分页查询
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.AddCodeGen(Admin.NET.Core.Service.AddCodeGenInput)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.AddCodeGen(Admin.NET.Core.Service.AddCodeGenInput)">
             <summary>
             增加
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.DeleteCodeGen(System.Collections.Generic.List{Admin.NET.Core.Service.DeleteCodeGenInput})">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.DeleteCodeGen(System.Collections.Generic.List{Admin.NET.Core.Service.DeleteCodeGenInput})">
             <summary>
             删除
             </summary>
             <param name="inputs"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.UpdateCodeGen(Admin.NET.Core.Service.UpdateCodeGenInput)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.UpdateCodeGen(Admin.NET.Core.Service.UpdateCodeGenInput)">
             <summary>
             更新
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetCodeGen(Admin.NET.Core.Service.QueryCodeGenInput)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetCodeGen(Admin.NET.Core.Service.QueryCodeGenInput)">
             <summary>
             详情
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetDatabaseList">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetDatabaseList">
             <summary>
             获取数据库库集合
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetTableList(System.String)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetTableList(System.String)">
             <summary>
             获取数据库表(实体)集合
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetColumnListByTableName(System.String,System.String)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetColumnListByTableName(System.String,System.String)">
             <summary>
             根据表名获取列
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetColumnList(Admin.NET.Core.Service.AddCodeGenInput)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetColumnList(Admin.NET.Core.Service.AddCodeGenInput)">
             <summary>
             获取数据表列(实体属性)集合
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.RunLocal(Admin.NET.Core.SysCodeGen)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.RunLocal(Admin.NET.Core.SysCodeGen)">
             <summary>
             代码生成_本地项目
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetJoinTableStr(System.Collections.Generic.List{Admin.NET.Core.Service.CodeGenConfig})">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetJoinTableStr(System.Collections.Generic.List{Admin.NET.Core.Service.CodeGenConfig})">
             <summary>
             获取连表的实体名和别名
             </summary>
             <param name="configs"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetTemplatePathList">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetTemplatePathList">
             <summary>
             获取模板文件路径集合
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.CodeGen.CodeGenService.GetTargetPathList(Admin.NET.Core.SysCodeGen)">
+        <member name="M:Admin.NET.Core.Service.CodeGenService.GetTargetPathList(Admin.NET.Core.SysCodeGen)">
             <summary>
             设置生成文件路径
             </summary>
@@ -3959,79 +3969,79 @@
              </summary>
              <example>Magic.Application</example>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.DataResourceInput.Pid">
+        <member name="P:Admin.NET.Core.Service.DataResourceInput.Pid">
             <summary>
             父Id
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.DataResourceInput.Name">
+        <member name="P:Admin.NET.Core.Service.DataResourceInput.Name">
             <summary>
             名称
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.DataResourceInput.Value">
+        <member name="P:Admin.NET.Core.Service.DataResourceInput.Value">
              <summary>
-             值 
+             值
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.DataResourceInput.Code">
+        <member name="P:Admin.NET.Core.Service.DataResourceInput.Code">
             <summary>
             编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.DataResourceInput.Order">
+        <member name="P:Admin.NET.Core.Service.DataResourceInput.Order">
             <summary>
             排序
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.DataResourceInput.Remark">
+        <member name="P:Admin.NET.Core.Service.DataResourceInput.Remark">
             <summary>
             备注
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.DataResourceInput.Status">
+        <member name="P:Admin.NET.Core.Service.DataResourceInput.Status">
             <summary>
             状态
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DataResources.Dto.AddDataResourceInput.Name">
+        <member name="P:Admin.NET.Core.Service.AddDataResourceInput.Name">
             <summary>
             名称
             </summary>
         </member>
-        <member name="T:Admin.NET.Core.Service.DataResource.SysDataResourceService">
+        <member name="T:Admin.NET.Core.Service.SysDataResourceService">
             <summary>
             系统数据资源服务
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataResource.SysDataResourceService.GetDataResourceList(Admin.NET.Core.Service.DataResources.Dto.DataResourceInput)">
+        <member name="M:Admin.NET.Core.Service.SysDataResourceService.GetDataResourceList(Admin.NET.Core.Service.DataResourceInput)">
             <summary>
             获取数据资源列表
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataResource.SysDataResourceService.AddDataResource(Admin.NET.Core.Service.DataResources.Dto.AddDataResourceInput)">
+        <member name="M:Admin.NET.Core.Service.SysDataResourceService.AddDataResource(Admin.NET.Core.Service.AddDataResourceInput)">
             <summary>
             增加数据资源
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataResource.SysDataResourceService.UpdateDataResource(Admin.NET.Core.Service.DataResources.Dto.UpdateDataResourceInput)">
+        <member name="M:Admin.NET.Core.Service.SysDataResourceService.UpdateDataResource(Admin.NET.Core.Service.UpdateDataResourceInput)">
             <summary>
             更新数据资源
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataResource.SysDataResourceService.DeleteDataResource(Admin.NET.Core.Service.DataResources.Dto.DeleteDataResourceInput)">
+        <member name="M:Admin.NET.Core.Service.SysDataResourceService.DeleteDataResource(Admin.NET.Core.Service.DeleteDataResourceInput)">
             <summary>
             删除数据资源
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataResource.SysDataResourceService.GetChildIdListWithSelfById(System.Int64)">
+        <member name="M:Admin.NET.Core.Service.SysDataResourceService.GetChildIdListWithSelfById(System.Int64)">
             <summary>
             根据节点Id获取子节点Id集合(包含自己)
             </summary>
@@ -4944,11 +4954,6 @@
             编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.PageRoleInput.Order">
-            <summary>
-            排序
-            </summary>
-        </member>
         <member name="P:Admin.NET.Core.Service.PageRoleInput.DataScope">
             <summary>
             数据范围类型
@@ -5305,11 +5310,10 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysTenantService.GetTenantList(Admin.NET.Core.Service.TenantInput)">
+        <member name="M:Admin.NET.Core.Service.SysTenantService.GetTenantList">
             <summary>
             获取租户列表
             </summary>
-            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.SysTenantService.GrantMenu(Admin.NET.Core.Service.RoleMenuInput)">
@@ -6296,6 +6300,21 @@
             页码容量
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.BasePageInput.Field">
+            <summary>
+            排序字段
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.BasePageInput.Order">
+            <summary>
+            排序方向
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.BasePageInput.DescStr">
+            <summary>
+            降序排序
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.Util.CodeGenUtil">
             <summary>
             代码生成帮助类

+ 6 - 10
Admin.NET/Admin.NET.Core/Attribute/NotLogAttribute.cs

@@ -1,13 +1,9 @@
-using Furion.DependencyInjection;
-using System;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 禁用日志特性
+/// </summary>
+[SuppressSniffer, AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property)]
+public class NotLogAttribute : Attribute
 {
-    /// <summary>
-    /// 禁用日志特性
-    /// </summary>
-    [SuppressSniffer, AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property)]
-    public class NotLogAttribute : Attribute
-    {
-    }
 }

+ 6 - 10
Admin.NET/Admin.NET.Core/Attribute/NotTableAttribute.cs

@@ -1,13 +1,9 @@
-using Furion.DependencyInjection;
-using System;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 非实体表特性
+/// </summary>
+[SuppressSniffer, AttributeUsage(AttributeTargets.Class)]
+public class NotTableAttribute : Attribute
 {
-    /// <summary>
-    /// 非实体表特性
-    /// </summary>
-    [SuppressSniffer, AttributeUsage(AttributeTargets.Class)]
-    public class NotTableAttribute : Attribute
-    {
-    }
 }

+ 35 - 39
Admin.NET/Admin.NET.Core/Attribute/SqlSugarEntityAttribute.cs

@@ -1,49 +1,45 @@
-using Furion.DependencyInjection;
-using System;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// SqlSugar实体配置特性
+/// </summary>
+[SuppressSniffer, AttributeUsage(AttributeTargets.Class)]
+public class SqlSugarEntityAttribute : Attribute
 {
     /// <summary>
-    /// SqlSugar实体配置特性
+    /// 数据库上下文标识
     /// </summary>
-    [SuppressSniffer, AttributeUsage(AttributeTargets.Class)]
-    public class SqlSugarEntityAttribute : Attribute
-    {
-        /// <summary>
-        /// 数据库上下文标识
-        /// </summary>
-        public string DbConfigId { get; set; } = SqlSugarConst.ConfigId;
+    public string DbConfigId { get; set; } = SqlSugarConst.ConfigId;
 
-        /// <summary>
-        /// 实体顺序
-        /// </summary>
-        public int Order { get; set; }
+    /// <summary>
+    /// 实体顺序
+    /// </summary>
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 默认配置
-        /// </summary>
-        public SqlSugarEntityAttribute()
-        {
-        }
+    /// <summary>
+    /// 默认配置
+    /// </summary>
+    public SqlSugarEntityAttribute()
+    {
+    }
 
-        /// <summary>
-        /// 配置实体排序
-        /// </summary>
-        /// <param name="order"></param>
-        public SqlSugarEntityAttribute(int order)
-        {
-            Order = order;
-        }
+    /// <summary>
+    /// 配置实体排序
+    /// </summary>
+    /// <param name="order"></param>
+    public SqlSugarEntityAttribute(int order)
+    {
+        Order = order;
+    }
 
-        /// <summary>
-        /// 配置数据库标识和实体排序
-        /// </summary>
-        /// <param name="order"></param>
-        /// <param name="dbConfigId"></param>
-        public SqlSugarEntityAttribute(int order, string dbConfigId)
-        {
-            Order = order;
-            DbConfigId = dbConfigId;
-        }
+    /// <summary>
+    /// 配置数据库标识和实体排序
+    /// </summary>
+    /// <param name="order"></param>
+    /// <param name="dbConfigId"></param>
+    public SqlSugarEntityAttribute(int order, string dbConfigId)
+    {
+        Order = order;
+        DbConfigId = dbConfigId;
     }
 }

+ 28 - 33
Admin.NET/Admin.NET.Core/Attribute/SqlSugarUnitOfWorkAttribute.cs

@@ -1,41 +1,36 @@
-using Furion.DependencyInjection;
-using System;
-using System.Data;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// SqlSugar工作单元配置特性
+/// </summary>
+[SuppressSniffer, AttributeUsage(AttributeTargets.Method, Inherited = true)]
+public class SqlSugarUnitOfWorkAttribute : Attribute
 {
     /// <summary>
-    /// SqlSugar工作单元配置特性
+    /// 构造函数
     /// </summary>
-    [SuppressSniffer, AttributeUsage(AttributeTargets.Method, Inherited = true)]
-    public class SqlSugarUnitOfWorkAttribute : Attribute
+    public SqlSugarUnitOfWorkAttribute()
     {
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        public SqlSugarUnitOfWorkAttribute()
-        {
-        }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <remarks>
-        /// <para>支持传入事务隔离级别 <see cref="IsolationLevel"/> 参数值</para>
-        /// </remarks>
-        /// <param name="isolationLevel">事务隔离级别</param>
-        public SqlSugarUnitOfWorkAttribute(IsolationLevel isolationLevel)
-        {
-            IsolationLevel = isolationLevel;
-        }
+    }
 
-        /// <summary>
-        /// 事务隔离级别
-        /// </summary>
-        /// <remarks>
-        /// <para>默认:<see cref="IsolationLevel.ReadCommitted"/>,参见:<see cref="IsolationLevel"/></para>
-        /// <para>说明:当事务A更新某条数据的时候,不容许其他事务来更新该数据,但可以进行读取操作</para>
-        /// </remarks>
-        public IsolationLevel IsolationLevel { get; set; } = IsolationLevel.ReadCommitted;
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    /// <remarks>
+    /// <para>支持传入事务隔离级别 <see cref="IsolationLevel"/> 参数值</para>
+    /// </remarks>
+    /// <param name="isolationLevel">事务隔离级别</param>
+    public SqlSugarUnitOfWorkAttribute(IsolationLevel isolationLevel)
+    {
+        IsolationLevel = isolationLevel;
     }
+
+    /// <summary>
+    /// 事务隔离级别
+    /// </summary>
+    /// <remarks>
+    /// <para>默认:<see cref="IsolationLevel.ReadCommitted"/>,参见:<see cref="IsolationLevel"/></para>
+    /// <para>说明:当事务A更新某条数据的时候,不容许其他事务来更新该数据,但可以进行读取操作</para>
+    /// </remarks>
+    public IsolationLevel IsolationLevel { get; set; } = IsolationLevel.ReadCommitted;
 }

+ 23 - 28
Admin.NET/Admin.NET.Core/Cache/CSRedisSetup.cs

@@ -1,39 +1,34 @@
 using CSRedis;
-using Furion;
-using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Caching.Redis;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+public static class CSRedisSetup
 {
-    public static class CSRedisSetup
+    /// <summary>
+    /// CSRedis初始化
+    /// </summary>
+    /// <param name="services"></param>
+    public static void AddCSRedisSetup(this IServiceCollection services)
     {
-        /// <summary>
-        /// CSRedis初始化
-        /// </summary>
-        /// <param name="services"></param>
-        public static void AddCSRedisSetup(this IServiceCollection services)
+        services.AddSingleton<IDistributedCache>(provider =>
         {
-            services.AddSingleton<IDistributedCache>(provider =>
+            var cacheOptions = App.GetOptions<CacheOptions>();
+            if (cacheOptions.CacheType == CacheTypeEnum.RedisCache.ToString())
             {
-                var cacheOptions = App.GetOptions<CacheOptions>();
-                if (cacheOptions.CacheType == CacheTypeEnum.RedisCache.ToString())
-                {
-                    var redisStr = $"{cacheOptions.RedisConnectionString},prefix={cacheOptions.InstanceName}";
+                var redisStr = $"{cacheOptions.RedisConnectionString},prefix={cacheOptions.InstanceName}";
 
-                    var redis = new CSRedisClient(redisStr);
-                    RedisHelper.Initialization(redis);
-                    return new CSRedisCache(redis);
-                }
-                else // 默认使用内存
-                {
-                    services.AddDistributedMemoryCache();
-                    IOptions<MemoryDistributedCacheOptions> options = provider.GetService<IOptions<MemoryDistributedCacheOptions>>();
-                    return new MemoryDistributedCache(options);
-                }
-            });
-        }
+                var redis = new CSRedisClient(redisStr);
+                RedisHelper.Initialization(redis);
+                return new CSRedisCache(redis);
+            }
+            else // 默认使用内存
+            {
+                services.AddDistributedMemoryCache();
+                IOptions<MemoryDistributedCacheOptions> options = provider.GetService<IOptions<MemoryDistributedCacheOptions>>();
+                return new MemoryDistributedCache(options);
+            }
+        });
     }
 }

+ 44 - 45
Admin.NET/Admin.NET.Core/Const/CacheConst.cs

@@ -1,48 +1,47 @@
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 缓存相关常量
+/// </summary>
+public class CacheConst
 {
     /// <summary>
-    /// 缓存相关常量
-    /// </summary>
-    public class CacheConst
-    {
-        /// <summary>
-        /// 用户缓存
-        /// </summary>
-        public const string KeyUser = "user_";
-
-        /// <summary>
-        /// 菜单缓存
-        /// </summary>
-        public const string KeyMenu = "menu_";
-
-        /// <summary>
-        /// 权限缓存
-        /// </summary>
-        public const string KeyPermission = "permission_";
-
-        /// <summary>
-        /// 机构Id集合缓存
-        /// </summary>
-        public const string KeyOrgIdList = "org_";
-
-        /// <summary>
-        /// 验证码缓存
-        /// </summary>
-        public const string KeyVerCode = "verCode_";
-
-        /// <summary>
-        /// 所有缓存关键字集合
-        /// </summary>
-        public const string KeyAll = "keys";
-
-        /// <summary>
-        /// 定时任务缓存
-        /// </summary>
-        public const string KeyTimer = "timer";
-
-        /// <summary>
-        /// 在线用户缓存
-        /// </summary>
-        public const string KeyOnlineUser = "onlineuser";
-    }
+    /// 用户缓存
+    /// </summary>
+    public const string KeyUser = "user_";
+
+    /// <summary>
+    /// 菜单缓存
+    /// </summary>
+    public const string KeyMenu = "menu_";
+
+    /// <summary>
+    /// 权限缓存
+    /// </summary>
+    public const string KeyPermission = "permission_";
+
+    /// <summary>
+    /// 机构Id集合缓存
+    /// </summary>
+    public const string KeyOrgIdList = "org_";
+
+    /// <summary>
+    /// 验证码缓存
+    /// </summary>
+    public const string KeyVerCode = "verCode_";
+
+    /// <summary>
+    /// 所有缓存关键字集合
+    /// </summary>
+    public const string KeyAll = "keys";
+
+    /// <summary>
+    /// 定时任务缓存
+    /// </summary>
+    public const string KeyTimer = "timer";
+
+    /// <summary>
+    /// 在线用户缓存
+    /// </summary>
+    public const string KeyOnlineUser = "onlineuser";
 }

+ 54 - 55
Admin.NET/Admin.NET.Core/Const/ClaimConst.cs

@@ -1,58 +1,57 @@
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// Claim相关常量
+/// </summary>
+public class ClaimConst
 {
     /// <summary>
-    /// Claim相关常量
-    /// </summary>
-    public class ClaimConst
-    {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        public const string UserId = "UserId";
-
-        /// <summary>
-        /// 账号
-        /// </summary>
-        public const string UserName = "UserName";
-
-        /// <summary>
-        /// 真实姓名
-        /// </summary>
-        public const string RealName = "RealName";
-
-        /// <summary>
-        /// 是否超级管理
-        /// </summary>
-        public const string SuperAdmin = "SuperAdmin";
-
-        /// <summary>
-        /// 租户Id
-        /// </summary>
-        public const string TenantId = "TenantId";
-
-        /// <summary>
-        /// 组织机构Id
-        /// </summary>
-        public const string OrgId = "OrgId";
-
-        /// <summary>
-        /// 组织机构名称
-        /// </summary>
-        public const string OrgName = "OrgName";
-
-        /// <summary>
-        /// 微信OpenId
-        /// </summary>
-        public const string OpenId = "OpenId";
-
-        /// <summary>
-        /// 昵称
-        /// </summary>
-        public const string NickName = "NickName";
-
-        /// <summary>
-        /// 运行模式(账号和三方授权)
-        /// </summary>
-        public const string RunMode = "RunMode";
-    }
+    /// 用户Id
+    /// </summary>
+    public const string UserId = "UserId";
+
+    /// <summary>
+    /// 账号
+    /// </summary>
+    public const string UserName = "UserName";
+
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    public const string RealName = "RealName";
+
+    /// <summary>
+    /// 是否超级管理
+    /// </summary>
+    public const string SuperAdmin = "SuperAdmin";
+
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    public const string TenantId = "TenantId";
+
+    /// <summary>
+    /// 组织机构Id
+    /// </summary>
+    public const string OrgId = "OrgId";
+
+    /// <summary>
+    /// 组织机构名称
+    /// </summary>
+    public const string OrgName = "OrgName";
+
+    /// <summary>
+    /// 微信OpenId
+    /// </summary>
+    public const string OpenId = "OpenId";
+
+    /// <summary>
+    /// 昵称
+    /// </summary>
+    public const string NickName = "NickName";
+
+    /// <summary>
+    /// 运行模式(账号和三方授权)
+    /// </summary>
+    public const string RunMode = "RunMode";
 }

+ 28 - 29
Admin.NET/Admin.NET.Core/Const/CommonConst.cs

@@ -1,38 +1,37 @@
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 通用常量
+/// </summary>
+public class CommonConst
 {
     /// <summary>
-    /// 通用常量
+    /// 默认密码
     /// </summary>
-    public class CommonConst
-    {
-        /// <summary>
-        /// 默认密码
-        /// </summary>
-        public const string SysPassword = "123456";
+    public const string SysPassword = "123456";
 
-        /// <summary>
-        /// 系统管理员角色编码
-        /// </summary>
-        public const string SysAdminRoleCode = "SysAdminRoleCode";
+    /// <summary>
+    /// 系统管理员角色编码
+    /// </summary>
+    public const string SysAdminRoleCode = "SysAdminRoleCode";
 
-        /// <summary>
-        /// 演示环境开关配置
-        /// </summary>
-        public const string SysDemoEnv = "SysDemoEnv";
+    /// <summary>
+    /// 演示环境开关配置
+    /// </summary>
+    public const string SysDemoEnv = "SysDemoEnv";
 
-        /// <summary>
-        /// 验证码开关配置
-        /// </summary>
-        public const string SysCaptchaFlag = "SysCaptchaFlag";
+    /// <summary>
+    /// 验证码开关配置
+    /// </summary>
+    public const string SysCaptchaFlag = "SysCaptchaFlag";
 
-        /// <summary>
-        /// 开启操作日志配置
-        /// </summary>
-        public const string SysOpLogFlag = "SysOpLog";
+    /// <summary>
+    /// 开启操作日志配置
+    /// </summary>
+    public const string SysOpLogFlag = "SysOpLog";
 
-        /// <summary>
-        /// 实体所在程序集-代码生成
-        /// </summary>
-        public static string[] EntityAssemblyName = new string[] { "Admin.NET.Core", "Admin.NET.Application" };
-    }
+    /// <summary>
+    /// 实体所在程序集-代码生成
+    /// </summary>
+    public static string[] EntityAssemblyName = new string[] { "Admin.NET.Core", "Admin.NET.Application" };
 }

+ 15 - 19
Admin.NET/Admin.NET.Core/Const/SqlSugarConst.cs

@@ -1,26 +1,22 @@
-using SqlSugar;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// SqlSugar相关常量
+/// </summary>
+public class SqlSugarConst
 {
     /// <summary>
-    /// SqlSugar相关常量
+    /// 默认数据库标识
     /// </summary>
-    public class SqlSugarConst
-    {
-        /// <summary>
-        /// 默认数据库标识
-        /// </summary>
-        public const string ConfigId = "Dilon";
+    public const string ConfigId = "Dilon";
 
-        /// <summary>
-        /// 默认表主键
-        /// </summary>
-        public const string PrimaryKey = "Id";
+    /// <summary>
+    /// 默认表主键
+    /// </summary>
+    public const string PrimaryKey = "Id";
 
-        /// <summary>
-        /// SqlSugar数据库链接集合(多库代码生成用)
-        /// </summary>
-        public static List<ConnectionConfig> ConnectionConfigs = new List<ConnectionConfig>();
-    }
+    /// <summary>
+    /// SqlSugar数据库链接集合(多库代码生成用)
+    /// </summary>
+    public static List<ConnectionConfig> ConnectionConfigs = new();
 }

+ 54 - 58
Admin.NET/Admin.NET.Core/Entity/EntityBase.cs

@@ -1,76 +1,72 @@
-using SqlSugar;
-using System;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 框架实体基类Id
+/// </summary>
+public abstract class EntityBaseId
 {
     /// <summary>
-    /// 框架实体基类Id
+    /// 雪花Id
     /// </summary>
-    public abstract class EntityBaseId
-    {
-        /// <summary>
-        /// 雪花Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "Id", IsPrimaryKey = true, IsIdentity = false)]
-        public virtual long Id { get; set; }
-    }
+    [SugarColumn(ColumnDescription = "Id", IsPrimaryKey = true, IsIdentity = false)]
+    public virtual long Id { get; set; }
+}
 
+/// <summary>
+/// 框架实体基类
+/// </summary>
+public abstract class EntityBase : EntityBaseId
+{
     /// <summary>
-    /// 框架实体基类
+    /// 创建时间
     /// </summary>
-    public abstract class EntityBase : EntityBaseId
-    {
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "创建时间")]
-        public virtual DateTime? CreateTime { get; set; }
+    [SugarColumn(ColumnDescription = "创建时间")]
+    public virtual DateTime? CreateTime { get; set; }
 
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "更新时间")]
-        public virtual DateTime? UpdateTime { get; set; }
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "更新时间")]
+    public virtual DateTime? UpdateTime { get; set; }
 
-        /// <summary>
-        /// 创建者Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "创建者Id")]
-        public virtual long? CreateUserId { get; set; }
+    /// <summary>
+    /// 创建者Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建者Id")]
+    public virtual long? CreateUserId { get; set; }
 
-        /// <summary>
-        /// 修改者Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "修改者Id")]
-        public virtual long? UpdateUserId { get; set; }
+    /// <summary>
+    /// 修改者Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "修改者Id")]
+    public virtual long? UpdateUserId { get; set; }
 
-        /// <summary>
-        /// 软删除
-        /// </summary>
-        [SugarColumn(ColumnDescription = "软删除")]
-        public virtual bool IsDelete { get; set; } = false;
-    }
+    /// <summary>
+    /// 软删除
+    /// </summary>
+    [SugarColumn(ColumnDescription = "软删除")]
+    public virtual bool IsDelete { get; set; } = false;
+}
 
+/// <summary>
+/// 业务数据实体基类(数据权限)
+/// </summary>
+public abstract class DataEntityBase : EntityBase
+{
     /// <summary>
-    /// 业务数据实体基类(数据权限)
+    /// 创建者部门Id
     /// </summary>
-    public abstract class DataEntityBase : EntityBase
-    {
-        /// <summary>
-        /// 创建者部门Id
-        /// </summary>
-        public virtual long? CreateOrgId { get; set; }
-    }
+    public virtual long? CreateOrgId { get; set; }
+}
 
+/// <summary>
+/// 租户基类实体
+/// </summary>
+public abstract class EntityTenant : EntityBase
+{
     /// <summary>
-    /// 租户基类实体
+    /// 租户Id
     /// </summary>
-    public abstract class EntityTenant : EntityBase
-    {
-        /// <summary>
-        /// 租户Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "租户Id")]
-        public virtual long? TenantId { get; set; }
-    }
+    [SugarColumn(ColumnDescription = "租户Id")]
+    public virtual long? TenantId { get; set; }
 }

+ 70 - 74
Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs

@@ -1,89 +1,85 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 代码生成表
+/// </summary>
+[SugarTable("sys_code_gen", "代码生成表")]
+[SqlSugarEntity]
+public class SysCodeGen : EntityBase
 {
     /// <summary>
-    /// 代码生成表
+    /// 作者姓名
     /// </summary>
-    [SugarTable("sys_code_gen", "代码生成表")]
-    [SqlSugarEntity]
-    public class SysCodeGen : EntityBase
-    {
-        /// <summary>
-        /// 作者姓名
-        /// </summary>
-        [MaxLength(20)]
-        [SugarColumn(ColumnDescription = "作者姓名")]
-        public string AuthorName { get; set; }
+    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "作者姓名")]
+    public string AuthorName { get; set; }
 
-        /// <summary>
-        /// 是否移除表前缀
-        /// </summary>
-        [MaxLength(5)]
-        [SugarColumn(ColumnDescription = "是否移除表前缀")]
-        public string TablePrefix { get; set; }
+    /// <summary>
+    /// 是否移除表前缀
+    /// </summary>
+    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "是否移除表前缀")]
+    public string TablePrefix { get; set; }
 
-        /// <summary>
-        /// 生成方式
-        /// </summary>
-        [MaxLength(20)]
-        [SugarColumn(ColumnDescription = "生成方式")]
-        public string GenerateType { get; set; }
+    /// <summary>
+    /// 生成方式
+    /// </summary>
+    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "生成方式")]
+    public string GenerateType { get; set; }
 
-        /// <summary>
-        /// 库定位器名
-        /// </summary>
-        [MaxLength(50)]
-        [SugarColumn(ColumnDescription = "库定位器名")]
-        public string DbConfigId { get; set; }
+    /// <summary>
+    /// 库定位器名
+    /// </summary>
+    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "库定位器名")]
+    public string DbConfigId { get; set; }
 
-        /// <summary>
-        /// 数据库名(保留字段)
-        /// </summary>
-        [MaxLength(50)]
-        [SugarColumn(ColumnDescription = "数据库库名")]
-        public string DbName { get; set; }
+    /// <summary>
+    /// 数据库名(保留字段)
+    /// </summary>
+    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "数据库库名")]
+    public string DbName { get; set; }
 
-        /// <summary>
-        /// 数据库类型
-        /// </summary>
-        [MaxLength(50)]
-        [SugarColumn(ColumnDescription = "数据库类型")]
-        public string DbType { get; set; }
+    /// <summary>
+    /// 数据库类型
+    /// </summary>
+    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "数据库类型")]
+    public string DbType { get; set; }
 
-        /// <summary>
-        /// 数据库链接
-        /// </summary>
-        [MaxLength(200)]
-        [SugarColumn(ColumnDescription = "数据库链接")]
-        public string ConnectionString { get; set; }
+    /// <summary>
+    /// 数据库链接
+    /// </summary>
+    [MaxLength(200)]
+    [SugarColumn(ColumnDescription = "数据库链接")]
+    public string ConnectionString { get; set; }
 
-        /// <summary>
-        /// 数据库表名
-        /// </summary>
-        [MaxLength(100)]
-        [SugarColumn(ColumnDescription = "数据库表名")]
-        public string TableName { get; set; }
+    /// <summary>
+    /// 数据库表名
+    /// </summary>
+    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "数据库表名")]
+    public string TableName { get; set; }
 
-        /// <summary>
-        /// 命名空间
-        /// </summary>
-        [MaxLength(100)]
-        [SugarColumn(ColumnDescription = "命名空间")]
-        public string NameSpace { get; set; }
+    /// <summary>
+    /// 命名空间
+    /// </summary>
+    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "命名空间")]
+    public string NameSpace { get; set; }
 
-        /// <summary>
-        /// 业务名
-        /// </summary>
-        [MaxLength(100)]
-        [SugarColumn(ColumnDescription = "业务名")]
-        public string BusName { get; set; }
+    /// <summary>
+    /// 业务名
+    /// </summary>
+    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "业务名")]
+    public string BusName { get; set; }
 
-        /// <summary>
-        /// 菜单编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "菜单编码")]
-        public long MenuPid { get; set; }
-    }
+    /// <summary>
+    /// 菜单编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "菜单编码")]
+    public long MenuPid { get; set; }
 }

+ 134 - 138
Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs

@@ -1,141 +1,137 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
-
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 代码生成字段配置表
+/// </summary>
+[SugarTable("sys_code_gen_config", "代码生成字段配置表")]
+[SqlSugarEntity]
+public class SysCodeGenConfig : EntityBase
 {
     /// <summary>
-    /// 代码生成字段配置表
-    /// </summary>
-    [SugarTable("sys_code_gen_config", "代码生成字段配置表")]
-    [SqlSugarEntity]
-    public class SysCodeGenConfig : EntityBase
-    {
-        /// <summary>
-        /// 代码生成主表ID
-        /// </summary>
-        public long CodeGenId { get; set; }
-
-        /// <summary>
-        /// 数据库字段名
-        /// </summary>
-        [Required, MaxLength(100)]
-        public string ColumnName { get; set; }
-
-        /// <summary>
-        /// 字段描述
-        /// </summary>
-        [MaxLength(100)]
-        public string ColumnComment { get; set; }
-
-        /// <summary>
-        /// .NET数据类型
-        /// </summary>
-        [MaxLength(50)]
-        public string NetType { get; set; }
-
-        /// <summary>
-        /// 作用类型(字典)
-        /// </summary>
-        [MaxLength(50)]
-        public string EffectType { get; set; }
-
-        /// <summary>
-        /// 外键实体名称
-        /// </summary>
-        [MaxLength(50)]
-        public string FkEntityName { get; set; }
-
-        /// <summary>
-        /// 外键表名称
-        /// </summary>
-        [MaxLength(100)]
-        public string FkTableName { get; set; }
-
-        /// <summary>
-        /// 外键显示字段
-        /// </summary>
-        [MaxLength(50)]
-        public string FkColumnName { get; set; }
-
-        /// <summary>
-        /// 外键显示字段.NET类型
-        /// </summary>
-        [MaxLength(50)]
-        public string FkColumnNetType { get; set; }
-
-        /// <summary>
-        /// 字典code
-        /// </summary>
-        [MaxLength(50)]
-        public string DictTypeCode { get; set; }
-
-        /// <summary>
-        /// 列表是否缩进(字典)
-        /// </summary>
-        [MaxLength(5)]
-        public string WhetherRetract { get; set; }
-
-        /// <summary>
-        /// 是否必填(字典)
-        /// </summary>
-        [MaxLength(5)]
-        public string WhetherRequired { get; set; }
-
-        /// <summary>
-        /// 是否是查询条件
-        /// </summary>
-        [MaxLength(5)]
-        public string QueryWhether { get; set; }
-
-        /// <summary>
-        /// 查询方式
-        /// </summary>
-        [MaxLength(10)]
-        public string QueryType { get; set; }
-
-        /// <summary>
-        /// 列表显示
-        /// </summary>
-        [MaxLength(5)]
-        public string WhetherTable { get; set; }
-
-        /// <summary>
-        /// 增改
-        /// </summary>
-        [MaxLength(5)]
-        public string WhetherAddUpdate { get; set; }
-
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [MaxLength(5)]
-        public string ColumnKey { get; set; }
-
-        /// <summary>
-        /// 数据库中类型(物理类型)
-        /// </summary>
-        [MaxLength(50)]
-        public string DataType { get; set; }
-
-        /// <summary>
-        /// 是否通用字段
-        /// </summary>
-        [MaxLength(5)]
-        public string WhetherCommon { get; set; }
-
-        /// <summary>
-        /// 显示文本字段
-        /// </summary>
-        public string DisplayColumn { get; set; }
-
-        /// <summary>
-        /// 选中值字段
-        /// </summary>
-        public string ValueColumn { get; set; }
-
-        /// <summary>
-        /// 父级字段
-        /// </summary>
-        public string PidColumn { get; set; }
-    }
+    /// 代码生成主表ID
+    /// </summary>
+    public long CodeGenId { get; set; }
+
+    /// <summary>
+    /// 数据库字段名
+    /// </summary>
+    [Required, MaxLength(100)]
+    public string ColumnName { get; set; }
+
+    /// <summary>
+    /// 字段描述
+    /// </summary>
+    [MaxLength(100)]
+    public string ColumnComment { get; set; }
+
+    /// <summary>
+    /// .NET数据类型
+    /// </summary>
+    [MaxLength(50)]
+    public string NetType { get; set; }
+
+    /// <summary>
+    /// 作用类型(字典)
+    /// </summary>
+    [MaxLength(50)]
+    public string EffectType { get; set; }
+
+    /// <summary>
+    /// 外键实体名称
+    /// </summary>
+    [MaxLength(50)]
+    public string FkEntityName { get; set; }
+
+    /// <summary>
+    /// 外键表名称
+    /// </summary>
+    [MaxLength(100)]
+    public string FkTableName { get; set; }
+
+    /// <summary>
+    /// 外键显示字段
+    /// </summary>
+    [MaxLength(50)]
+    public string FkColumnName { get; set; }
+
+    /// <summary>
+    /// 外键显示字段.NET类型
+    /// </summary>
+    [MaxLength(50)]
+    public string FkColumnNetType { get; set; }
+
+    /// <summary>
+    /// 字典code
+    /// </summary>
+    [MaxLength(50)]
+    public string DictTypeCode { get; set; }
+
+    /// <summary>
+    /// 列表是否缩进(字典)
+    /// </summary>
+    [MaxLength(5)]
+    public string WhetherRetract { get; set; }
+
+    /// <summary>
+    /// 是否必填(字典)
+    /// </summary>
+    [MaxLength(5)]
+    public string WhetherRequired { get; set; }
+
+    /// <summary>
+    /// 是否是查询条件
+    /// </summary>
+    [MaxLength(5)]
+    public string QueryWhether { get; set; }
+
+    /// <summary>
+    /// 查询方式
+    /// </summary>
+    [MaxLength(10)]
+    public string QueryType { get; set; }
+
+    /// <summary>
+    /// 列表显示
+    /// </summary>
+    [MaxLength(5)]
+    public string WhetherTable { get; set; }
+
+    /// <summary>
+    /// 增改
+    /// </summary>
+    [MaxLength(5)]
+    public string WhetherAddUpdate { get; set; }
+
+    /// <summary>
+    /// 主键
+    /// </summary>
+    [MaxLength(5)]
+    public string ColumnKey { get; set; }
+
+    /// <summary>
+    /// 数据库中类型(物理类型)
+    /// </summary>
+    [MaxLength(50)]
+    public string DataType { get; set; }
+
+    /// <summary>
+    /// 是否通用字段
+    /// </summary>
+    [MaxLength(5)]
+    public string WhetherCommon { get; set; }
+
+    /// <summary>
+    /// 显示文本字段
+    /// </summary>
+    public string DisplayColumn { get; set; }
+
+    /// <summary>
+    /// 选中值字段
+    /// </summary>
+    public string ValueColumn { get; set; }
+
+    /// <summary>
+    /// 父级字段
+    /// </summary>
+    public string PidColumn { get; set; }
 }

+ 45 - 49
Admin.NET/Admin.NET.Core/Entity/SysConfig.cs

@@ -1,60 +1,56 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统参数配置表
+/// </summary>
+[SugarTable("sys_config", "系统参数配置表")]
+[SqlSugarEntity]
+public class SysConfig : EntityBase
 {
     /// <summary>
-    /// 系统参数配置表
+    /// 名称
     /// </summary>
-    [SugarTable("sys_config", "系统参数配置表")]
-    [SqlSugarEntity]
-    public class SysConfig : EntityBase
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称", Length = 50)]
-        [Required, MaxLength(50)]
-        public string Name { get; set; }
+    [SugarColumn(ColumnDescription = "名称", Length = 50)]
+    [Required, MaxLength(50)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "编码", Length = 50)]
-        [MaxLength(50)]
-        public string Code { get; set; }
+    /// <summary>
+    /// 编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 50)]
+    [MaxLength(50)]
+    public string Code { get; set; }
 
-        /// <summary>
-        /// 属性值
-        /// </summary>
-        [SugarColumn(ColumnDescription = "属性值", Length = 50)]
-        [MaxLength(50)]
-        public string Value { get; set; }
+    /// <summary>
+    /// 属性值
+    /// </summary>
+    [SugarColumn(ColumnDescription = "属性值", Length = 50)]
+    [MaxLength(50)]
+    public string Value { get; set; }
 
-        /// <summary>
-        /// 是否是系统参数(Y-是,N-否)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否是系统参数")]
-        public YesNoEnum SysFlag { get; set; }
+    /// <summary>
+    /// 是否是系统参数(Y-是,N-否)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否是系统参数")]
+    public YesNoEnum SysFlag { get; set; }
 
-        /// <summary>
-        /// 常量所属分类的编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "常量所属分类的编码", Length = 50)]
-        [MaxLength(50)]
-        public string GroupCode { get; set; }
+    /// <summary>
+    /// 常量所属分类的编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "常量所属分类的编码", Length = 50)]
+    [MaxLength(50)]
+    public string GroupCode { get; set; }
 
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序")]
-        public int Order { get; set; }
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
-    }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 }

+ 51 - 56
Admin.NET/Admin.NET.Core/Entity/SysDataResource.cs

@@ -1,66 +1,61 @@
-using SqlSugar;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+///  数据资源表
+///</summary>
+[SugarTable("sys_data_resource", "数据资源表")]
+[SqlSugarEntity]
+public class SysDataResource : EntityBase
 {
     /// <summary>
-    ///  数据资源表
+    /// 父节点Id
     ///</summary>
-    [SugarTable("sys_data_resource", "数据资源表")]
-    [SqlSugarEntity]
-    public class SysDataResource : EntityBase
-    {
-        /// <summary>
-        /// 父节点Id 
-        ///</summary>
-        [SugarColumn(ColumnName = "pid", ColumnDescription = "父Id")]
-        public long Pid { get; set; }
+    [SugarColumn(ColumnName = "pid", ColumnDescription = "父Id")]
+    public long Pid { get; set; }
 
-        /// <summary>
-        /// 名称 
-        ///</summary>
-        [SugarColumn(ColumnName = "name", ColumnDescription = "名称", Length = 200)]
-        [MaxLength(200)]
-        public string Name { get; set; }
+    /// <summary>
+    /// 名称
+    ///</summary>
+    [SugarColumn(ColumnName = "name", ColumnDescription = "名称", Length = 200)]
+    [MaxLength(200)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 值 
-        ///</summary>
-        [SugarColumn(ColumnName = "value", ColumnDescription = "值", Length = 200)]
-        [MaxLength(200)]
-        public string Value { get; set; }
+    /// <summary>
+    /// 值
+    ///</summary>
+    [SugarColumn(ColumnName = "value", ColumnDescription = "值", Length = 200)]
+    [MaxLength(200)]
+    public string Value { get; set; }
 
-        /// <summary>
-        /// 节点编码 
-        ///</summary>
-        [SugarColumn(ColumnName = "code", ColumnDescription = "节点编码", Length = 100)]
-        [MaxLength(100)]
-        public string Code { get; set; }
+    /// <summary>
+    /// 节点编码
+    ///</summary>
+    [SugarColumn(ColumnName = "code", ColumnDescription = "节点编码", Length = 100)]
+    [MaxLength(100)]
+    public string Code { get; set; }
 
-        /// <summary>
-        /// 排序 
-        ///</summary>
-        [SugarColumn(ColumnName = "order", ColumnDescription = "排序")]
-        public int Order { get; set; }
+    /// <summary>
+    /// 排序
+    ///</summary>
+    [SugarColumn(ColumnName = "order", ColumnDescription = "排序")]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 备注 
-        ///</summary>
-        [SugarColumn(ColumnName = "remark", ColumnDescription = "备注", Length = 200)]
-        [MaxLength(200)]
-        public string Remark { get; set; }
+    /// <summary>
+    /// 备注
+    ///</summary>
+    [SugarColumn(ColumnName = "remark", ColumnDescription = "备注", Length = 200)]
+    [MaxLength(200)]
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 状态
-        ///</summary>
-        [SugarColumn(ColumnName = "status", ColumnDescription = "状态")]
-        public StatusEnum Status { get; set; } = StatusEnum.Enable;
+    /// <summary>
+    /// 状态
+    ///</summary>
+    [SugarColumn(ColumnName = "status", ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
 
-        /// <summary>
-        /// 数据资源子项
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public List<SysDataResource> Children { get; set; }
-    }
-}
+    /// <summary>
+    /// 数据资源子项
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public List<SysDataResource> Children { get; set; }
+}

+ 38 - 42
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs

@@ -1,52 +1,48 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统字典值表
+/// </summary>
+[SugarTable("sys_dict_data", "系统字典值表")]
+[SqlSugarEntity]
+public class SysDictData : EntityBase
 {
     /// <summary>
-    /// 系统字典值表
+    /// 字典类型Id
     /// </summary>
-    [SugarTable("sys_dict_data", "系统字典值表")]
-    [SqlSugarEntity]
-    public class SysDictData : EntityBase
-    {
-        /// <summary>
-        /// 字典类型Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "字典类型Id")]
-        public long DictTypeId { get; set; }
+    [SugarColumn(ColumnDescription = "字典类型Id")]
+    public long DictTypeId { get; set; }
 
-        /// <summary>
-        /// 值
-        /// </summary>
-        [SugarColumn(ColumnDescription = "值", Length = 100)]
-        [Required, MaxLength(100)]
-        public string Value { get; set; }
+    /// <summary>
+    /// 值
+    /// </summary>
+    [SugarColumn(ColumnDescription = "值", Length = 100)]
+    [Required, MaxLength(100)]
+    public string Value { get; set; }
 
-        /// <summary>
-        /// 编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "编码", Length = 50)]
-        [Required, MaxLength(50)]
-        public string Code { get; set; }
+    /// <summary>
+    /// 编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 50)]
+    [Required, MaxLength(50)]
+    public string Code { get; set; }
 
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序")]
-        public int Order { get; set; }
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public StatusEnum Status { get; set; } = StatusEnum.Enable;
-    }
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
 }

+ 33 - 37
Admin.NET/Admin.NET.Core/Entity/SysDictType.cs

@@ -1,46 +1,42 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统字典类型表
+/// </summary>
+[SugarTable("sys_dict_type", "系统字典类型表")]
+[SqlSugarEntity]
+public class SysDictType : EntityBase
 {
     /// <summary>
-    /// 系统字典类型表
+    /// 名称
     /// </summary>
-    [SugarTable("sys_dict_type", "系统字典类型表")]
-    [SqlSugarEntity]
-    public class SysDictType : EntityBase
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称", Length = 50)]
-        [Required, MaxLength(50)]
-        public string Name { get; set; }
+    [SugarColumn(ColumnDescription = "名称", Length = 50)]
+    [Required, MaxLength(50)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "编码", Length = 50)]
-        [Required, MaxLength(50)]
-        public string Code { get; set; }
+    /// <summary>
+    /// 编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 50)]
+    [Required, MaxLength(50)]
+    public string Code { get; set; }
 
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序")]
-        public int Order { get; set; }
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public StatusEnum Status { get; set; } = StatusEnum.Enable;
-    }
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
 }

+ 41 - 45
Admin.NET/Admin.NET.Core/Entity/SysFile.cs

@@ -1,55 +1,51 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统文件表
+/// </summary>
+[SugarTable("sys_file", "系统文件表")]
+[SqlSugarEntity]
+public class SysFile : EntityBase
 {
     /// <summary>
-    /// 系统文件表
+    /// 仓储名称
     /// </summary>
-    [SugarTable("sys_file", "系统文件表")]
-    [SqlSugarEntity]
-    public class SysFile : EntityBase
-    {
-        /// <summary>
-        /// 仓储名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "仓储名称", Length = 100)]
-        [MaxLength(100)]
-        public string BucketName { get; set; }
+    [SugarColumn(ColumnDescription = "仓储名称", Length = 100)]
+    [MaxLength(100)]
+    public string BucketName { get; set; }
 
-        /// <summary>
-        /// 文件名称(上传时名称)
-        /// </summary>文件名称
-        [SugarColumn(ColumnDescription = "文件名称", Length = 100)]
-        [MaxLength(100)]
-        public string FileName { get; set; }
+    /// <summary>
+    /// 文件名称(上传时名称)
+    /// </summary>文件名称
+    [SugarColumn(ColumnDescription = "文件名称", Length = 100)]
+    [MaxLength(100)]
+    public string FileName { get; set; }
 
-        /// <summary>
-        /// 文件后缀
-        /// </summary>
-        [SugarColumn(ColumnDescription = "文件后缀", Length = 20)]
-        [MaxLength(20)]
-        public string Suffix { get; set; }
+    /// <summary>
+    /// 文件后缀
+    /// </summary>
+    [SugarColumn(ColumnDescription = "文件后缀", Length = 20)]
+    [MaxLength(20)]
+    public string Suffix { get; set; }
 
-        /// <summary>
-        /// 存储路径
-        /// </summary>
-        [SugarColumn(ColumnDescription = "存储路径", Length = 100)]
-        [MaxLength(100)]
-        public string FilePath { get; set; }
+    /// <summary>
+    /// 存储路径
+    /// </summary>
+    [SugarColumn(ColumnDescription = "存储路径", Length = 100)]
+    [MaxLength(100)]
+    public string FilePath { get; set; }
 
-        /// <summary>
-        /// 文件大小KB
-        /// </summary>
-        [SugarColumn(ColumnDescription = "文件大小KB", Length = 10)]
-        [MaxLength(10)]
-        public string SizeKb { get; set; }
+    /// <summary>
+    /// 文件大小KB
+    /// </summary>
+    [SugarColumn(ColumnDescription = "文件大小KB", Length = 10)]
+    [MaxLength(10)]
+    public string SizeKb { get; set; }
 
-        /// <summary>
-        /// 文件大小信息-计算后的
-        /// </summary>
-        [SugarColumn(ColumnDescription = "文件大小信息", Length = 50)]
-        [MaxLength(50)]
-        public string SizeInfo { get; set; }
-    }
+    /// <summary>
+    /// 文件大小信息-计算后的
+    /// </summary>
+    [SugarColumn(ColumnDescription = "文件大小信息", Length = 50)]
+    [MaxLength(50)]
+    public string SizeInfo { get; set; }
 }

+ 50 - 55
Admin.NET/Admin.NET.Core/Entity/SysLogAudit.cs

@@ -1,66 +1,61 @@
-using SqlSugar;
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 系统审计日志表
+/// </summary>
+[SugarTable("sys_log_audit", "系统审计日志表")]
+[SqlSugarEntity]
+public class SysLogAudit : EntityBase
 {
     /// <summary>
-    /// 系统审计日志表
+    /// 表名
     /// </summary>
-    [SugarTable("sys_log_audit", "系统审计日志表")]
-    [SqlSugarEntity]
-    public class SysLogAudit : EntityBase
-    {
-        /// <summary>
-        /// 表名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "表名", Length = 50)]
-        [MaxLength(50)]
-        public string TableName { get; set; }
+    [SugarColumn(ColumnDescription = "表名", Length = 50)]
+    [MaxLength(50)]
+    public string TableName { get; set; }
 
-        /// <summary>
-        /// 列名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "列名", Length = 50)]
-        [MaxLength(50)]
-        public string ColumnName { get; set; }
+    /// <summary>
+    /// 列名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "列名", Length = 50)]
+    [MaxLength(50)]
+    public string ColumnName { get; set; }
 
-        /// <summary>
-        /// 新值
-        /// </summary>
-        [SugarColumn(ColumnDescription = "新值")]
-        public string NewValue { get; set; }
+    /// <summary>
+    /// 新值
+    /// </summary>
+    [SugarColumn(ColumnDescription = "新值")]
+    public string NewValue { get; set; }
 
-        /// <summary>
-        /// 旧值
-        /// </summary>
-        [SugarColumn(ColumnDescription = "旧值")]
-        public string OldValue { get; set; }
+    /// <summary>
+    /// 旧值
+    /// </summary>
+    [SugarColumn(ColumnDescription = "旧值")]
+    public string OldValue { get; set; }
 
-        /// <summary>
-        /// 操作方式(新增、更新、删除)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "操作方式")]
-        public DataOpTypeEnum Operate { get; set; }
+    /// <summary>
+    /// 操作方式(新增、更新、删除)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作方式")]
+    public DataOpTypeEnum Operate { get; set; }
 
-        /// <summary>
-        /// 审计时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审计时间")]
-        public DateTime? AuditTime { get; set; }
+    /// <summary>
+    /// 审计时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审计时间")]
+    public DateTime? AuditTime { get; set; }
 
-        /// <summary>
-        /// 账号名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-        [MaxLength(20)]
-        public string UserName { get; set; }
+    /// <summary>
+    /// 账号名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
+    [MaxLength(20)]
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// 真实姓名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-        [MaxLength(20)]
-        public string RealName { get; set; }
-    }
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
+    [MaxLength(20)]
+    public string RealName { get; set; }
 }

+ 54 - 58
Admin.NET/Admin.NET.Core/Entity/SysLogEx.cs

@@ -1,71 +1,67 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统异常日志表
+/// </summary>
+[SugarTable("sys_log_ex", "系统异常日志表")]
+[SqlSugarEntity]
+public class SysLogEx : EntityBase
 {
     /// <summary>
-    /// 系统异常日志表
+    /// 类名
     /// </summary>
-    [SugarTable("sys_log_ex", "系统异常日志表")]
-    [SqlSugarEntity]
-    public class SysLogEx : EntityBase
-    {
-        /// <summary>
-        /// 类名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "类名", Length = 100)]
-        [MaxLength(100)]
-        public string ClassName { get; set; }
+    [SugarColumn(ColumnDescription = "类名", Length = 100)]
+    [MaxLength(100)]
+    public string ClassName { get; set; }
 
-        /// <summary>
-        /// 方法名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "方法名", Length = 100)]
-        [MaxLength(100)]
-        public string MethodName { get; set; }
+    /// <summary>
+    /// 方法名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "方法名", Length = 100)]
+    [MaxLength(100)]
+    public string MethodName { get; set; }
 
-        /// <summary>
-        /// 异常名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "异常名称", ColumnDataType = "text")]
-        public string ExceptionName { get; set; }
+    /// <summary>
+    /// 异常名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "异常名称", ColumnDataType = "text")]
+    public string ExceptionName { get; set; }
 
-        /// <summary>
-        /// 异常信息
-        /// </summary>
-        [SugarColumn(ColumnDescription = "异常信息", ColumnDataType = "text")]
-        public string ExceptionMsg { get; set; }
+    /// <summary>
+    /// 异常信息
+    /// </summary>
+    [SugarColumn(ColumnDescription = "异常信息", ColumnDataType = "text")]
+    public string ExceptionMsg { get; set; }
 
-        /// <summary>
-        /// 异常源
-        /// </summary>
-        [SugarColumn(ColumnDescription = "异常源", ColumnDataType = "text")]
-        public string ExceptionSource { get; set; }
+    /// <summary>
+    /// 异常源
+    /// </summary>
+    [SugarColumn(ColumnDescription = "异常源", ColumnDataType = "text")]
+    public string ExceptionSource { get; set; }
 
-        /// <summary>
-        /// 堆栈信息
-        /// </summary>
-        [SugarColumn(ColumnDescription = "堆栈信息", ColumnDataType = "text")]
-        public string StackTrace { get; set; }
+    /// <summary>
+    /// 堆栈信息
+    /// </summary>
+    [SugarColumn(ColumnDescription = "堆栈信息", ColumnDataType = "text")]
+    public string StackTrace { get; set; }
 
-        /// <summary>
-        /// 参数对象
-        /// </summary>
-        [SugarColumn(ColumnDescription = "参数对象", ColumnDataType = "text")]
-        public string ParamsObj { get; set; }
+    /// <summary>
+    /// 参数对象
+    /// </summary>
+    [SugarColumn(ColumnDescription = "参数对象", ColumnDataType = "text")]
+    public string ParamsObj { get; set; }
 
-        /// <summary>
-        /// 账号名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-        [MaxLength(20)]
-        public string UserName { get; set; }
+    /// <summary>
+    /// 账号名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
+    [MaxLength(20)]
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// 真实姓名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-        [MaxLength(20)]
-        public string RealName { get; set; }
-    }
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
+    [MaxLength(20)]
+    public string RealName { get; set; }
 }

+ 90 - 94
Admin.NET/Admin.NET.Core/Entity/SysLogOp.cs

@@ -1,113 +1,109 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统操作日志表
+/// </summary>
+[SugarTable("sys_log_op", "系统操作日志表")]
+[SqlSugarEntity]
+public class SysLogOp : EntityBase
 {
     /// <summary>
-    /// 系统操作日志表
+    /// 是否执行成功(Y-是,N-否)
     /// </summary>
-    [SugarTable("sys_log_op", "系统操作日志表")]
-    [SqlSugarEntity]
-    public class SysLogOp : EntityBase
-    {
-        /// <summary>
-        /// 是否执行成功(Y-是,N-否)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否执行成功")]
-        public YesNoEnum Success { get; set; }
+    [SugarColumn(ColumnDescription = "是否执行成功")]
+    public YesNoEnum Success { get; set; }
 
-        /// <summary>
-        /// 具体消息
-        /// </summary>
-        [SugarColumn(ColumnDescription = "具体消息", ColumnDataType = "text")]
-        public string Message { get; set; }
+    /// <summary>
+    /// 具体消息
+    /// </summary>
+    [SugarColumn(ColumnDescription = "具体消息", ColumnDataType = "text")]
+    public string Message { get; set; }
 
-        /// <summary>
-        /// IP地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "IP地址", Length = 20)]
-        [MaxLength(20)]
-        public string Ip { get; set; }
+    /// <summary>
+    /// IP地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "IP地址", Length = 20)]
+    [MaxLength(20)]
+    public string Ip { get; set; }
 
-        /// <summary>
-        /// 地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "地址", Length = 100)]
-        [MaxLength(100)]
-        public string Location { get; set; }
+    /// <summary>
+    /// 地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "地址", Length = 100)]
+    [MaxLength(100)]
+    public string Location { get; set; }
 
-        /// <summary>
-        /// 浏览器
-        /// </summary>
-        [SugarColumn(ColumnDescription = "浏览器", Length = 100)]
-        [MaxLength(100)]
-        public string Browser { get; set; }
+    /// <summary>
+    /// 浏览器
+    /// </summary>
+    [SugarColumn(ColumnDescription = "浏览器", Length = 100)]
+    [MaxLength(100)]
+    public string Browser { get; set; }
 
-        /// <summary>
-        /// 操作系统
-        /// </summary>
-        [SugarColumn(ColumnDescription = "操作系统", Length = 100)]
-        [MaxLength(100)]
-        public string Os { get; set; }
+    /// <summary>
+    /// 操作系统
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作系统", Length = 100)]
+    [MaxLength(100)]
+    public string Os { get; set; }
 
-        /// <summary>
-        /// 请求地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "请求地址", Length = 100)]
-        [MaxLength(100)]
-        public string Url { get; set; }
+    /// <summary>
+    /// 请求地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求地址", Length = 100)]
+    [MaxLength(100)]
+    public string Url { get; set; }
 
-        /// <summary>
-        /// 类名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "类名称", Length = 100)]
-        [MaxLength(100)]
-        public string ClassName { get; set; }
+    /// <summary>
+    /// 类名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "类名称", Length = 100)]
+    [MaxLength(100)]
+    public string ClassName { get; set; }
 
-        /// <summary>
-        /// 方法名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "方法名称", Length = 100)]
-        [MaxLength(100)]
-        public string MethodName { get; set; }
+    /// <summary>
+    /// 方法名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "方法名称", Length = 100)]
+    [MaxLength(100)]
+    public string MethodName { get; set; }
 
-        /// <summary>
-        /// 请求方式(GET POST PUT DELETE)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "请求方式", Length = 10)]
-        [MaxLength(10)]
-        public string ReqMethod { get; set; }
+    /// <summary>
+    /// 请求方式(GET POST PUT DELETE)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求方式", Length = 10)]
+    [MaxLength(10)]
+    public string ReqMethod { get; set; }
 
-        /// <summary>
-        /// 请求参数
-        /// </summary>
-        [SugarColumn(ColumnDescription = "请求参数", ColumnDataType = "text")]
-        public string Param { get; set; }
+    /// <summary>
+    /// 请求参数
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求参数", ColumnDataType = "text")]
+    public string Param { get; set; }
 
-        /// <summary>
-        /// 返回结果
-        /// </summary>
-        [SugarColumn(ColumnDescription = "返回结果", ColumnDataType = "text")]
-        public string Result { get; set; }
+    /// <summary>
+    /// 返回结果
+    /// </summary>
+    [SugarColumn(ColumnDescription = "返回结果", ColumnDataType = "text")]
+    public string Result { get; set; }
 
-        /// <summary>
-        /// 耗时(毫秒)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "耗时")]
-        public long ElapsedTime { get; set; }
+    /// <summary>
+    /// 耗时(毫秒)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "耗时")]
+    public long ElapsedTime { get; set; }
 
-        /// <summary>
-        /// 账号名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-        [MaxLength(20)]
-        public string UserName { get; set; }
+    /// <summary>
+    /// 账号名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
+    [MaxLength(20)]
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// 真实姓名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-        [MaxLength(20)]
-        public string RealName { get; set; }
-    }
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
+    [MaxLength(20)]
+    public string RealName { get; set; }
 }

+ 56 - 60
Admin.NET/Admin.NET.Core/Entity/SysLogVis.cs

@@ -1,73 +1,69 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统访问日志表
+/// </summary>
+[SugarTable("sys_log_vis", "系统访问日志表")]
+[SqlSugarEntity]
+public class SysLogVis : EntityBase
 {
     /// <summary>
-    /// 系统访问日志表
+    /// 是否执行成功(Y-是,N-否)
     /// </summary>
-    [SugarTable("sys_log_vis", "系统访问日志表")]
-    [SqlSugarEntity]
-    public class SysLogVis : EntityBase
-    {
-        /// <summary>
-        /// 是否执行成功(Y-是,N-否)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否执行成功")]
-        public YesNoEnum Success { get; set; }
+    [SugarColumn(ColumnDescription = "是否执行成功")]
+    public YesNoEnum Success { get; set; }
 
-        /// <summary>
-        /// 具体消息
-        /// </summary>
-        [SugarColumn(ColumnDescription = "具体消息", ColumnDataType = "text")]
-        public string Message { get; set; }
+    /// <summary>
+    /// 具体消息
+    /// </summary>
+    [SugarColumn(ColumnDescription = "具体消息", ColumnDataType = "text")]
+    public string Message { get; set; }
 
-        /// <summary>
-        /// IP地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "IP地址", Length = 20)]
-        [MaxLength(20)]
-        public string Ip { get; set; }
+    /// <summary>
+    /// IP地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "IP地址", Length = 20)]
+    [MaxLength(20)]
+    public string Ip { get; set; }
 
-        /// <summary>
-        /// 地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "地址", Length = 100)]
-        [MaxLength(100)]
-        public string Location { get; set; }
+    /// <summary>
+    /// 地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "地址", Length = 100)]
+    [MaxLength(100)]
+    public string Location { get; set; }
 
-        /// <summary>
-        /// 浏览器
-        /// </summary>
-        [SugarColumn(ColumnDescription = "浏览器", Length = 100)]
-        [MaxLength(100)]
-        public string Browser { get; set; }
+    /// <summary>
+    /// 浏览器
+    /// </summary>
+    [SugarColumn(ColumnDescription = "浏览器", Length = 100)]
+    [MaxLength(100)]
+    public string Browser { get; set; }
 
-        /// <summary>
-        /// 操作系统
-        /// </summary>
-        [SugarColumn(ColumnDescription = "操作系统", Length = 100)]
-        [MaxLength(100)]
-        public string Os { get; set; }
+    /// <summary>
+    /// 操作系统
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作系统", Length = 100)]
+    [MaxLength(100)]
+    public string Os { get; set; }
 
-        /// <summary>
-        /// 访问类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "访问类型")]
-        public LoginTypeEnum VisType { get; set; }
+    /// <summary>
+    /// 访问类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "访问类型")]
+    public LoginTypeEnum VisType { get; set; }
 
-        /// <summary>
-        /// 账号名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-        [MaxLength(20)]
-        public string UserName { get; set; }
+    /// <summary>
+    /// 账号名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
+    [MaxLength(20)]
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// 真实姓名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-        [MaxLength(20)]
-        public string RealName { get; set; }
-    }
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
+    [MaxLength(20)]
+    public string RealName { get; set; }
 }

+ 89 - 94
Admin.NET/Admin.NET.Core/Entity/SysMenu.cs

@@ -1,113 +1,108 @@
-using SqlSugar;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统菜单表
+/// </summary>
+[SugarTable("sys_menu", "系统菜单表")]
+[SqlSugarEntity]
+public class SysMenu : EntityBase
 {
     /// <summary>
-    /// 系统菜单表
+    /// 父Id
     /// </summary>
-    [SugarTable("sys_menu", "系统菜单表")]
-    [SqlSugarEntity]
-    public class SysMenu : EntityBase
-    {
-        /// <summary>
-        /// 父Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "父Id")]
-        public long Pid { get; set; }
+    [SugarColumn(ColumnDescription = "父Id")]
+    public long Pid { get; set; }
 
-        /// <summary>
-        /// 菜单类型(1目录 2菜单 3按钮)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "菜单类型")]
-        public MenuTypeEnum Type { get; set; }
+    /// <summary>
+    /// 菜单类型(1目录 2菜单 3按钮)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "菜单类型")]
+    public MenuTypeEnum Type { get; set; }
 
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称", Length = 50)]
-        [MaxLength(50)]
-        public string Name { get; set; }
+    /// <summary>
+    /// 名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "名称", Length = 50)]
+    [MaxLength(50)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 路由地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "路由地址", Length = 100)]
-        [MaxLength(100)]
-        public string Path { get; set; }
+    /// <summary>
+    /// 路由地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "路由地址", Length = 100)]
+    [MaxLength(100)]
+    public string Path { get; set; }
 
-        /// <summary>
-        /// 组件路径
-        /// </summary>
-        [SugarColumn(ColumnDescription = "组件路径", Length = 100)]
-        [MaxLength(100)]
-        public string Component { get; set; }
+    /// <summary>
+    /// 组件路径
+    /// </summary>
+    [SugarColumn(ColumnDescription = "组件路径", Length = 100)]
+    [MaxLength(100)]
+    public string Component { get; set; }
 
-        /// <summary>
-        /// 权限标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "权限标识", Length = 100)]
-        [MaxLength(100)]
-        public string Permission { get; set; }
+    /// <summary>
+    /// 权限标识
+    /// </summary>
+    [SugarColumn(ColumnDescription = "权限标识", Length = 100)]
+    [MaxLength(100)]
+    public string Permission { get; set; }
 
-        /// <summary>
-        /// 重定向
-        /// </summary>
-        [SugarColumn(ColumnDescription = "重定向", Length = 100)]
-        [MaxLength(100)]
-        public string Redirect { get; set; }
+    /// <summary>
+    /// 重定向
+    /// </summary>
+    [SugarColumn(ColumnDescription = "重定向", Length = 100)]
+    [MaxLength(100)]
+    public string Redirect { get; set; }
 
-        /// <summary>
-        /// 内嵌地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "内嵌地址", Length = 100)]
-        [MaxLength(200)]
-        public string FrameSrc { get; set; }
+    /// <summary>
+    /// 内嵌地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "内嵌地址", Length = 100)]
+    [MaxLength(200)]
+    public string FrameSrc { get; set; }
 
-        /// <summary>
-        /// 标题
-        /// </summary>
-        [SugarColumn(ColumnDescription = "标题", Length = 50)]
-        [Required, MaxLength(50)]
-        public string Title { get; set; }
+    /// <summary>
+    /// 标题
+    /// </summary>
+    [SugarColumn(ColumnDescription = "标题", Length = 50)]
+    [Required, MaxLength(50)]
+    public string Title { get; set; }
 
-        /// <summary>
-        /// 图标
-        /// </summary>
-        [SugarColumn(ColumnDescription = "图标", Length = 100)]
-        [MaxLength(100)]
-        public string Icon { get; set; }
+    /// <summary>
+    /// 图标
+    /// </summary>
+    [SugarColumn(ColumnDescription = "图标", Length = 100)]
+    [MaxLength(100)]
+    public string Icon { get; set; }
 
-        /// <summary>
-        /// 隐藏菜单
-        /// </summary>
-        [SugarColumn(ColumnDescription = "隐藏菜单")]
-        public bool HideMenu { get; set; } = false;
+    /// <summary>
+    /// 隐藏菜单
+    /// </summary>
+    [SugarColumn(ColumnDescription = "隐藏菜单")]
+    public bool HideMenu { get; set; } = false;
 
-        /// <summary>
-        /// 忽略缓存
-        /// </summary>
-        [SugarColumn(ColumnDescription = "忽略缓存")]
-        public bool IgnoreKeepAlive { get; set; } = false;
+    /// <summary>
+    /// 忽略缓存
+    /// </summary>
+    [SugarColumn(ColumnDescription = "忽略缓存")]
+    public bool IgnoreKeepAlive { get; set; } = false;
 
-        /// <summary>
-        /// 当前激活的菜单-用于配置详情页时左侧激活的菜单路径
-        /// </summary>
-        [SugarColumn(ColumnDescription = "当前激活菜单", Length = 100)]
-        [MaxLength(100)]
-        public string CurrentActiveMenu { get; set; }
+    /// <summary>
+    /// 当前激活的菜单-用于配置详情页时左侧激活的菜单路径
+    /// </summary>
+    [SugarColumn(ColumnDescription = "当前激活菜单", Length = 100)]
+    [MaxLength(100)]
+    public string CurrentActiveMenu { get; set; }
 
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序")]
-        public int OrderNo { get; set; }
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int OrderNo { get; set; }
 
-        /// <summary>
-        /// 菜单子项
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public List<SysMenu> Children { get; set; } = new List<SysMenu>();
-    }
+    /// <summary>
+    /// 菜单子项
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public List<SysMenu> Children { get; set; } = new List<SysMenu>();
 }

+ 43 - 48
Admin.NET/Admin.NET.Core/Entity/SysOrg.cs

@@ -1,59 +1,54 @@
-using SqlSugar;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统机构表
+/// </summary>
+[SugarTable("sys_org", "系统机构表")]
+[SqlSugarEntity]
+public class SysOrg : EntityTenant
 {
     /// <summary>
-    /// 系统机构表
+    /// 父Id
     /// </summary>
-    [SugarTable("sys_org", "系统机构表")]
-    [SqlSugarEntity]
-    public class SysOrg : EntityTenant
-    {
-        /// <summary>
-        /// 父Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "父Id")]
-        public long Pid { get; set; }
+    [SugarColumn(ColumnDescription = "父Id")]
+    public long Pid { get; set; }
 
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称", Length = 100)]
-        [Required, MaxLength(100)]
-        public string Name { get; set; }
+    /// <summary>
+    /// 名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "名称", Length = 100)]
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "编码", Length = 50)]
-        [MaxLength(50)]
-        public string Code { get; set; }
+    /// <summary>
+    /// 编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 50)]
+    [MaxLength(50)]
+    public string Code { get; set; }
 
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序")]
-        public int Order { get; set; }
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public StatusEnum Status { get; set; } = StatusEnum.Enable;
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
 
-        /// <summary>
-        /// 机构子项
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public List<SysOrg> Children { get; set; }
-    }
+    /// <summary>
+    /// 机构子项
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public List<SysOrg> Children { get; set; }
 }

+ 33 - 37
Admin.NET/Admin.NET.Core/Entity/SysPos.cs

@@ -1,46 +1,42 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统职位表
+/// </summary>
+[SugarTable("sys_pos", "系统职位表")]
+[SqlSugarEntity]
+public class SysPos : EntityTenant
 {
     /// <summary>
-    /// 系统职位表
+    /// 名称
     /// </summary>
-    [SugarTable("sys_pos", "系统职位表")]
-    [SqlSugarEntity]
-    public class SysPos : EntityTenant
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称", Length = 20)]
-        [Required, MaxLength(20)]
-        public string Name { get; set; }
+    [SugarColumn(ColumnDescription = "名称", Length = 20)]
+    [Required, MaxLength(20)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "编码", Length = 50)]
-        [MaxLength(50)]
-        public string Code { get; set; }
+    /// <summary>
+    /// 编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 50)]
+    [MaxLength(50)]
+    public string Code { get; set; }
 
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序")]
-        public int Order { get; set; }
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public StatusEnum Status { get; set; } = StatusEnum.Enable;
-    }
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
 }

+ 38 - 42
Admin.NET/Admin.NET.Core/Entity/SysRole.cs

@@ -1,52 +1,48 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统角色表
+/// </summary>
+[SugarTable("sys_role", "系统角色表")]
+[SqlSugarEntity]
+public class SysRole : EntityTenant
 {
     /// <summary>
-    /// 系统角色表
+    /// 名称
     /// </summary>
-    [SugarTable("sys_role", "系统角色表")]
-    [SqlSugarEntity]
-    public class SysRole : EntityTenant
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称", Length = 20)]
-        [Required, MaxLength(20)]
-        public string Name { get; set; }
+    [SugarColumn(ColumnDescription = "名称", Length = 20)]
+    [Required, MaxLength(20)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 编码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "编码", Length = 50)]
-        [MaxLength(50)]
-        public string Code { get; set; }
+    /// <summary>
+    /// 编码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 50)]
+    [MaxLength(50)]
+    public string Code { get; set; }
 
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序")]
-        public int Order { get; set; }
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int Order { get; set; }
 
-        /// <summary>
-        /// 数据范围(1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "数据范围")]
-        public DataScopeEnum DataScope { get; set; } = DataScopeEnum.All;
+    /// <summary>
+    /// 数据范围(1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "数据范围")]
+    public DataScopeEnum DataScope { get; set; } = DataScopeEnum.All;
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public StatusEnum Status { get; set; } = StatusEnum.Enable;
-    }
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
 }

+ 20 - 23
Admin.NET/Admin.NET.Core/Entity/SysRoleMenu.cs

@@ -1,30 +1,27 @@
-using SqlSugar;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统角色菜单表
+/// </summary>
+[SugarTable("sys_role_menu", "系统角色菜单表")]
+[SqlSugarEntity]
+public class SysRoleMenu : EntityBaseId
 {
     /// <summary>
-    /// 系统角色菜单表
+    /// 角色Id
     /// </summary>
-    [SugarTable("sys_role_menu", "系统角色菜单表")]
-    [SqlSugarEntity]
-    public class SysRoleMenu : EntityBaseId
-    {
-        /// <summary>
-        /// 角色Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "角色Id")]
-        public long RoleId { get; set; }
+    [SugarColumn(ColumnDescription = "角色Id")]
+    public long RoleId { get; set; }
 
-        /// <summary>
-        /// 菜单Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "菜单Id")]
-        public long MenuId { get; set; }
+    /// <summary>
+    /// 菜单Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "菜单Id")]
+    public long MenuId { get; set; }
 
-        /// <summary>
-        /// 菜单
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysMenu SysMenu { get; set; }
-    }
+    /// <summary>
+    /// 菜单
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysMenu SysMenu { get; set; }
 }

+ 20 - 23
Admin.NET/Admin.NET.Core/Entity/SysRoleOrg.cs

@@ -1,30 +1,27 @@
-using SqlSugar;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统角色机构表
+/// </summary>
+[SugarTable("sys_role_org", "系统角色机构表")]
+[SqlSugarEntity]
+public class SysRoleOrg : EntityBaseId
 {
     /// <summary>
-    /// 系统角色机构表
+    /// 角色Id
     /// </summary>
-    [SugarTable("sys_role_org", "系统角色机构表")]
-    [SqlSugarEntity]
-    public class SysRoleOrg : EntityBaseId
-    {
-        /// <summary>
-        /// 角色Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "角色Id")]
-        public long RoleId { get; set; }
+    [SugarColumn(ColumnDescription = "角色Id")]
+    public long RoleId { get; set; }
 
-        /// <summary>
-        /// 机构Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "机构Id")]
-        public long OrgId { get; set; }
+    /// <summary>
+    /// 机构Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "机构Id")]
+    public long OrgId { get; set; }
 
-        /// <summary>
-        /// 机构
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysOrg SysOrg { get; set; }
-    }
+    /// <summary>
+    /// 机构
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysOrg SysOrg { get; set; }
 }

+ 53 - 57
Admin.NET/Admin.NET.Core/Entity/SysTenant.cs

@@ -1,69 +1,65 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统租户表
+/// </summary>
+[SugarTable("sys_tenant", "系统租户表")]
+[SqlSugarEntity]
+public class SysTenant : EntityBase
 {
     /// <summary>
-    /// 系统租户表
+    /// 公司名称
     /// </summary>
-    [SugarTable("sys_tenant", "系统租户表")]
-    [SqlSugarEntity]
-    public class SysTenant : EntityBase
-    {
-        /// <summary>
-        /// 公司名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "公司名称", Length = 30)]
-        [Required, MaxLength(30)]
-        public string Name { get; set; }
+    [SugarColumn(ColumnDescription = "公司名称", Length = 30)]
+    [Required, MaxLength(30)]
+    public string Name { get; set; }
 
-        /// <summary>
-        /// 管理员名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "管理员名称", Length = 20)]
-        [Required, MaxLength(20)]
-        public string AdminName { get; set; }
+    /// <summary>
+    /// 管理员名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "管理员名称", Length = 20)]
+    [Required, MaxLength(20)]
+    public string AdminName { get; set; }
 
-        /// <summary>
-        /// 主机
-        /// </summary>
-        [SugarColumn(ColumnDescription = "主机", Length = 100)]
-        [MaxLength(100)]
-        public string Host { get; set; }
+    /// <summary>
+    /// 主机
+    /// </summary>
+    [SugarColumn(ColumnDescription = "主机", Length = 100)]
+    [MaxLength(100)]
+    public string Host { get; set; }
 
-        /// <summary>
-        /// 电子邮箱
-        /// </summary>
-        [SugarColumn(ColumnDescription = "电子邮箱", Length = 50)]
-        [MaxLength(50)]
-        public string Email { get; set; }
+    /// <summary>
+    /// 电子邮箱
+    /// </summary>
+    [SugarColumn(ColumnDescription = "电子邮箱", Length = 50)]
+    [MaxLength(50)]
+    public string Email { get; set; }
 
-        /// <summary>
-        /// 电话
-        /// </summary>
-        [SugarColumn(ColumnDescription = "电话", Length = 20)]
-        [MaxLength(20)]
-        public string Phone { get; set; }
+    /// <summary>
+    /// 电话
+    /// </summary>
+    [SugarColumn(ColumnDescription = "电话", Length = 20)]
+    [MaxLength(20)]
+    public string Phone { get; set; }
 
-        /// <summary>
-        /// 数据库连接
-        /// </summary>
-        [SugarColumn(ColumnDescription = "数据库连接", Length = 200)]
-        [MaxLength(200)]
-        public string Connection { get; set; }
+    /// <summary>
+    /// 数据库连接
+    /// </summary>
+    [SugarColumn(ColumnDescription = "数据库连接", Length = 200)]
+    [MaxLength(200)]
+    public string Connection { get; set; }
 
-        /// <summary>
-        /// 架构
-        /// </summary>
-        [SugarColumn(ColumnDescription = "架构", Length = 50)]
-        [MaxLength(50)]
-        public string Schema { get; set; }
+    /// <summary>
+    /// 架构
+    /// </summary>
+    [SugarColumn(ColumnDescription = "架构", Length = 50)]
+    [MaxLength(50)]
+    public string Schema { get; set; }
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
-    }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 }

+ 70 - 75
Admin.NET/Admin.NET.Core/Entity/SysTimer.cs

@@ -1,91 +1,86 @@
-using Furion.TaskScheduler;
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 定时任务
+/// </summary>
+[SugarTable("sys_timer", "定时任务表")]
+[SqlSugarEntity]
+public class SysTimer : EntityBase
 {
     /// <summary>
-    /// 定时任务
+    /// 任务名称
     /// </summary>
-    [SugarTable("sys_timer", "定时任务表")]
-    [SqlSugarEntity]
-    public class SysTimer : EntityBase
-    {
-        /// <summary>
-        /// 任务名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "任务名称", Length = 20)]
-        [Required, MaxLength(20)]
-        public virtual string TimerName { get; set; }
+    [SugarColumn(ColumnDescription = "任务名称", Length = 20)]
+    [Required, MaxLength(20)]
+    public virtual string TimerName { get; set; }
 
-        /// <summary>
-        /// 是否只执行一次
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否只执行一次")]
-        public bool DoOnce { get; set; } = false;
+    /// <summary>
+    /// 是否只执行一次
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否只执行一次")]
+    public bool DoOnce { get; set; } = false;
 
-        /// <summary>
-        /// 是否立即执行
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否立即执行")]
-        public bool StartNow { get; set; } = false;
+    /// <summary>
+    /// 是否立即执行
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否立即执行")]
+    public bool StartNow { get; set; } = false;
 
-        /// <summary>
-        /// 执行类型(串行并行)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "执行类型")]
-        public SpareTimeExecuteTypes ExecuteType { get; set; } = SpareTimeExecuteTypes.Parallel;
+    /// <summary>
+    /// 执行类型(串行并行)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "执行类型")]
+    public SpareTimeExecuteTypes ExecuteType { get; set; } = SpareTimeExecuteTypes.Parallel;
 
-        /// <summary>
-        /// 执行间隔(单位秒)
-        /// </summary>
-        /// <example>5</example>
-        [SugarColumn(ColumnDescription = "执行间隔")]
-        public int? Interval { get; set; } = 5;
+    /// <summary>
+    /// 执行间隔(单位秒)
+    /// </summary>
+    /// <example>5</example>
+    [SugarColumn(ColumnDescription = "执行间隔")]
+    public int? Interval { get; set; } = 5;
 
-        /// <summary>
-        /// Cron表达式
-        /// </summary>
-        [SugarColumn(ColumnDescription = "Cron表达式", Length = 20)]
-        [MaxLength(20)]
-        public string Cron { get; set; }
+    /// <summary>
+    /// Cron表达式
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Cron表达式", Length = 20)]
+    [MaxLength(20)]
+    public string Cron { get; set; }
 
-        /// <summary>
-        /// 定时器类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "定时器类型")]
-        public SpareTimeTypes TimerType { get; set; } = SpareTimeTypes.Interval;
+    /// <summary>
+    /// 定时器类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "定时器类型")]
+    public SpareTimeTypes TimerType { get; set; } = SpareTimeTypes.Interval;
 
-        /// <summary>
-        /// 请求url
-        /// </summary>
-        [SugarColumn(ColumnDescription = "请求url", Length = 200)]
-        [MaxLength(200)]
-        public string RequestUrl { get; set; }
+    /// <summary>
+    /// 请求url
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求url", Length = 200)]
+    [MaxLength(200)]
+    public string RequestUrl { get; set; }
 
-        /// <summary>
-        /// 请求类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "请求类型")]
-        public RequestTypeEnum RequestType { get; set; } = RequestTypeEnum.Post;
+    /// <summary>
+    /// 请求类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求类型")]
+    public RequestTypeEnum RequestType { get; set; } = RequestTypeEnum.Post;
 
-        /// <summary>
-        /// 请求参数
-        /// </summary>
-        [SugarColumn(ColumnDescription = "请求参数")]
-        public string RequestPara { get; set; }
+    /// <summary>
+    /// 请求参数
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求参数")]
+    public string RequestPara { get; set; }
 
-        /// <summary>
-        /// Headers参数 比如{"Authorization":"userpassword"}
-        /// </summary>
-        [SugarColumn(ColumnDescription = "Headers参数")]
-        public string Headers { get; set; }
+    /// <summary>
+    /// Headers参数 比如{"Authorization":"userpassword"}
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Headers参数")]
+    public string Headers { get; set; }
 
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
-    }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
 }

+ 146 - 151
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -1,154 +1,149 @@
-using SqlSugar;
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 系统用户表
+/// </summary>
+[SugarTable("sys_user", "系统用户表")]
+[SqlSugarEntity]
+public class SysUser : EntityTenant
 {
     /// <summary>
-    /// 系统用户表
-    /// </summary>
-    [SugarTable("sys_user", "系统用户表")]
-    [SqlSugarEntity]
-    public class SysUser : EntityTenant
-    {
-        /// <summary>
-        /// 账号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-        [Required, MaxLength(20)]
-        public virtual string UserName { get; set; }
-
-        /// <summary>
-        /// 密码(默认MD5加密)
-        /// </summary>
-        [SugarColumn(ColumnDescription = "账号密码", Length = 50)]
-        [Required, MaxLength(50)]
-        public string Password { get; set; }
-
-        /// <summary>
-        /// 昵称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "昵称", Length = 20)]
-        [MaxLength(20)]
-        public string NickName { get; set; }
-
-        /// <summary>
-        /// 头像
-        /// </summary>
-        [SugarColumn(ColumnDescription = "头像", Length = 255)]
-        [MaxLength(255)]
-        public string Avatar { get; set; }
-
-        /// <summary>
-        /// 出生日期
-        /// </summary>
-        [SugarColumn(ColumnDescription = "出生日期")]
-        public DateTime? Birthday { get; set; }
-
-        /// <summary>
-        /// 性别-男_1、女_2
-        /// </summary>
-        [SugarColumn(ColumnDescription = "性别")]
-        public GenderEnum Sex { get; set; } = GenderEnum.Male;
-
-        /// <summary>
-        /// 邮箱
-        /// </summary>
-        [SugarColumn(ColumnDescription = "邮箱", Length = 50)]
-        [MaxLength(50)]
-        public string Email { get; set; }
-
-        /// <summary>
-        /// 手机号码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "手机号码", Length = 20)]
-        [MaxLength(20)]
-        public string Phone { get; set; }
-
-        /// <summary>
-        /// 真实姓名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-        [MaxLength(20)]
-        public string RealName { get; set; }
-
-        /// <summary>
-        /// 身份证号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "身份证号", Length = 20)]
-        [MaxLength(20)]
-        public string IdCard { get; set; }
-
-        /// <summary>
-        /// 个性签名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "个性签名", Length = 50)]
-        [MaxLength(50)]
-        public string Signature { get; set; }
-
-        /// <summary>
-        /// 个人简介
-        /// </summary>
-        [SugarColumn(ColumnDescription = "个人简介", Length = 500)]
-        [MaxLength(500)]
-        public string Introduction { get; set; }
-
-        /// <summary>
-        /// 账号类型-超级管理员_1、管理员_2、普通_3
-        /// </summary>
-        [SugarColumn(ColumnDescription = "账号类型")]
-        public UserTypeEnum UserType { get; set; } = UserTypeEnum.None;
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注", Length = 100)]
-        [MaxLength(100)]
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public StatusEnum Status { get; set; } = StatusEnum.Enable;
-
-        /// <summary>
-        /// 机构Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "机构Id")]
-        public long OrgId { get; set; }
-
-        /// <summary>
-        /// 机构
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        [Navigate(NavigateType.OneToOne, nameof(OrgId))]
-        public SysOrg SysOrg { get; set; }
-
-        /// <summary>
-        /// 职位Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "职位Id")]
-        public long PosId { get; set; }
-
-        /// <summary>
-        /// 职位
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        [Navigate(NavigateType.OneToMany, nameof(PosId))]
-        public SysPos SysPos { get; set; }
-
-        /// <summary>
-        /// 工号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "工号", Length = 30)]
-        [MaxLength(30)]
-        public string JobNum { get; set; }
-
-        /// <summary>
-        /// 岗位状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "岗位状态")]
-        public JobStatusEnum JobStatus { get; set; } = JobStatusEnum.On;
-    }
+    /// 账号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
+    [Required, MaxLength(20)]
+    public virtual string UserName { get; set; }
+
+    /// <summary>
+    /// 密码(默认MD5加密)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号密码", Length = 50)]
+    [Required, MaxLength(50)]
+    public string Password { get; set; }
+
+    /// <summary>
+    /// 昵称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "昵称", Length = 20)]
+    [MaxLength(20)]
+    public string NickName { get; set; }
+
+    /// <summary>
+    /// 头像
+    /// </summary>
+    [SugarColumn(ColumnDescription = "头像", Length = 255)]
+    [MaxLength(255)]
+    public string Avatar { get; set; }
+
+    /// <summary>
+    /// 出生日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "出生日期")]
+    public DateTime? Birthday { get; set; }
+
+    /// <summary>
+    /// 性别-男_1、女_2
+    /// </summary>
+    [SugarColumn(ColumnDescription = "性别")]
+    public GenderEnum Sex { get; set; } = GenderEnum.Male;
+
+    /// <summary>
+    /// 邮箱
+    /// </summary>
+    [SugarColumn(ColumnDescription = "邮箱", Length = 50)]
+    [MaxLength(50)]
+    public string Email { get; set; }
+
+    /// <summary>
+    /// 手机号码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "手机号码", Length = 20)]
+    [MaxLength(20)]
+    public string Phone { get; set; }
+
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
+    [MaxLength(20)]
+    public string RealName { get; set; }
+
+    /// <summary>
+    /// 身份证号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "身份证号", Length = 20)]
+    [MaxLength(20)]
+    public string IdCard { get; set; }
+
+    /// <summary>
+    /// 个性签名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "个性签名", Length = 50)]
+    [MaxLength(50)]
+    public string Signature { get; set; }
+
+    /// <summary>
+    /// 个人简介
+    /// </summary>
+    [SugarColumn(ColumnDescription = "个人简介", Length = 500)]
+    [MaxLength(500)]
+    public string Introduction { get; set; }
+
+    /// <summary>
+    /// 账号类型-超级管理员_1、管理员_2、普通_3
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号类型")]
+    public UserTypeEnum UserType { get; set; } = UserTypeEnum.None;
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 100)]
+    [MaxLength(100)]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
+
+    /// <summary>
+    /// 机构Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "机构Id")]
+    public long OrgId { get; set; }
+
+    /// <summary>
+    /// 机构
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [Navigate(NavigateType.OneToOne, nameof(OrgId))]
+    public SysOrg SysOrg { get; set; }
+
+    /// <summary>
+    /// 职位Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "职位Id")]
+    public long PosId { get; set; }
+
+    /// <summary>
+    /// 职位
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [Navigate(NavigateType.OneToMany, nameof(PosId))]
+    public SysPos SysPos { get; set; }
+
+    /// <summary>
+    /// 工号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "工号", Length = 30)]
+    [MaxLength(30)]
+    public string JobNum { get; set; }
+
+    /// <summary>
+    /// 岗位状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "岗位状态")]
+    public JobStatusEnum JobStatus { get; set; } = JobStatusEnum.On;
 }

+ 35 - 38
Admin.NET/Admin.NET.Core/Entity/SysUserExtOrgPos.cs

@@ -1,48 +1,45 @@
-using SqlSugar;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统用户附属机构职位表
+/// </summary>
+[SugarTable("sys_user_ext_org_pos", "系统用户附属机构职位表")]
+[SqlSugarEntity]
+public class SysUserExtOrgPos : EntityBaseId
 {
     /// <summary>
-    /// 系统用户附属机构职位表
+    /// 用户Id
     /// </summary>
-    [SugarTable("sys_user_ext_org_pos", "系统用户附属机构职位表")]
-    [SqlSugarEntity]
-    public class SysUserExtOrgPos : EntityBaseId
-    {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "用户Id")]
-        public long UserId { get; set; }
+    [SugarColumn(ColumnDescription = "用户Id")]
+    public long UserId { get; set; }
 
-        /// <summary>
-        /// 用户
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysUser SysUser { get; set; }
+    /// <summary>
+    /// 用户
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysUser SysUser { get; set; }
 
-        /// <summary>
-        /// 机构Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "机构Id")]
-        public long OrgId { get; set; }
+    /// <summary>
+    /// 机构Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "机构Id")]
+    public long OrgId { get; set; }
 
-        /// <summary>
-        /// 机构
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysOrg SysOrg { get; set; }
+    /// <summary>
+    /// 机构
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysOrg SysOrg { get; set; }
 
-        /// <summary>
-        /// 职位Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "职位Id")]
-        public long PosId { get; set; }
+    /// <summary>
+    /// 职位Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "职位Id")]
+    public long PosId { get; set; }
 
-        /// <summary>
-        /// 职位
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysPos SysPos { get; set; }
-    }
+    /// <summary>
+    /// 职位
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysPos SysPos { get; set; }
 }

+ 20 - 23
Admin.NET/Admin.NET.Core/Entity/SysUserOrg.cs

@@ -1,30 +1,27 @@
-using SqlSugar;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统用户机构表
+/// </summary>
+[SugarTable("sys_user_org", "系统用户机构表")]
+[SqlSugarEntity]
+public class SysUserOrg : EntityBaseId
 {
     /// <summary>
-    /// 系统用户机构表
+    /// 用户Id
     /// </summary>
-    [SugarTable("sys_user_org", "系统用户机构表")]
-    [SqlSugarEntity]
-    public class SysUserOrg : EntityBaseId
-    {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "用户Id")]
-        public long UserId { get; set; }
+    [SugarColumn(ColumnDescription = "用户Id")]
+    public long UserId { get; set; }
 
-        /// <summary>
-        /// 机构Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "机构Id")]
-        public long OrgId { get; set; }
+    /// <summary>
+    /// 机构Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "机构Id")]
+    public long OrgId { get; set; }
 
-        /// <summary>
-        /// 机构
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysOrg SysOrg { get; set; }
-    }
+    /// <summary>
+    /// 机构
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysOrg SysOrg { get; set; }
 }

+ 20 - 23
Admin.NET/Admin.NET.Core/Entity/SysUserRole.cs

@@ -1,30 +1,27 @@
-using SqlSugar;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统用户角色表
+/// </summary>
+[SugarTable("sys_user_role", "系统用户角色表")]
+[SqlSugarEntity]
+public class SysUserRole : EntityBaseId
 {
     /// <summary>
-    /// 系统用户角色表
+    /// 用户Id
     /// </summary>
-    [SugarTable("sys_user_role", "系统用户角色表")]
-    [SqlSugarEntity]
-    public class SysUserRole : EntityBaseId
-    {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "用户Id")]
-        public long UserId { get; set; }
+    [SugarColumn(ColumnDescription = "用户Id")]
+    public long UserId { get; set; }
 
-        /// <summary>
-        /// 角色Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "角色Id")]
-        public long RoleId { get; set; }
+    /// <summary>
+    /// 角色Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "角色Id")]
+    public long RoleId { get; set; }
 
-        /// <summary>
-        /// 角色
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysRole SysRole { get; set; }
-    }
+    /// <summary>
+    /// 角色
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysRole SysRole { get; set; }
 }

+ 147 - 151
Admin.NET/Admin.NET.Core/Entity/WechatPay.cs

@@ -1,154 +1,150 @@
-using SqlSugar;
-using System;
-
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 微信支付表
+/// </summary>
+[SugarTable("wechat_pay", "微信支付表")]
+[SqlSugarEntity]
+public class WechatPay : EntityBase
 {
     /// <summary>
-    /// 微信支付表
-    /// </summary>
-    [SugarTable("wechat_pay", "微信支付表")]
-    [SqlSugarEntity]
-    public class WechatPay : EntityBase
-    {
-        /// <summary>
-        /// 微信商户号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "微信商户号")]
-        public string MerchantId { get; set; }
-
-        /// <summary>
-        /// 服务商AppId
-        /// </summary>
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// 商户订单号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "商户订单号")]
-        public string OutTradeNumber { get; set; }
-
-        /// <summary>
-        /// 支付订单号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "支付订单号")]
-        public string TransactionId { get; set; }
-
-        /// <summary>
-        /// 交易类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "交易类型")]
-        public string TradeType { get; set; }
-
-        /// <summary>
-        /// 交易状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "交易状态")]
-        public string TradeState { get; set; }
-
-        /// <summary>
-        /// 交易状态描述
-        /// </summary>
-        [SugarColumn(ColumnDescription = "交易状态描述")]
-        public string TradeStateDescription { get; set; }
-
-        /// <summary>
-        /// 付款银行类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "付款银行类型")]
-        public string BankType { get; set; }
-
-        /// <summary>
-        /// 订单总金额
-        /// </summary>
-        [SugarColumn(ColumnDescription = "订单总金额")]
-        public int Total { get; set; }
-
-        /// <summary>
-        /// 用户支付金额
-        /// </summary>
-        [SugarColumn(ColumnDescription = "用户支付金额")]
-        public int? PayerTotal { get; set; }
-
-        /// <summary>
-        /// 支付完成时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "支付完成时间")]
-        public DateTimeOffset? SuccessTime { get; set; }
-
-        /// <summary>
-        /// 交易结束时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "交易结束时间")]
-        public DateTimeOffset? ExpireTime { get; set; }
-
-        /// <summary>
-        /// 商品描述
-        /// </summary>
-        [SugarColumn(ColumnDescription = "商品描述")]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// 场景信息
-        /// </summary>
-        [SugarColumn(ColumnDescription = "场景信息")]
-        public string Scene { get; set; }
-
-        /// <summary>
-        /// 附加数据
-        /// </summary>
-        [SugarColumn(ColumnDescription = "附加数据")]
-        public string Attachment { get; set; }
-
-        /// <summary>
-        /// 优惠标记
-        /// </summary>
-        [SugarColumn(ColumnDescription = "优惠标记")]
-        public string GoodsTag { get; set; }
-
-        /// <summary>
-        /// 结算信息。
-        /// </summary>
-        public string Settlement { get; set; }
-
-        /// <summary>
-        /// 回调通知地址
-        /// </summary>
-        public string NotifyUrl { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注")]
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 微信OpenId标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "微信OpenId标识")]
-        public string OpenId { get; set; }
-
-        /// <summary>
-        /// 关联微信用户
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public WechatUser WechatUser { get; set; }
-
-        /// <summary>
-        /// 子商户号
-        /// </summary>
-        public string SubMerchantId { get; set; }
-
-        /// <summary>
-        /// 子商户AppId
-        /// </summary>
-        [Newtonsoft.Json.JsonProperty("sub_appid")]
-        [System.Text.Json.Serialization.JsonPropertyName("sub_appid")]
-        public string SubAppId { get; set; }
-
-        /// <summary>
-        /// 子商户唯一标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "子商户唯一标识")]
-        public string SubOpenId { get; set; }
-    }
+    /// 微信商户号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "微信商户号")]
+    public string MerchantId { get; set; }
+
+    /// <summary>
+    /// 服务商AppId
+    /// </summary>
+    public string AppId { get; set; }
+
+    /// <summary>
+    /// 商户订单号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "商户订单号")]
+    public string OutTradeNumber { get; set; }
+
+    /// <summary>
+    /// 支付订单号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "支付订单号")]
+    public string TransactionId { get; set; }
+
+    /// <summary>
+    /// 交易类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "交易类型")]
+    public string TradeType { get; set; }
+
+    /// <summary>
+    /// 交易状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "交易状态")]
+    public string TradeState { get; set; }
+
+    /// <summary>
+    /// 交易状态描述
+    /// </summary>
+    [SugarColumn(ColumnDescription = "交易状态描述")]
+    public string TradeStateDescription { get; set; }
+
+    /// <summary>
+    /// 付款银行类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "付款银行类型")]
+    public string BankType { get; set; }
+
+    /// <summary>
+    /// 订单总金额
+    /// </summary>
+    [SugarColumn(ColumnDescription = "订单总金额")]
+    public int Total { get; set; }
+
+    /// <summary>
+    /// 用户支付金额
+    /// </summary>
+    [SugarColumn(ColumnDescription = "用户支付金额")]
+    public int? PayerTotal { get; set; }
+
+    /// <summary>
+    /// 支付完成时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "支付完成时间")]
+    public DateTimeOffset? SuccessTime { get; set; }
+
+    /// <summary>
+    /// 交易结束时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "交易结束时间")]
+    public DateTimeOffset? ExpireTime { get; set; }
+
+    /// <summary>
+    /// 商品描述
+    /// </summary>
+    [SugarColumn(ColumnDescription = "商品描述")]
+    public string Description { get; set; }
+
+    /// <summary>
+    /// 场景信息
+    /// </summary>
+    [SugarColumn(ColumnDescription = "场景信息")]
+    public string Scene { get; set; }
+
+    /// <summary>
+    /// 附加数据
+    /// </summary>
+    [SugarColumn(ColumnDescription = "附加数据")]
+    public string Attachment { get; set; }
+
+    /// <summary>
+    /// 优惠标记
+    /// </summary>
+    [SugarColumn(ColumnDescription = "优惠标记")]
+    public string GoodsTag { get; set; }
+
+    /// <summary>
+    /// 结算信息。
+    /// </summary>
+    public string Settlement { get; set; }
+
+    /// <summary>
+    /// 回调通知地址
+    /// </summary>
+    public string NotifyUrl { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注")]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 微信OpenId标识
+    /// </summary>
+    [SugarColumn(ColumnDescription = "微信OpenId标识")]
+    public string OpenId { get; set; }
+
+    /// <summary>
+    /// 关联微信用户
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public WechatUser WechatUser { get; set; }
+
+    /// <summary>
+    /// 子商户号
+    /// </summary>
+    public string SubMerchantId { get; set; }
+
+    /// <summary>
+    /// 子商户AppId
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("sub_appid")]
+    [System.Text.Json.Serialization.JsonPropertyName("sub_appid")]
+    public string SubAppId { get; set; }
+
+    /// <summary>
+    /// 子商户唯一标识
+    /// </summary>
+    [SugarColumn(ColumnDescription = "子商户唯一标识")]
+    public string SubOpenId { get; set; }
 }

+ 118 - 122
Admin.NET/Admin.NET.Core/Entity/WechatUser.cs

@@ -1,125 +1,121 @@
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
-
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 微信用户表
+/// </summary>
+[SugarTable("wechat_user", "微信用户表")]
+[SqlSugarEntity]
+public class WechatUser : EntityBase
 {
     /// <summary>
-    /// 微信用户表
-    /// </summary>
-    [SugarTable("wechat_user", "微信用户表")]
-    [SqlSugarEntity]
-    public class WechatUser : EntityBase
-    {
-        /// <summary>
-        /// 关联系统用户Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "关联系统用户Id")]
-        public long UserId { get; set; }
-
-        /// <summary>
-        /// 关联系统用户
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public SysPos SysPos { get; set; }
-
-        /// <summary>
-        /// 第三方登录类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "第三方登录类型")]
-        public WeChatUserTypeEnum Type { get; set; } = WeChatUserTypeEnum.微信公众号;
-
-        /// <summary>
-        /// OpenId
-        /// </summary>
-        [SugarColumn(ColumnDescription = "OpenId")]
-        [Required, MaxLength(50)]
-        public string OpenId { get; set; }
-
-        /// <summary>
-        /// 缓存key
-        /// </summary>
-        [SugarColumn(ColumnDescription = "缓存key")]
-        [MaxLength(255)]
-        public string SessionKey { get; set; }
-
-        /// <summary>
-        /// UnionId
-        /// </summary>
-        [SugarColumn(ColumnDescription = "UnionId")]
-        [MaxLength(50)]
-        public string UnionId { get; set; }
-
-        /// <summary>
-        /// 昵称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "昵称")]
-        [MaxLength(50)]
-        public string NickName { get; set; }
-
-        /// <summary>
-        /// 头像
-        /// </summary>
-        [SugarColumn(ColumnDescription = "头像")]
-        [MaxLength(255)]
-        public string Avatar { get; set; }
-
-        /// <summary>
-        /// 手机号码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "手机号码")]
-        [MaxLength(20)]
-        public string Mobile { get; set; }
-
-        /// <summary>
-        /// 性别
-        /// </summary>
-        [SugarColumn(ColumnDescription = "性别")]
-        public int? Sex { get; set; }
-
-        /// <summary>
-        /// 语言
-        /// </summary>
-        [SugarColumn(ColumnDescription = "语言")]
-        [MaxLength(50)]
-        public string Language { get; set; }
-
-        /// <summary>
-        /// 城市
-        /// </summary>
-        [SugarColumn(ColumnDescription = "城市")]
-        [MaxLength(80)]
-        public string City { get; set; }
-
-        /// <summary>
-        /// 省
-        /// </summary>
-        [SugarColumn(ColumnDescription = "省")]
-        [MaxLength(80)]
-        public string Province { get; set; }
-
-        /// <summary>
-        /// 国家
-        /// </summary>
-        [SugarColumn(ColumnDescription = "国家")]
-        [MaxLength(80)]
-        public string Country { get; set; }
-
-        /// <summary>
-        /// AccessToken
-        /// </summary>
-        [SugarColumn(ColumnDescription = "AccessToken")]
-        public string AccessToken { get; set; }
-
-        /// <summary>
-        /// RefreshToken
-        /// </summary>
-        [SugarColumn(ColumnDescription = "RefreshToken")]
-        public string RefreshToken { get; set; }
-
-        /// <summary>
-        /// ExpiresIn
-        /// </summary>
-        [SugarColumn(ColumnDescription = "ExpiresIn")]
-        public int ExpiresIn { get; set; }
-    }
+    /// 关联系统用户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "关联系统用户Id")]
+    public long UserId { get; set; }
+
+    /// <summary>
+    /// 关联系统用户
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public SysPos SysPos { get; set; }
+
+    /// <summary>
+    /// 第三方登录类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "第三方登录类型")]
+    public WeChatUserTypeEnum Type { get; set; } = WeChatUserTypeEnum.微信公众号;
+
+    /// <summary>
+    /// OpenId
+    /// </summary>
+    [SugarColumn(ColumnDescription = "OpenId")]
+    [Required, MaxLength(50)]
+    public string OpenId { get; set; }
+
+    /// <summary>
+    /// 缓存key
+    /// </summary>
+    [SugarColumn(ColumnDescription = "缓存key")]
+    [MaxLength(255)]
+    public string SessionKey { get; set; }
+
+    /// <summary>
+    /// UnionId
+    /// </summary>
+    [SugarColumn(ColumnDescription = "UnionId")]
+    [MaxLength(50)]
+    public string UnionId { get; set; }
+
+    /// <summary>
+    /// 昵称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "昵称")]
+    [MaxLength(50)]
+    public string NickName { get; set; }
+
+    /// <summary>
+    /// 头像
+    /// </summary>
+    [SugarColumn(ColumnDescription = "头像")]
+    [MaxLength(255)]
+    public string Avatar { get; set; }
+
+    /// <summary>
+    /// 手机号码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "手机号码")]
+    [MaxLength(20)]
+    public string Mobile { get; set; }
+
+    /// <summary>
+    /// 性别
+    /// </summary>
+    [SugarColumn(ColumnDescription = "性别")]
+    public int? Sex { get; set; }
+
+    /// <summary>
+    /// 语言
+    /// </summary>
+    [SugarColumn(ColumnDescription = "语言")]
+    [MaxLength(50)]
+    public string Language { get; set; }
+
+    /// <summary>
+    /// 城市
+    /// </summary>
+    [SugarColumn(ColumnDescription = "城市")]
+    [MaxLength(80)]
+    public string City { get; set; }
+
+    /// <summary>
+    /// 省
+    /// </summary>
+    [SugarColumn(ColumnDescription = "省")]
+    [MaxLength(80)]
+    public string Province { get; set; }
+
+    /// <summary>
+    /// 国家
+    /// </summary>
+    [SugarColumn(ColumnDescription = "国家")]
+    [MaxLength(80)]
+    public string Country { get; set; }
+
+    /// <summary>
+    /// AccessToken
+    /// </summary>
+    [SugarColumn(ColumnDescription = "AccessToken")]
+    public string AccessToken { get; set; }
+
+    /// <summary>
+    /// RefreshToken
+    /// </summary>
+    [SugarColumn(ColumnDescription = "RefreshToken")]
+    public string RefreshToken { get; set; }
+
+    /// <summary>
+    /// ExpiresIn
+    /// </summary>
+    [SugarColumn(ColumnDescription = "ExpiresIn")]
+    public int ExpiresIn { get; set; }
 }

+ 13 - 16
Admin.NET/Admin.NET.Core/Enum/CacheTypeEnum.cs

@@ -1,22 +1,19 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 缓存类型枚举
+/// </summary>
+public enum CacheTypeEnum
 {
     /// <summary>
-    /// 缓存类型枚举
+    /// 内存缓存
     /// </summary>
-    public enum CacheTypeEnum
-    {
-        /// <summary>
-        /// 内存缓存
-        /// </summary>
-        [Description("内存缓存")]
-        MemoryCache,
+    [Description("内存缓存")]
+    MemoryCache,
 
-        /// <summary>
-        /// Redis缓存
-        /// </summary>
-        [Description("Redis缓存")]
-        RedisCache
-    }
+    /// <summary>
+    /// Redis缓存
+    /// </summary>
+    [Description("Redis缓存")]
+    RedisCache
 }

+ 18 - 21
Admin.NET/Admin.NET.Core/Enum/CardTypeEnum.cs

@@ -1,28 +1,25 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 证件类型枚举
+/// </summary>
+public enum CardTypeEnum
 {
     /// <summary>
-    /// 证件类型枚举
+    /// 身份证
     /// </summary>
-    public enum CardTypeEnum
-    {
-        /// <summary>
-        /// 身份证
-        /// </summary>
-        [Description("身份证")]
-        IDCard = 0,
+    [Description("身份证")]
+    IDCard = 0,
 
-        /// <summary>
-        /// 港澳台通行证
-        /// </summary>
-        [Description("港澳台通行证")]
-        GATCard = 1,
+    /// <summary>
+    /// 港澳台通行证
+    /// </summary>
+    [Description("港澳台通行证")]
+    GATCard = 1,
 
-        /// <summary>
-        /// 外国人居留证
-        /// </summary>
-        [Description("外国人居留证")]
-        ForeignCard = 2
-    }
+    /// <summary>
+    /// 外国人居留证
+    /// </summary>
+    [Description("外国人居留证")]
+    ForeignCard = 2
 }

+ 68 - 71
Admin.NET/Admin.NET.Core/Enum/DataOpTypeEnum.cs

@@ -1,88 +1,85 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 数据操作类型枚举
+/// </summary>
+public enum DataOpTypeEnum
 {
     /// <summary>
-    /// 数据操作类型枚举
+    /// 其它
     /// </summary>
-    public enum DataOpTypeEnum
-    {
-        /// <summary>
-        /// 其它
-        /// </summary>
-        [Description("其它")]
-        Other,
+    [Description("其它")]
+    Other,
 
-        /// <summary>
-        /// 增加
-        /// </summary>
-        [Description("增加")]
-        Add,
+    /// <summary>
+    /// 增加
+    /// </summary>
+    [Description("增加")]
+    Add,
 
-        /// <summary>
-        /// 删除
-        /// </summary>
-        [Description("删除")]
-        Delete,
+    /// <summary>
+    /// 删除
+    /// </summary>
+    [Description("删除")]
+    Delete,
 
-        /// <summary>
-        /// 编辑
-        /// </summary>
-        [Description("编辑")]
-        Edit,
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    [Description("编辑")]
+    Edit,
 
-        /// <summary>
-        /// 更新
-        /// </summary>
-        [Description("更新")]
-        Update,
+    /// <summary>
+    /// 更新
+    /// </summary>
+    [Description("更新")]
+    Update,
 
-        /// <summary>
-        /// 查询
-        /// </summary>
-        [Description("查询")]
-        Query,
+    /// <summary>
+    /// 查询
+    /// </summary>
+    [Description("查询")]
+    Query,
 
-        /// <summary>
-        /// 详情
-        /// </summary>
-        [Description("详情")]
-        Detail,
+    /// <summary>
+    /// 详情
+    /// </summary>
+    [Description("详情")]
+    Detail,
 
-        /// <summary>
-        /// 树
-        /// </summary>
-        [Description("树")]
-        Tree,
+    /// <summary>
+    /// 树
+    /// </summary>
+    [Description("树")]
+    Tree,
 
-        /// <summary>
-        /// 导入
-        /// </summary>
-        [Description("导入")]
-        Import,
+    /// <summary>
+    /// 导入
+    /// </summary>
+    [Description("导入")]
+    Import,
 
-        /// <summary>
-        /// 导出
-        /// </summary>
-        [Description("导出")]
-        Export,
+    /// <summary>
+    /// 导出
+    /// </summary>
+    [Description("导出")]
+    Export,
 
-        /// <summary>
-        /// 授权
-        /// </summary>
-        [Description("授权")]
-        Grant,
+    /// <summary>
+    /// 授权
+    /// </summary>
+    [Description("授权")]
+    Grant,
 
-        /// <summary>
-        /// 强退
-        /// </summary>
-        [Description("强退")]
-        Force,
+    /// <summary>
+    /// 强退
+    /// </summary>
+    [Description("强退")]
+    Force,
 
-        /// <summary>
-        /// 清空
-        /// </summary>
-        [Description("清空")]
-        Clean
-    }
+    /// <summary>
+    /// 清空
+    /// </summary>
+    [Description("清空")]
+    Clean
 }

+ 28 - 31
Admin.NET/Admin.NET.Core/Enum/DataScopeEnum.cs

@@ -1,40 +1,37 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 角色数据范围枚举
+/// </summary>
+public enum DataScopeEnum
 {
     /// <summary>
-    /// 角色数据范围枚举
+    /// 全部数据
     /// </summary>
-    public enum DataScopeEnum
-    {
-        /// <summary>
-        /// 全部数据
-        /// </summary>
-        [Description("全部数据")]
-        All = 1,
+    [Description("全部数据")]
+    All = 1,
 
-        /// <summary>
-        /// 本部门及以下数据
-        /// </summary>
-        [Description("本部门及以下数据")]
-        Dept_with_child = 2,
+    /// <summary>
+    /// 本部门及以下数据
+    /// </summary>
+    [Description("本部门及以下数据")]
+    Dept_with_child = 2,
 
-        /// <summary>
-        /// 本部门数据
-        /// </summary>
-        [Description("本部门数据")]
-        Dept = 3,
+    /// <summary>
+    /// 本部门数据
+    /// </summary>
+    [Description("本部门数据")]
+    Dept = 3,
 
-        /// <summary>
-        /// 仅本人数据
-        /// </summary>
-        [Description("仅本人数据")]
-        Self = 4,
+    /// <summary>
+    /// 仅本人数据
+    /// </summary>
+    [Description("仅本人数据")]
+    Self = 4,
 
-        /// <summary>
-        /// 自定义数据
-        /// </summary>
-        [Description("自定义数据")]
-        Define = 5
-    }
+    /// <summary>
+    /// 自定义数据
+    /// </summary>
+    [Description("自定义数据")]
+    Define = 5
 }

+ 472 - 475
Admin.NET/Admin.NET.Core/Enum/ErrorCodeEnum.cs

@@ -1,479 +1,476 @@
-using Furion.FriendlyException;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统错误码
+/// </summary>
+[ErrorCodeType]
+public enum ErrorCodeEnum
 {
     /// <summary>
-    /// 系统错误码
-    /// </summary>
-    [ErrorCodeType]
-    public enum ErrorCodeEnum
-    {
-        /// <summary>
-        /// 用户名或密码不正确
-        /// </summary>
-        [ErrorCodeItemMetadata("用户名或密码不正确")]
-        D1000,
-
-        /// <summary>
-        /// 非法操作!禁止删除自己
-        /// </summary>
-        [ErrorCodeItemMetadata("非法操作,禁止删除自己")]
-        D1001,
-
-        /// <summary>
-        /// 记录不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("记录不存在")]
-        D1002,
-
-        /// <summary>
-        /// 账号已存在
-        /// </summary>
-        [ErrorCodeItemMetadata("账号已存在")]
-        D1003,
-
-        /// <summary>
-        /// 旧密码不匹配
-        /// </summary>
-        [ErrorCodeItemMetadata("旧密码输入错误")]
-        D1004,
-
-        /// <summary>
-        /// 测试数据禁止更改admin密码
-        /// </summary>
-        [ErrorCodeItemMetadata("测试数据禁止更改用户【admin】密码")]
-        D1005,
-
-        /// <summary>
-        /// 数据已存在
-        /// </summary>
-        [ErrorCodeItemMetadata("数据已存在")]
-        D1006,
-
-        /// <summary>
-        /// 数据不存在或含有关联引用,禁止删除
-        /// </summary>
-        [ErrorCodeItemMetadata("数据不存在或含有关联引用,禁止删除")]
-        D1007,
-
-        /// <summary>
-        /// 禁止为管理员分配角色
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止为管理员分配角色")]
-        D1008,
-
-        /// <summary>
-        /// 重复数据或记录含有不存在数据
-        /// </summary>
-        [ErrorCodeItemMetadata("重复数据或记录含有不存在数据")]
-        D1009,
-
-        /// <summary>
-        /// 禁止为超级管理员角色分配权限
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止为超级管理员角色分配权限")]
-        D1010,
-
-        /// <summary>
-        /// 非法数据
-        /// </summary>
-        [ErrorCodeItemMetadata("非法数据")]
-        D1011,
-
-        /// <summary>
-        /// Id不能为空
-        /// </summary>
-        [ErrorCodeItemMetadata("Id不能为空")]
-        D1012,
-
-        /// <summary>
-        /// 所属机构不在自己的数据范围内
-        /// </summary>
-        [ErrorCodeItemMetadata("没有权限操作该数据")]
-        D1013,
-
-        /// <summary>
-        /// 禁止删除超级管理员
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止删除超级管理员")]
-        D1014,
-
-        /// <summary>
-        /// 禁止修改超级管理员状态
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止修改超级管理员状态")]
-        D1015,
-
-        /// <summary>
-        /// 没有权限
-        /// </summary>
-        [ErrorCodeItemMetadata("没有权限")]
-        D1016,
-
-        /// <summary>
-        /// 账号已冻结
-        /// </summary>
-        [ErrorCodeItemMetadata("账号已冻结")]
-        D1017,
-
-        /// <summary>
-        /// 禁止删除管理员
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止删除管理员")]
-        D1018,
-
-        /// <summary>
-        /// 禁止删除系统管理员角色(sys_manager_role)
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止删除系统管理员角色(sys_manager_role)")]
-        D1019,
-
-        /// <summary>
-        /// 禁止修改系统管理员角色(sys_manager_role)
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止修改系统管理员角色(sys_manager_role)")]
-        D1020,
-
-        /// <summary>
-        /// 禁止为系统管理员角色(sys_manager_role)分配权限
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止为系统管理员角色(sys_manager_role)分配权限")]
-        D1021,
-
-        /// <summary>
-        /// 禁止为超级管理员分配角色
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止为超级管理员分配角色")]
-        D1022,
-
-        /// <summary>
-        /// 禁止删除默认租户
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止删除默认租户")]
-        D1023,
-
-        /// <summary>
-        /// 父机构不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("父机构不存在")]
-        D2000,
-
-        /// <summary>
-        /// 当前机构Id不能与父机构Id相同
-        /// </summary>
-        [ErrorCodeItemMetadata("当前机构Id不能与父机构Id相同")]
-        D2001,
-
-        /// <summary>
-        /// 已有相同组织机构,编码或名称相同
-        /// </summary>
-        [ErrorCodeItemMetadata("已有相同组织机构,编码或名称相同")]
-        D2002,
-
-        /// <summary>
-        /// 没有权限操作机构
-        /// </summary>
-        [ErrorCodeItemMetadata("没有权限操作机构")]
-        D2003,
-
-        /// <summary>
-        /// 该机构下有用户禁止删除
-        /// </summary>
-        [ErrorCodeItemMetadata("该机构下有用户禁止删除")]
-        D2004,
-
-        /// <summary>
-        /// 附属机构下有用户禁止删除
-        /// </summary>
-        [ErrorCodeItemMetadata("附属机构下有用户禁止删除")]
-        D2005,
-
-        /// <summary>
-        /// 只能增加下级机构
-        /// </summary>
-        [ErrorCodeItemMetadata("只能增加下级机构")]
-        D2006,
-
-        /// <summary>
-        /// 字典类型不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("字典类型不存在")]
-        D3000,
-
-        /// <summary>
-        /// 字典类型已存在
-        /// </summary>
-        [ErrorCodeItemMetadata("字典类型已存在,名称或编码重复")]
-        D3001,
-
-        /// <summary>
-        /// 字典类型下面有字典值禁止删除
-        /// </summary>
-        [ErrorCodeItemMetadata("字典类型下面有字典值禁止删除")]
-        D3002,
-
-        /// <summary>
-        /// 字典值已存在
-        /// </summary>
-        [ErrorCodeItemMetadata("字典值已存在,名称或编码重复")]
-        D3003,
-
-        /// <summary>
-        /// 字典值不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("字典值不存在")]
-        D3004,
-
-        /// <summary>
-        /// 字典状态错误
-        /// </summary>
-        [ErrorCodeItemMetadata("字典状态错误")]
-        D3005,
-
-        /// <summary>
-        /// 菜单已存在
-        /// </summary>
-        [ErrorCodeItemMetadata("菜单已存在")]
-        D4000,
-
-        /// <summary>
-        /// 路由地址为空
-        /// </summary>
-        [ErrorCodeItemMetadata("路由地址为空")]
-        D4001,
-
-        /// <summary>
-        /// 打开方式为空
-        /// </summary>
-        [ErrorCodeItemMetadata("打开方式为空")]
-        D4002,
-
-        /// <summary>
-        /// 权限标识格式为空
-        /// </summary>
-        [ErrorCodeItemMetadata("权限标识格式为空")]
-        D4003,
-
-        /// <summary>
-        /// 权限标识格式错误
-        /// </summary>
-        [ErrorCodeItemMetadata("权限标识格式错误 如xxx:xxx")]
-        D4004,
-
-        /// <summary>
-        /// 权限不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("权限不存在")]
-        D4005,
-
-        /// <summary>
-        /// 父级菜单不能为当前节点,请重新选择父级菜单
-        /// </summary>
-        [ErrorCodeItemMetadata("父级菜单不能为当前节点,请重新选择父级菜单")]
-        D4006,
-
-        /// <summary>
-        /// 不能移动根节点
-        /// </summary>
-        [ErrorCodeItemMetadata("不能移动根节点")]
-        D4007,
-
-        /// <summary>
-        /// 已存在同名或同编码应用
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在同名或同编码应用")]
-        D5000,
-
-        /// <summary>
-        /// 默认激活系统只能有一个
-        /// </summary>
-        [ErrorCodeItemMetadata("默认激活系统只能有一个")]
-        D5001,
-
-        /// <summary>
-        /// 该应用下有菜单禁止删除
-        /// </summary>
-        [ErrorCodeItemMetadata("该应用下有菜单禁止删除")]
-        D5002,
-
-        /// <summary>
-        /// 已存在同名或同编码应用
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在同名或同编码应用")]
-        D5003,
-
-        /// <summary>
-        /// 已存在同名或同编码职位
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在同名或同编码职位")]
-        D6000,
-
-        /// <summary>
-        /// 该职位下有用户禁止删除
-        /// </summary>
-        [ErrorCodeItemMetadata("该职位下有用户禁止删除")]
-        D6001,
-
-        /// <summary>
-        /// 通知公告状态错误
-        /// </summary>
-        [ErrorCodeItemMetadata("通知公告状态错误")]
-        D7000,
-
-        /// <summary>
-        /// 通知公告删除失败
-        /// </summary>
-        [ErrorCodeItemMetadata("通知公告删除失败")]
-        D7001,
-
-        /// <summary>
-        /// 通知公告编辑失败
-        /// </summary>
-        [ErrorCodeItemMetadata("通知公告编辑失败,类型必须为草稿")]
-        D7002,
-
-        /// <summary>
-        /// 通知公告操作失败,非发布者不能进行操作
-        /// </summary>
-        [ErrorCodeItemMetadata("通知公告操作失败,非发布者不能进行操作")]
-        D7003,
-
-        /// <summary>
-        /// 文件不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("文件不存在")]
-        D8000,
-
-        /// <summary>
-        /// 不允许的文件类型
-        /// </summary>
-        [ErrorCodeItemMetadata("不允许的文件类型")]
-        D8001,
-
-        /// <summary>
-        /// 文件超过允许大小
-        /// </summary>
-        [ErrorCodeItemMetadata("文件超过允许大小")]
-        D8002,
-
-        /// <summary>
-        /// 已存在同名或同编码参数配置
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在同名或同编码参数配置")]
-        D9000,
-
-        /// <summary>
-        /// 禁止删除系统参数
-        /// </summary>
-        [ErrorCodeItemMetadata("禁止删除系统参数")]
-        D9001,
-
-        /// <summary>
-        /// 已存在同名任务调度
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在同名任务调度")]
-        D1100,
-
-        /// <summary>
-        /// 任务调度不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("任务调度不存在")]
-        D1101,
-
-        /// <summary>
-        /// 演示环境禁止修改数据
-        /// </summary>
-        [ErrorCodeItemMetadata("演示环境禁止修改数据")]
-        D1200,
-
-        /// <summary>
-        /// 已存在同名或同管理员或同主机租户
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在同名或同主机租户")]
-        D1300,
-
-        /// <summary>
-        /// 该表代码模板已经生成过
-        /// </summary>
-        [ErrorCodeItemMetadata("该表代码模板已经生成过")]
-        D1400,
-
-        /// <summary>
-        /// 该类型不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("该类型不存在")]
-        D1501,
-
-        /// <summary>
-        /// 该字段不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("该字段不存在")]
-        D1502,
-
-        /// <summary>
-        /// 该类型不是枚举类型
-        /// </summary>
-        [ErrorCodeItemMetadata("该类型不是枚举类型")]
-        D1503,
-
-        /// <summary>
-        /// 该实体不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("该实体不存在")]
-        D1504,
-
-        /// <summary>
-        /// 父菜单不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("父菜单不存在")]
-        D1505,
-
-        /// <summary>
-        /// 父资源不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("父资源不存在")]
-        D1600,
-
-        /// <summary>
-        /// 当前资源Id不能与父资源Id相同
-        /// </summary>
-        [ErrorCodeItemMetadata("当前资源Id不能与父资源Id相同")]
-        D1601,
-
-        /// <summary>
-        /// 已有相同编码或名称
-        /// </summary>
-        [ErrorCodeItemMetadata("已有相同编码或名称")]
-        D1602,
-
-        /// <summary>
-        /// 已存在同名或同编码项目
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在同名或同编码项目")]
-        xg1000,
-
-        /// <summary>
-        /// 已存在相同证件号码人员
-        /// </summary>
-        [ErrorCodeItemMetadata("已存在相同证件号码人员")]
-        xg1001,
-
-        /// <summary>
-        /// 检测数据不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("检测数据不存在")]
-        xg1002,
-
-        /// <summary>
-        /// 请添加数据列
-        /// </summary>
-        [ErrorCodeItemMetadata("请添加数据列")]
-        db1000,
-
-        /// <summary>
-        /// 数据表不存在
-        /// </summary>
-        [ErrorCodeItemMetadata("数据表不存在")]
-        db1001
-    }
+    /// 用户名或密码不正确
+    /// </summary>
+    [ErrorCodeItemMetadata("用户名或密码不正确")]
+    D1000,
+
+    /// <summary>
+    /// 非法操作!禁止删除自己
+    /// </summary>
+    [ErrorCodeItemMetadata("非法操作,禁止删除自己")]
+    D1001,
+
+    /// <summary>
+    /// 记录不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("记录不存在")]
+    D1002,
+
+    /// <summary>
+    /// 账号已存在
+    /// </summary>
+    [ErrorCodeItemMetadata("账号已存在")]
+    D1003,
+
+    /// <summary>
+    /// 旧密码不匹配
+    /// </summary>
+    [ErrorCodeItemMetadata("旧密码输入错误")]
+    D1004,
+
+    /// <summary>
+    /// 测试数据禁止更改admin密码
+    /// </summary>
+    [ErrorCodeItemMetadata("测试数据禁止更改用户【admin】密码")]
+    D1005,
+
+    /// <summary>
+    /// 数据已存在
+    /// </summary>
+    [ErrorCodeItemMetadata("数据已存在")]
+    D1006,
+
+    /// <summary>
+    /// 数据不存在或含有关联引用,禁止删除
+    /// </summary>
+    [ErrorCodeItemMetadata("数据不存在或含有关联引用,禁止删除")]
+    D1007,
+
+    /// <summary>
+    /// 禁止为管理员分配角色
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止为管理员分配角色")]
+    D1008,
+
+    /// <summary>
+    /// 重复数据或记录含有不存在数据
+    /// </summary>
+    [ErrorCodeItemMetadata("重复数据或记录含有不存在数据")]
+    D1009,
+
+    /// <summary>
+    /// 禁止为超级管理员角色分配权限
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止为超级管理员角色分配权限")]
+    D1010,
+
+    /// <summary>
+    /// 非法数据
+    /// </summary>
+    [ErrorCodeItemMetadata("非法数据")]
+    D1011,
+
+    /// <summary>
+    /// Id不能为空
+    /// </summary>
+    [ErrorCodeItemMetadata("Id不能为空")]
+    D1012,
+
+    /// <summary>
+    /// 所属机构不在自己的数据范围内
+    /// </summary>
+    [ErrorCodeItemMetadata("没有权限操作该数据")]
+    D1013,
+
+    /// <summary>
+    /// 禁止删除超级管理员
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止删除超级管理员")]
+    D1014,
+
+    /// <summary>
+    /// 禁止修改超级管理员状态
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止修改超级管理员状态")]
+    D1015,
+
+    /// <summary>
+    /// 没有权限
+    /// </summary>
+    [ErrorCodeItemMetadata("没有权限")]
+    D1016,
+
+    /// <summary>
+    /// 账号已冻结
+    /// </summary>
+    [ErrorCodeItemMetadata("账号已冻结")]
+    D1017,
+
+    /// <summary>
+    /// 禁止删除管理员
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止删除管理员")]
+    D1018,
+
+    /// <summary>
+    /// 禁止删除系统管理员角色(sys_manager_role)
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止删除系统管理员角色(sys_manager_role)")]
+    D1019,
+
+    /// <summary>
+    /// 禁止修改系统管理员角色(sys_manager_role)
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止修改系统管理员角色(sys_manager_role)")]
+    D1020,
+
+    /// <summary>
+    /// 禁止为系统管理员角色(sys_manager_role)分配权限
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止为系统管理员角色(sys_manager_role)分配权限")]
+    D1021,
+
+    /// <summary>
+    /// 禁止为超级管理员分配角色
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止为超级管理员分配角色")]
+    D1022,
+
+    /// <summary>
+    /// 禁止删除默认租户
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止删除默认租户")]
+    D1023,
+
+    /// <summary>
+    /// 父机构不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("父机构不存在")]
+    D2000,
+
+    /// <summary>
+    /// 当前机构Id不能与父机构Id相同
+    /// </summary>
+    [ErrorCodeItemMetadata("当前机构Id不能与父机构Id相同")]
+    D2001,
+
+    /// <summary>
+    /// 已有相同组织机构,编码或名称相同
+    /// </summary>
+    [ErrorCodeItemMetadata("已有相同组织机构,编码或名称相同")]
+    D2002,
+
+    /// <summary>
+    /// 没有权限操作机构
+    /// </summary>
+    [ErrorCodeItemMetadata("没有权限操作机构")]
+    D2003,
+
+    /// <summary>
+    /// 该机构下有用户禁止删除
+    /// </summary>
+    [ErrorCodeItemMetadata("该机构下有用户禁止删除")]
+    D2004,
+
+    /// <summary>
+    /// 附属机构下有用户禁止删除
+    /// </summary>
+    [ErrorCodeItemMetadata("附属机构下有用户禁止删除")]
+    D2005,
+
+    /// <summary>
+    /// 只能增加下级机构
+    /// </summary>
+    [ErrorCodeItemMetadata("只能增加下级机构")]
+    D2006,
+
+    /// <summary>
+    /// 字典类型不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("字典类型不存在")]
+    D3000,
+
+    /// <summary>
+    /// 字典类型已存在
+    /// </summary>
+    [ErrorCodeItemMetadata("字典类型已存在,名称或编码重复")]
+    D3001,
+
+    /// <summary>
+    /// 字典类型下面有字典值禁止删除
+    /// </summary>
+    [ErrorCodeItemMetadata("字典类型下面有字典值禁止删除")]
+    D3002,
+
+    /// <summary>
+    /// 字典值已存在
+    /// </summary>
+    [ErrorCodeItemMetadata("字典值已存在,名称或编码重复")]
+    D3003,
+
+    /// <summary>
+    /// 字典值不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("字典值不存在")]
+    D3004,
+
+    /// <summary>
+    /// 字典状态错误
+    /// </summary>
+    [ErrorCodeItemMetadata("字典状态错误")]
+    D3005,
+
+    /// <summary>
+    /// 菜单已存在
+    /// </summary>
+    [ErrorCodeItemMetadata("菜单已存在")]
+    D4000,
+
+    /// <summary>
+    /// 路由地址为空
+    /// </summary>
+    [ErrorCodeItemMetadata("路由地址为空")]
+    D4001,
+
+    /// <summary>
+    /// 打开方式为空
+    /// </summary>
+    [ErrorCodeItemMetadata("打开方式为空")]
+    D4002,
+
+    /// <summary>
+    /// 权限标识格式为空
+    /// </summary>
+    [ErrorCodeItemMetadata("权限标识格式为空")]
+    D4003,
+
+    /// <summary>
+    /// 权限标识格式错误
+    /// </summary>
+    [ErrorCodeItemMetadata("权限标识格式错误 如xxx:xxx")]
+    D4004,
+
+    /// <summary>
+    /// 权限不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("权限不存在")]
+    D4005,
+
+    /// <summary>
+    /// 父级菜单不能为当前节点,请重新选择父级菜单
+    /// </summary>
+    [ErrorCodeItemMetadata("父级菜单不能为当前节点,请重新选择父级菜单")]
+    D4006,
+
+    /// <summary>
+    /// 不能移动根节点
+    /// </summary>
+    [ErrorCodeItemMetadata("不能移动根节点")]
+    D4007,
+
+    /// <summary>
+    /// 已存在同名或同编码应用
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名或同编码应用")]
+    D5000,
+
+    /// <summary>
+    /// 默认激活系统只能有一个
+    /// </summary>
+    [ErrorCodeItemMetadata("默认激活系统只能有一个")]
+    D5001,
+
+    /// <summary>
+    /// 该应用下有菜单禁止删除
+    /// </summary>
+    [ErrorCodeItemMetadata("该应用下有菜单禁止删除")]
+    D5002,
+
+    /// <summary>
+    /// 已存在同名或同编码应用
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名或同编码应用")]
+    D5003,
+
+    /// <summary>
+    /// 已存在同名或同编码职位
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名或同编码职位")]
+    D6000,
+
+    /// <summary>
+    /// 该职位下有用户禁止删除
+    /// </summary>
+    [ErrorCodeItemMetadata("该职位下有用户禁止删除")]
+    D6001,
+
+    /// <summary>
+    /// 通知公告状态错误
+    /// </summary>
+    [ErrorCodeItemMetadata("通知公告状态错误")]
+    D7000,
+
+    /// <summary>
+    /// 通知公告删除失败
+    /// </summary>
+    [ErrorCodeItemMetadata("通知公告删除失败")]
+    D7001,
+
+    /// <summary>
+    /// 通知公告编辑失败
+    /// </summary>
+    [ErrorCodeItemMetadata("通知公告编辑失败,类型必须为草稿")]
+    D7002,
+
+    /// <summary>
+    /// 通知公告操作失败,非发布者不能进行操作
+    /// </summary>
+    [ErrorCodeItemMetadata("通知公告操作失败,非发布者不能进行操作")]
+    D7003,
+
+    /// <summary>
+    /// 文件不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("文件不存在")]
+    D8000,
+
+    /// <summary>
+    /// 不允许的文件类型
+    /// </summary>
+    [ErrorCodeItemMetadata("不允许的文件类型")]
+    D8001,
+
+    /// <summary>
+    /// 文件超过允许大小
+    /// </summary>
+    [ErrorCodeItemMetadata("文件超过允许大小")]
+    D8002,
+
+    /// <summary>
+    /// 已存在同名或同编码参数配置
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名或同编码参数配置")]
+    D9000,
+
+    /// <summary>
+    /// 禁止删除系统参数
+    /// </summary>
+    [ErrorCodeItemMetadata("禁止删除系统参数")]
+    D9001,
+
+    /// <summary>
+    /// 已存在同名任务调度
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名任务调度")]
+    D1100,
+
+    /// <summary>
+    /// 任务调度不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("任务调度不存在")]
+    D1101,
+
+    /// <summary>
+    /// 演示环境禁止修改数据
+    /// </summary>
+    [ErrorCodeItemMetadata("演示环境禁止修改数据")]
+    D1200,
+
+    /// <summary>
+    /// 已存在同名或同管理员或同主机租户
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名或同主机租户")]
+    D1300,
+
+    /// <summary>
+    /// 该表代码模板已经生成过
+    /// </summary>
+    [ErrorCodeItemMetadata("该表代码模板已经生成过")]
+    D1400,
+
+    /// <summary>
+    /// 该类型不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("该类型不存在")]
+    D1501,
+
+    /// <summary>
+    /// 该字段不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("该字段不存在")]
+    D1502,
+
+    /// <summary>
+    /// 该类型不是枚举类型
+    /// </summary>
+    [ErrorCodeItemMetadata("该类型不是枚举类型")]
+    D1503,
+
+    /// <summary>
+    /// 该实体不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("该实体不存在")]
+    D1504,
+
+    /// <summary>
+    /// 父菜单不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("父菜单不存在")]
+    D1505,
+
+    /// <summary>
+    /// 父资源不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("父资源不存在")]
+    D1600,
+
+    /// <summary>
+    /// 当前资源Id不能与父资源Id相同
+    /// </summary>
+    [ErrorCodeItemMetadata("当前资源Id不能与父资源Id相同")]
+    D1601,
+
+    /// <summary>
+    /// 已有相同编码或名称
+    /// </summary>
+    [ErrorCodeItemMetadata("已有相同编码或名称")]
+    D1602,
+
+    /// <summary>
+    /// 已存在同名或同编码项目
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在同名或同编码项目")]
+    xg1000,
+
+    /// <summary>
+    /// 已存在相同证件号码人员
+    /// </summary>
+    [ErrorCodeItemMetadata("已存在相同证件号码人员")]
+    xg1001,
+
+    /// <summary>
+    /// 检测数据不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("检测数据不存在")]
+    xg1002,
+
+    /// <summary>
+    /// 请添加数据列
+    /// </summary>
+    [ErrorCodeItemMetadata("请添加数据列")]
+    db1000,
+
+    /// <summary>
+    /// 数据表不存在
+    /// </summary>
+    [ErrorCodeItemMetadata("数据表不存在")]
+    db1001
 }

+ 13 - 16
Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs

@@ -1,22 +1,19 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 性别枚举
+/// </summary>
+public enum GenderEnum
 {
     /// <summary>
-    /// 性别枚举
+    /// 男
     /// </summary>
-    public enum GenderEnum
-    {
-        /// <summary>
-        /// 男
-        /// </summary>
-        [Description("男")]
-        Male = 1,
+    [Description("男")]
+    Male = 1,
 
-        /// <summary>
-        /// 女
-        /// </summary>
-        [Description("女")]
-        Female = 2,
-    }
+    /// <summary>
+    /// 女
+    /// </summary>
+    [Description("女")]
+    Female = 2,
 }

+ 18 - 21
Admin.NET/Admin.NET.Core/Enum/JobStatusEnum.cs

@@ -1,28 +1,25 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 岗位状态枚举
+/// </summary>
+public enum JobStatusEnum
 {
     /// <summary>
-    /// 岗位状态枚举
+    /// 在职
     /// </summary>
-    public enum JobStatusEnum
-    {
-        /// <summary>
-        /// 在职
-        /// </summary>
-        [Description("在职")]
-        On = 1,
+    [Description("在职")]
+    On = 1,
 
-        /// <summary>
-        /// 离职
-        /// </summary>
-        [Description("离职")]
-        Off = 2,
+    /// <summary>
+    /// 离职
+    /// </summary>
+    [Description("离职")]
+    Off = 2,
 
-        /// <summary>
-        /// 请假
-        /// </summary>
-        [Description("请假")]
-        Leave = 3,
-    }
+    /// <summary>
+    /// 请假
+    /// </summary>
+    [Description("请假")]
+    Leave = 3,
 }

+ 28 - 31
Admin.NET/Admin.NET.Core/Enum/LoginTypeEnum.cs

@@ -1,40 +1,37 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 登录类型枚举
+/// </summary>
+public enum LoginTypeEnum
 {
     /// <summary>
-    /// 登录类型枚举
+    /// 登录
     /// </summary>
-    public enum LoginTypeEnum
-    {
-        /// <summary>
-        /// 登录
-        /// </summary>
-        [Description("登录")]
-        Login,
+    [Description("登录")]
+    Login,
 
-        /// <summary>
-        /// 退出
-        /// </summary>
-        [Description("退出")]
-        Logout,
+    /// <summary>
+    /// 退出
+    /// </summary>
+    [Description("退出")]
+    Logout,
 
-        /// <summary>
-        /// 注册
-        /// </summary>
-        [Description("注册")]
-        Register,
+    /// <summary>
+    /// 注册
+    /// </summary>
+    [Description("注册")]
+    Register,
 
-        /// <summary>
-        /// 改密
-        /// </summary>
-        [Description("改密")]
-        Change_password,
+    /// <summary>
+    /// 改密
+    /// </summary>
+    [Description("改密")]
+    Change_password,
 
-        /// <summary>
-        /// 三方授权登陆
-        /// </summary>
-        [Description("授权登陆")]
-        Authorized_login
-    }
+    /// <summary>
+    /// 三方授权登陆
+    /// </summary>
+    [Description("授权登陆")]
+    Authorized_login
 }

+ 18 - 21
Admin.NET/Admin.NET.Core/Enum/MenuTypeEnum.cs

@@ -1,28 +1,25 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统菜单类型枚举
+/// </summary>
+public enum MenuTypeEnum
 {
     /// <summary>
-    /// 系统菜单类型枚举
+    /// 目录
     /// </summary>
-    public enum MenuTypeEnum
-    {
-        /// <summary>
-        /// 目录
-        /// </summary>
-        [Description("目录")]
-        Dir = 1,
+    [Description("目录")]
+    Dir = 1,
 
-        /// <summary>
-        /// 菜单
-        /// </summary>
-        [Description("菜单")]
-        Menu = 2,
+    /// <summary>
+    /// 菜单
+    /// </summary>
+    [Description("菜单")]
+    Menu = 2,
 
-        /// <summary>
-        /// 按钮
-        /// </summary>
-        [Description("按钮")]
-        Btn = 3
-    }
+    /// <summary>
+    /// 按钮
+    /// </summary>
+    [Description("按钮")]
+    Btn = 3
 }

+ 23 - 26
Admin.NET/Admin.NET.Core/Enum/OrgTypeEnum.cs

@@ -1,34 +1,31 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 机构类型枚举
+/// </summary>
+public enum OrgTypeEnum
 {
     /// <summary>
-    /// 机构类型枚举
+    /// 品牌
     /// </summary>
-    public enum OrgTypeEnum
-    {
-        /// <summary>
-        /// 品牌
-        /// </summary>
-        [Description("品牌")]
-        Brand,
+    [Description("品牌")]
+    Brand,
 
-        /// <summary>
-        /// 总店(加盟/直营)
-        /// </summary>
-        [Description("总店(加盟/直营)")]
-        Head,
+    /// <summary>
+    /// 总店(加盟/直营)
+    /// </summary>
+    [Description("总店(加盟/直营)")]
+    Head,
 
-        /// <summary>
-        /// 直营店
-        /// </summary>
-        [Description("直营店")]
-        Direct,
+    /// <summary>
+    /// 直营店
+    /// </summary>
+    [Description("直营店")]
+    Direct,
 
-        /// <summary>
-        /// 加盟店
-        /// </summary>
-        [Description("加盟店")]
-        Franchised
-    }
+    /// <summary>
+    /// 加盟店
+    /// </summary>
+    [Description("加盟店")]
+    Franchised
 }

+ 24 - 25
Admin.NET/Admin.NET.Core/Enum/RequestTypeEnum.cs

@@ -1,33 +1,32 @@
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// HTTP请求类型
+/// </summary>
+public enum RequestTypeEnum
 {
     /// <summary>
-    /// HTTP请求类型
+    /// 执行内部方法
     /// </summary>
-    public enum RequestTypeEnum
-    {
-        /// <summary>
-        /// 执行内部方法
-        /// </summary>
-        Run = 0,
+    Run = 0,
 
-        /// <summary>
-        /// GET
-        /// </summary>
-        Get = 1,
+    /// <summary>
+    /// GET
+    /// </summary>
+    Get = 1,
 
-        /// <summary>
-        /// POST
-        /// </summary>
-        Post = 2,
+    /// <summary>
+    /// POST
+    /// </summary>
+    Post = 2,
 
-        /// <summary>
-        /// PUT
-        /// </summary>
-        Put = 3,
+    /// <summary>
+    /// PUT
+    /// </summary>
+    Put = 3,
 
-        /// <summary>
-        /// DELETE
-        /// </summary>
-        Delete = 4
-    }
+    /// <summary>
+    /// DELETE
+    /// </summary>
+    Delete = 4
 }

+ 18 - 21
Admin.NET/Admin.NET.Core/Enum/RoleTypeEnum.cs

@@ -1,28 +1,25 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 角色类型枚举
+/// </summary>
+public enum RoleTypeEnum
 {
     /// <summary>
-    /// 角色类型枚举
+    /// 集团角色
     /// </summary>
-    public enum RoleTypeEnum
-    {
-        /// <summary>
-        /// 集团角色
-        /// </summary>
-        [Description("集团角色")]
-        Group,
+    [Description("集团角色")]
+    Group,
 
-        /// <summary>
-        /// 加盟商角色
-        /// </summary>
-        [Description("加盟商角色")]
-        Join,
+    /// <summary>
+    /// 加盟商角色
+    /// </summary>
+    [Description("加盟商角色")]
+    Join,
 
-        /// <summary>
-        /// 门店角色
-        /// </summary>
-        [Description("门店角色")]
-        Store
-    }
+    /// <summary>
+    /// 门店角色
+    /// </summary>
+    [Description("门店角色")]
+    Store
 }

+ 13 - 16
Admin.NET/Admin.NET.Core/Enum/RunModeEnum.cs

@@ -1,22 +1,19 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 运行模式枚举
+/// </summary>
+public enum RunModeEnum
 {
     /// <summary>
-    /// 运行模式枚举
+    /// 账号模式
     /// </summary>
-    public enum RunModeEnum
-    {
-        /// <summary>
-        /// 账号模式
-        /// </summary>
-        [Description("账号模式")]
-        Account = 1,
+    [Description("账号模式")]
+    Account = 1,
 
-        /// <summary>
-        /// 三方授权
-        /// </summary>
-        [Description("三方授权")]
-        OpenID = 2
-    }
+    /// <summary>
+    /// 三方授权
+    /// </summary>
+    [Description("三方授权")]
+    OpenID = 2
 }

+ 13 - 16
Admin.NET/Admin.NET.Core/Enum/StatusEnum.cs

@@ -1,22 +1,19 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 通用状态枚举
+/// </summary>
+public enum StatusEnum
 {
     /// <summary>
-    /// 通用状态枚举
+    /// 启用
     /// </summary>
-    public enum StatusEnum
-    {
-        /// <summary>
-        /// 启用
-        /// </summary>
-        [Description("启用")]
-        Enable = 1,
+    [Description("启用")]
+    Enable = 1,
 
-        /// <summary>
-        /// 停用
-        /// </summary>
-        [Description("停用")]
-        Disable = 2,
-    }
+    /// <summary>
+    /// 停用
+    /// </summary>
+    [Description("停用")]
+    Disable = 2,
 }

+ 18 - 21
Admin.NET/Admin.NET.Core/Enum/UserTypeEnum.cs

@@ -1,28 +1,25 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 账号类型枚举
+/// </summary>
+public enum UserTypeEnum
 {
     /// <summary>
-    /// 账号类型枚举
+    /// 管理员
     /// </summary>
-    public enum UserTypeEnum
-    {
-        /// <summary>
-        /// 管理员
-        /// </summary>
-        [Description("管理员")]
-        Admin = 1,
+    [Description("管理员")]
+    Admin = 1,
 
-        /// <summary>
-        /// 普通账号
-        /// </summary>
-        [Description("普通账号")]
-        None = 2,
+    /// <summary>
+    /// 普通账号
+    /// </summary>
+    [Description("普通账号")]
+    None = 2,
 
-        /// <summary>
-        /// 超级管理员
-        /// </summary>
-        [Description("超级管理员")]
-        SuperAdmin = 999,
-    }
+    /// <summary>
+    /// 超级管理员
+    /// </summary>
+    [Description("超级管理员")]
+    SuperAdmin = 999,
 }

+ 263 - 264
Admin.NET/Admin.NET.Core/Enum/WeChatReturnCodeEnum.cs

@@ -1,283 +1,282 @@
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 微信开发返回码
+/// </summary>
+public enum WeChatReturnCodeEnum
 {
+    SenparcWeixinSDK配置错误 = -99, // 0xFFFFFF9D
+    系统繁忙此时请开发者稍候再试 = -1, // 0xFFFFFFFF
+    请求成功 = 0,
+    工商数据返回_企业已注销 = 101, // 0x00000065
+    工商数据返回_企业不存在或企业信息未更新 = 102, // 0x00000066
+    工商数据返回_企业法定代表人姓名不一致 = 103, // 0x00000067
+    工商数据返回_企业法定代表人身份证号码不一致 = 104, // 0x00000068
+    法定代表人身份证号码_工商数据未更新_请5_15个工作日之后尝试 = 105, // 0x00000069
+    工商数据返回_企业信息或法定代表人信息不一致 = 1000, // 0x000003E8
+    对方不是粉丝 = 10700, // 0x000029CC
+    发送消息失败_对方关闭了接收消息 = 10703, // 0x000029CF
+    发送消息失败_48小时内用户未互动 = 10706, // 0x000029D2
+    POST参数非法 = 20002, // 0x00004E22
+    获取access_token时AppSecret错误或者access_token无效 = 40001, // 0x00009C41
+
     /// <summary>
-    /// 微信开发返回码
+    /// <para>公众号:不合法的凭证类型</para>
+    /// <para>小程序:暂无生成权限</para>
     /// </summary>
-    public enum WeChatReturnCodeEnum
-    {
-        SenparcWeixinSDK配置错误 = -99, // 0xFFFFFF9D
-        系统繁忙此时请开发者稍候再试 = -1, // 0xFFFFFFFF
-        请求成功 = 0,
-        工商数据返回_企业已注销 = 101, // 0x00000065
-        工商数据返回_企业不存在或企业信息未更新 = 102, // 0x00000066
-        工商数据返回_企业法定代表人姓名不一致 = 103, // 0x00000067
-        工商数据返回_企业法定代表人身份证号码不一致 = 104, // 0x00000068
-        法定代表人身份证号码_工商数据未更新_请5_15个工作日之后尝试 = 105, // 0x00000069
-        工商数据返回_企业信息或法定代表人信息不一致 = 1000, // 0x000003E8
-        对方不是粉丝 = 10700, // 0x000029CC
-        发送消息失败_对方关闭了接收消息 = 10703, // 0x000029CF
-        发送消息失败_48小时内用户未互动 = 10706, // 0x000029D2
-        POST参数非法 = 20002, // 0x00004E22
-        获取access_token时AppSecret错误或者access_token无效 = 40001, // 0x00009C41
+    不合法的凭证类型 = 40002, // 0x00009C42
 
-        /// <summary>
-        /// <para>公众号:不合法的凭证类型</para>
-        /// <para>小程序:暂无生成权限</para>
-        /// </summary>
-        不合法的凭证类型 = 40002, // 0x00009C42
+    不合法的OpenID = 40003, // 0x00009C43
+    不合法的媒体文件类型 = 40004, // 0x00009C44
+    不合法的文件类型 = 40005, // 0x00009C45
+    不合法的文件大小 = 40006, // 0x00009C46
+    不合法的媒体文件id = 40007, // 0x00009C47
+    不合法的消息类型_40008 = 40008, // 0x00009C48
+    不合法的图片文件大小 = 40009, // 0x00009C49
+    不合法的语音文件大小 = 40010, // 0x00009C4A
+    不合法的视频文件大小 = 40011, // 0x00009C4B
+    不合法的缩略图文件大小 = 40012, // 0x00009C4C
 
-        不合法的OpenID = 40003, // 0x00009C43
-        不合法的媒体文件类型 = 40004, // 0x00009C44
-        不合法的文件类型 = 40005, // 0x00009C45
-        不合法的文件大小 = 40006, // 0x00009C46
-        不合法的媒体文件id = 40007, // 0x00009C47
-        不合法的消息类型_40008 = 40008, // 0x00009C48
-        不合法的图片文件大小 = 40009, // 0x00009C49
-        不合法的语音文件大小 = 40010, // 0x00009C4A
-        不合法的视频文件大小 = 40011, // 0x00009C4B
-        不合法的缩略图文件大小 = 40012, // 0x00009C4C
-
-        /// <summary>
-        /// <para>微信:不合法的APPID</para>
-        /// <para>小程序:生成权限被封禁</para>
-        /// </summary>
-        不合法的APPID = 40013, // 0x00009C4D
+    /// <summary>
+    /// <para>微信:不合法的APPID</para>
+    /// <para>小程序:生成权限被封禁</para>
+    /// </summary>
+    不合法的APPID = 40013, // 0x00009C4D
 
-        不合法的access_token = 40014, // 0x00009C4E
-        不合法的菜单类型 = 40015, // 0x00009C4F
-        不合法的按钮个数1 = 40016, // 0x00009C50
-        不合法的按钮个数2 = 40017, // 0x00009C51
-        不合法的按钮名字长度 = 40018, // 0x00009C52
-        不合法的按钮KEY长度 = 40019, // 0x00009C53
-        不合法的按钮URL长度 = 40020, // 0x00009C54
-        不合法的菜单版本号 = 40021, // 0x00009C55
-        不合法的子菜单级数 = 40022, // 0x00009C56
-        不合法的子菜单按钮个数 = 40023, // 0x00009C57
-        不合法的子菜单按钮类型 = 40024, // 0x00009C58
-        不合法的子菜单按钮名字长度 = 40025, // 0x00009C59
-        不合法的子菜单按钮KEY长度 = 40026, // 0x00009C5A
-        不合法的子菜单按钮URL长度 = 40027, // 0x00009C5B
-        不合法的自定义菜单使用用户 = 40028, // 0x00009C5C
-        不合法的oauth_code = 40029, // 0x00009C5D
-        不合法的refresh_token = 40030, // 0x00009C5E
-        不合法的openid列表 = 40031, // 0x00009C5F
-        不合法的openid列表长度 = 40032, // 0x00009C60
-        不合法的请求字符不能包含uxxxx格式的字符 = 40033, // 0x00009C61
-        不合法的参数 = 40035, // 0x00009C63
-        template_id不正确 = 40037, // 0x00009C65
-        不合法的请求格式 = 40038, // 0x00009C66
-        不合法的URL长度 = 40039, // 0x00009C67
-        不合法的分组id = 40050, // 0x00009C72
-        分组名字不合法 = 40051, // 0x00009C73
+    不合法的access_token = 40014, // 0x00009C4E
+    不合法的菜单类型 = 40015, // 0x00009C4F
+    不合法的按钮个数1 = 40016, // 0x00009C50
+    不合法的按钮个数2 = 40017, // 0x00009C51
+    不合法的按钮名字长度 = 40018, // 0x00009C52
+    不合法的按钮KEY长度 = 40019, // 0x00009C53
+    不合法的按钮URL长度 = 40020, // 0x00009C54
+    不合法的菜单版本号 = 40021, // 0x00009C55
+    不合法的子菜单级数 = 40022, // 0x00009C56
+    不合法的子菜单按钮个数 = 40023, // 0x00009C57
+    不合法的子菜单按钮类型 = 40024, // 0x00009C58
+    不合法的子菜单按钮名字长度 = 40025, // 0x00009C59
+    不合法的子菜单按钮KEY长度 = 40026, // 0x00009C5A
+    不合法的子菜单按钮URL长度 = 40027, // 0x00009C5B
+    不合法的自定义菜单使用用户 = 40028, // 0x00009C5C
+    不合法的oauth_code = 40029, // 0x00009C5D
+    不合法的refresh_token = 40030, // 0x00009C5E
+    不合法的openid列表 = 40031, // 0x00009C5F
+    不合法的openid列表长度 = 40032, // 0x00009C60
+    不合法的请求字符不能包含uxxxx格式的字符 = 40033, // 0x00009C61
+    不合法的参数 = 40035, // 0x00009C63
+    template_id不正确 = 40037, // 0x00009C65
+    不合法的请求格式 = 40038, // 0x00009C66
+    不合法的URL长度 = 40039, // 0x00009C67
+    不合法的分组id = 40050, // 0x00009C72
+    分组名字不合法 = 40051, // 0x00009C73
 
-        /// <summary>
-        /// <para>公众号:输入参数有误</para>
-        /// <para>小程序:参数expire_time填写错误</para>
-        /// </summary>
-        输入参数有误 = 40097, // 0x00009CA1
+    /// <summary>
+    /// <para>公众号:输入参数有误</para>
+    /// <para>小程序:参数expire_time填写错误</para>
+    /// </summary>
+    输入参数有误 = 40097, // 0x00009CA1
 
-        appsecret不正确 = 40125, // 0x00009CBD
-        调用接口的IP地址不在白名单中 = 40164, // 0x00009CE4
-        参数path填写错误 = 40165, // 0x00009CE5
-        小程序Appid不存在 = 40166, // 0x00009CE6
-        参数query填写错误 = 40212, // 0x00009D14
-        缺少access_token参数 = 41001, // 0x0000A029
-        缺少appid参数 = 41002, // 0x0000A02A
-        缺少refresh_token参数 = 41003, // 0x0000A02B
-        缺少secret参数 = 41004, // 0x0000A02C
-        缺少多媒体文件数据 = 41005, // 0x0000A02D
-        缺少media_id参数 = 41006, // 0x0000A02E
-        缺少子菜单数据 = 41007, // 0x0000A02F
-        缺少oauth_code = 41008, // 0x0000A030
-        缺少openid = 41009, // 0x0000A031
-        form_id不正确_或者过期 = 41028, // 0x0000A044
-        form_id已被使用 = 41029, // 0x0000A045
-        page不正确 = 41030, // 0x0000A046
-        access_token超时 = 42001, // 0x0000A411
-        refresh_token超时 = 42002, // 0x0000A412
-        oauth_code超时 = 42003, // 0x0000A413
-        需要GET请求 = 43001, // 0x0000A7F9
-        需要POST请求 = 43002, // 0x0000A7FA
-        需要HTTPS请求 = 43003, // 0x0000A7FB
-        需要接收者关注 = 43004, // 0x0000A7FC
-        需要好友关系 = 43005, // 0x0000A7FD
+    appsecret不正确 = 40125, // 0x00009CBD
+    调用接口的IP地址不在白名单中 = 40164, // 0x00009CE4
+    参数path填写错误 = 40165, // 0x00009CE5
+    小程序Appid不存在 = 40166, // 0x00009CE6
+    参数query填写错误 = 40212, // 0x00009D14
+    缺少access_token参数 = 41001, // 0x0000A029
+    缺少appid参数 = 41002, // 0x0000A02A
+    缺少refresh_token参数 = 41003, // 0x0000A02B
+    缺少secret参数 = 41004, // 0x0000A02C
+    缺少多媒体文件数据 = 41005, // 0x0000A02D
+    缺少media_id参数 = 41006, // 0x0000A02E
+    缺少子菜单数据 = 41007, // 0x0000A02F
+    缺少oauth_code = 41008, // 0x0000A030
+    缺少openid = 41009, // 0x0000A031
+    form_id不正确_或者过期 = 41028, // 0x0000A044
+    form_id已被使用 = 41029, // 0x0000A045
+    page不正确 = 41030, // 0x0000A046
+    access_token超时 = 42001, // 0x0000A411
+    refresh_token超时 = 42002, // 0x0000A412
+    oauth_code超时 = 42003, // 0x0000A413
+    需要GET请求 = 43001, // 0x0000A7F9
+    需要POST请求 = 43002, // 0x0000A7FA
+    需要HTTPS请求 = 43003, // 0x0000A7FB
+    需要接收者关注 = 43004, // 0x0000A7FC
+    需要好友关系 = 43005, // 0x0000A7FD
 
-        /// <summary>[小程序订阅消息]用户拒绝接受消息,如果用户之前曾经订阅过,则表示用户取消了订阅关系</summary>
-        用户拒绝接受消息 = 43101, // 0x0000A85D
+    /// <summary>[小程序订阅消息]用户拒绝接受消息,如果用户之前曾经订阅过,则表示用户取消了订阅关系</summary>
+    用户拒绝接受消息 = 43101, // 0x0000A85D
 
-        没有权限 = 43104, // 0x0000A860
-        多媒体文件为空 = 44001, // 0x0000ABE1
-        POST的数据包为空 = 44002, // 0x0000ABE2
-        图文消息内容为空 = 44003, // 0x0000ABE3
-        文本消息内容为空 = 44004, // 0x0000ABE4
-        多媒体文件大小超过限制 = 45001, // 0x0000AFC9
-        消息内容超过限制 = 45002, // 0x0000AFCA
-        标题字段超过限制 = 45003, // 0x0000AFCB
-        描述字段超过限制 = 45004, // 0x0000AFCC
-        链接字段超过限制 = 45005, // 0x0000AFCD
-        图片链接字段超过限制 = 45006, // 0x0000AFCE
-        语音播放时间超过限制 = 45007, // 0x0000AFCF
-        图文消息超过限制 = 45008, // 0x0000AFD0
-        接口调用超过限制 = 45009, // 0x0000AFD1
-        创建菜单个数超过限制 = 45010, // 0x0000AFD2
-        回复时间超过限制 = 45015, // 0x0000AFD7
-        系统分组不允许修改 = 45016, // 0x0000AFD8
-        分组名字过长 = 45017, // 0x0000AFD9
-        分组数量超过上限 = 45018, // 0x0000AFDA
-        超出响应数量限制 = 45047, // 0x0000AFF7
-        创建的标签数过多请注意不能超过100个 = 45056, // 0x0000B000
-        标签名非法请注意不能和其他标签重名 = 45157, // 0x0000B065
-        标签名长度超过30个字节 = 45158, // 0x0000B066
-        不存在媒体数据 = 46001, // 0x0000B3B1
-        不存在的菜单版本 = 46002, // 0x0000B3B2
-        不存在的菜单数据 = 46003, // 0x0000B3B3
-        解析JSON_XML内容错误 = 47001, // 0x0000B799
+    没有权限 = 43104, // 0x0000A860
+    多媒体文件为空 = 44001, // 0x0000ABE1
+    POST的数据包为空 = 44002, // 0x0000ABE2
+    图文消息内容为空 = 44003, // 0x0000ABE3
+    文本消息内容为空 = 44004, // 0x0000ABE4
+    多媒体文件大小超过限制 = 45001, // 0x0000AFC9
+    消息内容超过限制 = 45002, // 0x0000AFCA
+    标题字段超过限制 = 45003, // 0x0000AFCB
+    描述字段超过限制 = 45004, // 0x0000AFCC
+    链接字段超过限制 = 45005, // 0x0000AFCD
+    图片链接字段超过限制 = 45006, // 0x0000AFCE
+    语音播放时间超过限制 = 45007, // 0x0000AFCF
+    图文消息超过限制 = 45008, // 0x0000AFD0
+    接口调用超过限制 = 45009, // 0x0000AFD1
+    创建菜单个数超过限制 = 45010, // 0x0000AFD2
+    回复时间超过限制 = 45015, // 0x0000AFD7
+    系统分组不允许修改 = 45016, // 0x0000AFD8
+    分组名字过长 = 45017, // 0x0000AFD9
+    分组数量超过上限 = 45018, // 0x0000AFDA
+    超出响应数量限制 = 45047, // 0x0000AFF7
+    创建的标签数过多请注意不能超过100个 = 45056, // 0x0000B000
+    标签名非法请注意不能和其他标签重名 = 45157, // 0x0000B065
+    标签名长度超过30个字节 = 45158, // 0x0000B066
+    不存在媒体数据 = 46001, // 0x0000B3B1
+    不存在的菜单版本 = 46002, // 0x0000B3B2
+    不存在的菜单数据 = 46003, // 0x0000B3B3
+    解析JSON_XML内容错误 = 47001, // 0x0000B799
 
-        /// <summary>[小程序订阅消息]模板参数不准确,可能为空或者不满足规则,errmsg会提示具体是哪个字段出错</summary>
-        模板参数不准确 = 47003, // 0x0000B79B
+    /// <summary>[小程序订阅消息]模板参数不准确,可能为空或者不满足规则,errmsg会提示具体是哪个字段出错</summary>
+    模板参数不准确 = 47003, // 0x0000B79B
 
-        api功能未授权 = 48001, // 0x0000BB81
-        用户未授权该api = 50001, // 0x0000C351
-        名称格式不合法 = 53010, // 0x0000CF12
-        名称检测命中频率限制 = 53011, // 0x0000CF13
-        禁止使用该名称 = 53012, // 0x0000CF14
-        公众号_名称与已有公众号名称重复_小程序_该名称与已有小程序名称重复 = 53013, // 0x0000CF15
-        公众号_公众号已有_名称A_时_需与该帐号相同主体才可申请_名称A_小程序_小程序已有_名称A_时_需与该帐号相同主体才可申请_名称A_ = 53014, // 0x0000CF16
-        公众号_该名称与已有小程序名称重复_需与该小程序帐号相同主体才可申请_小程序_该名称与已有公众号名称重复_需与该公众号帐号相同主体才可申请 = 53015, // 0x0000CF17
-        公众号_该名称与已有多个小程序名称重复_暂不支持申请_小程序_该名称与已有多个公众号名称重复_暂不支持申请 = 53016, // 0x0000CF18
-        公众号_小程序已有_名称A_时_需与该帐号相同主体才可申请_名称A_小程序_公众号已有_名称A_时_需与该帐号相同主体才可申请_名称A = 53017, // 0x0000CF19
-        名称命中微信号 = 53018, // 0x0000CF1A
-        名称在保护期内 = 53019, // 0x0000CF1B
-        法人姓名与微信号不一致 = 61070, // 0x0000EE8E
-        系统错误system_error = 61450, // 0x0000F00A
-        参数错误invalid_parameter = 61451, // 0x0000F00B
-        无效客服账号invalid_kf_account = 61452, // 0x0000F00C
-        客服帐号已存在kf_account_exsited = 61453, // 0x0000F00D
+    api功能未授权 = 48001, // 0x0000BB81
+    用户未授权该api = 50001, // 0x0000C351
+    名称格式不合法 = 53010, // 0x0000CF12
+    名称检测命中频率限制 = 53011, // 0x0000CF13
+    禁止使用该名称 = 53012, // 0x0000CF14
+    公众号_名称与已有公众号名称重复_小程序_该名称与已有小程序名称重复 = 53013, // 0x0000CF15
+    公众号_公众号已有_名称A_时_需与该帐号相同主体才可申请_名称A_小程序_小程序已有_名称A_时_需与该帐号相同主体才可申请_名称A_ = 53014, // 0x0000CF16
+    公众号_该名称与已有小程序名称重复_需与该小程序帐号相同主体才可申请_小程序_该名称与已有公众号名称重复_需与该公众号帐号相同主体才可申请 = 53015, // 0x0000CF17
+    公众号_该名称与已有多个小程序名称重复_暂不支持申请_小程序_该名称与已有多个公众号名称重复_暂不支持申请 = 53016, // 0x0000CF18
+    公众号_小程序已有_名称A_时_需与该帐号相同主体才可申请_名称A_小程序_公众号已有_名称A_时_需与该帐号相同主体才可申请_名称A = 53017, // 0x0000CF19
+    名称命中微信号 = 53018, // 0x0000CF1A
+    名称在保护期内 = 53019, // 0x0000CF1B
+    法人姓名与微信号不一致 = 61070, // 0x0000EE8E
+    系统错误system_error = 61450, // 0x0000F00A
+    参数错误invalid_parameter = 61451, // 0x0000F00B
+    无效客服账号invalid_kf_account = 61452, // 0x0000F00C
+    客服帐号已存在kf_account_exsited = 61453, // 0x0000F00D
 
-        /// <summary>
-        /// 客服帐号名长度超过限制(仅允许10个英文字符,不包括@及@后的公众号的微信号)(invalid kf_acount length)
-        /// </summary>
-        客服帐号名长度超过限制 = 61454, // 0x0000F00E
+    /// <summary>
+    /// 客服帐号名长度超过限制(仅允许10个英文字符,不包括@及@后的公众号的微信号)(invalid kf_acount length)
+    /// </summary>
+    客服帐号名长度超过限制 = 61454, // 0x0000F00E
 
-        /// <summary>
-        /// 客服帐号名包含非法字符(仅允许英文+数字)(illegal character in kf_account)
-        /// </summary>
-        客服帐号名包含非法字符 = 61455, // 0x0000F00F
+    /// <summary>
+    /// 客服帐号名包含非法字符(仅允许英文+数字)(illegal character in kf_account)
+    /// </summary>
+    客服帐号名包含非法字符 = 61455, // 0x0000F00F
 
-        /// <summary>客服帐号个数超过限制(10个客服账号)(kf_account count exceeded)</summary>
-        客服帐号个数超过限制 = 61456, // 0x0000F010
+    /// <summary>客服帐号个数超过限制(10个客服账号)(kf_account count exceeded)</summary>
+    客服帐号个数超过限制 = 61456, // 0x0000F010
 
-        无效头像文件类型invalid_file_type = 61457, // 0x0000F011
-        日期格式错误 = 61500, // 0x0000F03C
-        日期范围错误 = 61501, // 0x0000F03D
-        发送消息失败_该用户已被加入黑名单_无法向此发送消息 = 62751, // 0x0000F51F
-        门店不存在 = 65115, // 0x0000FE5B
-        该门店状态不允许更新 = 65118, // 0x0000FE5E
-        标签格式错误 = 85006, // 0x00014C0E
-        页面路径错误 = 85007, // 0x00014C0F
-        类目填写错误 = 85008, // 0x00014C10
-        已经有正在审核的版本 = 85009, // 0x00014C11
-        item_list有项目为空 = 85010, // 0x00014C12
-        标题填写错误 = 85011, // 0x00014C13
-        无效的审核id = 85012, // 0x00014C14
-        版本输入错误 = 85015, // 0x00014C17
-        没有审核版本 = 85019, // 0x00014C1B
-        审核状态未满足发布 = 85020, // 0x00014C1C
-        状态不可变 = 85021, // 0x00014C1D
-        action非法 = 85022, // 0x00014C1E
-        审核列表填写的项目数不在1到5以内 = 85023, // 0x00014C1F
-        需要补充相应资料_填写org_code和other_files参数 = 85024, // 0x00014C20
-        管理员手机登记数量已超过上限 = 85025, // 0x00014C21
-        该微信号已绑定5个管理员 = 85026, // 0x00014C22
-        管理员身份证已登记过5次 = 85027, // 0x00014C23
-        该主体登记数量已超过上限 = 85028, // 0x00014C24
-        商家名称已被占用 = 85029, // 0x00014C25
-        不能使用该名称 = 85031, // 0x00014C27
-        该名称在侵权投诉保护期 = 85032, // 0x00014C28
-        名称包含违规内容或微信等保留字 = 85033, // 0x00014C29
-        商家名称在改名15天保护期内 = 85034, // 0x00014C2A
-        需与该帐号相同主体才可申请 = 85035, // 0x00014C2B
-        介绍中含有虚假混淆内容 = 85036, // 0x00014C2C
-        头像或者简介修改达到每个月上限 = 85049, // 0x00014C39
-        正在审核中_请勿重复提交 = 85050, // 0x00014C3A
-        请先成功创建门店后再调用 = 85053, // 0x00014C3D
-        临时mediaid无效 = 85056, // 0x00014C40
-        链接错误 = 85066, // 0x00014C4A
-        测试链接不是子链接 = 85068, // 0x00014C4C
-        校验文件失败 = 85069, // 0x00014C4D
-        个人类型小程序无法设置二维码规则 = 85070, // 0x00014C4E
-        已添加该链接_请勿重复添加 = 85071, // 0x00014C4F
-        该链接已被占用 = 85072, // 0x00014C50
-        二维码规则已满 = 85073, // 0x00014C51
-        小程序未发布_小程序必须先发布代码才可以发布二维码跳转规则 = 85074, // 0x00014C52
-        个人类型小程序无法设置二维码规则1 = 85075, // 0x00014C53
-        小程序没有线上版本_不能进行灰度 = 85079, // 0x00014C57
-        小程序提交的审核未审核通过 = 85080, // 0x00014C58
-        无效的发布比例 = 85081, // 0x00014C59
-        当前的发布比例需要比之前设置的高 = 85082, // 0x00014C5A
-        小程序提审数量已达本月上限 = 85085, // 0x00014C5D
-        提交代码审核之前需提前上传代码 = 85086, // 0x00014C5E
-        小程序已使用_api_navigateToMiniProgram_请声明跳转_appid_列表后再次提交 = 85087, // 0x00014C5F
-        不是由第三方代小程序进行调用 = 86000, // 0x00014FF0
-        不存在第三方的已经提交的代码 = 86001, // 0x00014FF1
-        小程序还未设置昵称_头像_简介_请先设置完后再重新提交 = 86002, // 0x00014FF2
-        无效微信号 = 86004, // 0x00014FF4
+    无效头像文件类型invalid_file_type = 61457, // 0x0000F011
+    日期格式错误 = 61500, // 0x0000F03C
+    日期范围错误 = 61501, // 0x0000F03D
+    发送消息失败_该用户已被加入黑名单_无法向此发送消息 = 62751, // 0x0000F51F
+    门店不存在 = 65115, // 0x0000FE5B
+    该门店状态不允许更新 = 65118, // 0x0000FE5E
+    标签格式错误 = 85006, // 0x00014C0E
+    页面路径错误 = 85007, // 0x00014C0F
+    类目填写错误 = 85008, // 0x00014C10
+    已经有正在审核的版本 = 85009, // 0x00014C11
+    item_list有项目为空 = 85010, // 0x00014C12
+    标题填写错误 = 85011, // 0x00014C13
+    无效的审核id = 85012, // 0x00014C14
+    版本输入错误 = 85015, // 0x00014C17
+    没有审核版本 = 85019, // 0x00014C1B
+    审核状态未满足发布 = 85020, // 0x00014C1C
+    状态不可变 = 85021, // 0x00014C1D
+    action非法 = 85022, // 0x00014C1E
+    审核列表填写的项目数不在1到5以内 = 85023, // 0x00014C1F
+    需要补充相应资料_填写org_code和other_files参数 = 85024, // 0x00014C20
+    管理员手机登记数量已超过上限 = 85025, // 0x00014C21
+    该微信号已绑定5个管理员 = 85026, // 0x00014C22
+    管理员身份证已登记过5次 = 85027, // 0x00014C23
+    该主体登记数量已超过上限 = 85028, // 0x00014C24
+    商家名称已被占用 = 85029, // 0x00014C25
+    不能使用该名称 = 85031, // 0x00014C27
+    该名称在侵权投诉保护期 = 85032, // 0x00014C28
+    名称包含违规内容或微信等保留字 = 85033, // 0x00014C29
+    商家名称在改名15天保护期内 = 85034, // 0x00014C2A
+    需与该帐号相同主体才可申请 = 85035, // 0x00014C2B
+    介绍中含有虚假混淆内容 = 85036, // 0x00014C2C
+    头像或者简介修改达到每个月上限 = 85049, // 0x00014C39
+    正在审核中_请勿重复提交 = 85050, // 0x00014C3A
+    请先成功创建门店后再调用 = 85053, // 0x00014C3D
+    临时mediaid无效 = 85056, // 0x00014C40
+    链接错误 = 85066, // 0x00014C4A
+    测试链接不是子链接 = 85068, // 0x00014C4C
+    校验文件失败 = 85069, // 0x00014C4D
+    个人类型小程序无法设置二维码规则 = 85070, // 0x00014C4E
+    已添加该链接_请勿重复添加 = 85071, // 0x00014C4F
+    该链接已被占用 = 85072, // 0x00014C50
+    二维码规则已满 = 85073, // 0x00014C51
+    小程序未发布_小程序必须先发布代码才可以发布二维码跳转规则 = 85074, // 0x00014C52
+    个人类型小程序无法设置二维码规则1 = 85075, // 0x00014C53
+    小程序没有线上版本_不能进行灰度 = 85079, // 0x00014C57
+    小程序提交的审核未审核通过 = 85080, // 0x00014C58
+    无效的发布比例 = 85081, // 0x00014C59
+    当前的发布比例需要比之前设置的高 = 85082, // 0x00014C5A
+    小程序提审数量已达本月上限 = 85085, // 0x00014C5D
+    提交代码审核之前需提前上传代码 = 85086, // 0x00014C5E
+    小程序已使用_api_navigateToMiniProgram_请声明跳转_appid_列表后再次提交 = 85087, // 0x00014C5F
+    不是由第三方代小程序进行调用 = 86000, // 0x00014FF0
+    不存在第三方的已经提交的代码 = 86001, // 0x00014FF1
+    小程序还未设置昵称_头像_简介_请先设置完后再重新提交 = 86002, // 0x00014FF2
+    无效微信号 = 86004, // 0x00014FF4
 
-        /// <summary>
-        /// 小程序为“签名错误”。对应公众号: 87009, “errmsg” : “reply is not exists” //该回复不存在
-        /// </summary>
-        签名错误 = 87009, // 0x000153E1
+    /// <summary>
+    /// 小程序为“签名错误”。对应公众号: 87009, “errmsg” : “reply is not exists” //该回复不存在
+    /// </summary>
+    签名错误 = 87009, // 0x000153E1
 
-        现网已经在灰度发布_不能进行版本回退 = 87011, // 0x000153E3
-        该版本不能回退_可能的原因_1_无上一个线上版用于回退_2_此版本为已回退版本_不能回退_3_此版本为回退功能上线之前的版本_不能回退 = 87012, // 0x000153E4
-        内容含有违法违规内容 = 87014, // 0x000153E6
-        没有留言权限 = 88000, // 0x000157C0
-        该图文不存在 = 88001, // 0x000157C1
-        文章存在敏感信息 = 88002, // 0x000157C2
-        精选评论数已达上限 = 88003, // 0x000157C3
-        已被用户删除_无法精选 = 88004, // 0x000157C4
-        已经回复过了 = 88005, // 0x000157C5
-        回复超过长度限制或为0 = 88007, // 0x000157C7
-        该评论不存在 = 88008, // 0x000157C8
-        获取评论数目不合法 = 88010, // 0x000157CA
-        该公众号_小程序已经绑定了开放平台帐号 = 89000, // 0x00015BA8
-        业务域名无更改_无需重复设置 = 89019, // 0x00015BBB
-        尚未设置小程序业务域名_请先在第三方平台中设置小程序业务域名后在调用本接口 = 89020, // 0x00015BBC
-        请求保存的域名不是第三方平台中已设置的小程序业务域名或子域名 = 89021, // 0x00015BBD
-        业务域名数量超过限制_最多可以添加100个业务域名 = 89029, // 0x00015BC5
-        个人小程序不支持调用_setwebviewdomain_接口 = 89231, // 0x00015C8F
-        内部错误 = 89247, // 0x00015C9F
-        企业代码类型无效_请选择正确类型填写 = 89248, // 0x00015CA0
-        该主体已有任务执行中_距上次任务24h后再试 = 89249, // 0x00015CA1
-        未找到该任务 = 89250, // 0x00015CA2
-        待法人人脸核身校验 = 89251, // 0x00015CA3
-        法人_企业信息一致性校验中 = 89252, // 0x00015CA4
-        缺少参数 = 89253, // 0x00015CA5
-        第三方权限集不全_补全权限集全网发布后生效 = 89254, // 0x00015CA6
-        系统不稳定_请稍后再试_如多次失败请通过社区反馈 = 89401, // 0x00015D39
-        该审核单不在待审核队列_请检查是否已提交审核或已审完 = 89402, // 0x00015D3A
-        本单属于平台不支持加急种类_请等待正常审核流程 = 89403, // 0x00015D3B
-        本单已加速成功_请勿重复提交 = 89404, // 0x00015D3C
-        本月加急额度不足_请提升提审质量以获取更多额度 = 89405, // 0x00015D3D
-        该经营资质已添加_请勿重复添加 = 92000, // 0x00016760
-        附近地点添加数量达到上线_无法继续添加 = 92002, // 0x00016762
-        地点已被其它小程序占用 = 92003, // 0x00016763
-        附近功能被封禁 = 92004, // 0x00016764
-        地点正在审核中 = 92005, // 0x00016765
-        地点正在展示小程序 = 92006, // 0x00016766
-        地点审核失败 = 92007, // 0x00016767
-        程序未展示在该地点 = 92008, // 0x00016768
-        小程序未上架或不可见 = 92009, // 0x00016769
-        地点不存在 = 93010, // 0x00016B52
-        个人类型小程序不可用 = 93011, // 0x00016B53
-        已下发的模板消息法人并未确认且已超时_24h_未进行身份证校验 = 100001, // 0x000186A1
-        已下发的模板消息法人并未确认且已超时_24h_未进行人脸识别校验 = 100002, // 0x000186A2
-        已下发的模板消息法人并未确认且已超时_24h = 100003, // 0x000186A3
-        此账号已被封禁_无法操作 = 200011, // 0x00030D4B
-        私有模板数已达上限_上限_50_个 = 200012, // 0x00030D4C
-        此模版已被封禁_无法选用 = 200013, // 0x00030D4D
-        模版tid参数错误 = 200014, // 0x00030D4E
-        关键词列表kidList参数错误 = 200020, // 0x00030D54
-        场景描述sceneDesc参数错误 = 200021, // 0x00030D55
-    }
+    现网已经在灰度发布_不能进行版本回退 = 87011, // 0x000153E3
+    该版本不能回退_可能的原因_1_无上一个线上版用于回退_2_此版本为已回退版本_不能回退_3_此版本为回退功能上线之前的版本_不能回退 = 87012, // 0x000153E4
+    内容含有违法违规内容 = 87014, // 0x000153E6
+    没有留言权限 = 88000, // 0x000157C0
+    该图文不存在 = 88001, // 0x000157C1
+    文章存在敏感信息 = 88002, // 0x000157C2
+    精选评论数已达上限 = 88003, // 0x000157C3
+    已被用户删除_无法精选 = 88004, // 0x000157C4
+    已经回复过了 = 88005, // 0x000157C5
+    回复超过长度限制或为0 = 88007, // 0x000157C7
+    该评论不存在 = 88008, // 0x000157C8
+    获取评论数目不合法 = 88010, // 0x000157CA
+    该公众号_小程序已经绑定了开放平台帐号 = 89000, // 0x00015BA8
+    业务域名无更改_无需重复设置 = 89019, // 0x00015BBB
+    尚未设置小程序业务域名_请先在第三方平台中设置小程序业务域名后在调用本接口 = 89020, // 0x00015BBC
+    请求保存的域名不是第三方平台中已设置的小程序业务域名或子域名 = 89021, // 0x00015BBD
+    业务域名数量超过限制_最多可以添加100个业务域名 = 89029, // 0x00015BC5
+    个人小程序不支持调用_setwebviewdomain_接口 = 89231, // 0x00015C8F
+    内部错误 = 89247, // 0x00015C9F
+    企业代码类型无效_请选择正确类型填写 = 89248, // 0x00015CA0
+    该主体已有任务执行中_距上次任务24h后再试 = 89249, // 0x00015CA1
+    未找到该任务 = 89250, // 0x00015CA2
+    待法人人脸核身校验 = 89251, // 0x00015CA3
+    法人_企业信息一致性校验中 = 89252, // 0x00015CA4
+    缺少参数 = 89253, // 0x00015CA5
+    第三方权限集不全_补全权限集全网发布后生效 = 89254, // 0x00015CA6
+    系统不稳定_请稍后再试_如多次失败请通过社区反馈 = 89401, // 0x00015D39
+    该审核单不在待审核队列_请检查是否已提交审核或已审完 = 89402, // 0x00015D3A
+    本单属于平台不支持加急种类_请等待正常审核流程 = 89403, // 0x00015D3B
+    本单已加速成功_请勿重复提交 = 89404, // 0x00015D3C
+    本月加急额度不足_请提升提审质量以获取更多额度 = 89405, // 0x00015D3D
+    该经营资质已添加_请勿重复添加 = 92000, // 0x00016760
+    附近地点添加数量达到上线_无法继续添加 = 92002, // 0x00016762
+    地点已被其它小程序占用 = 92003, // 0x00016763
+    附近功能被封禁 = 92004, // 0x00016764
+    地点正在审核中 = 92005, // 0x00016765
+    地点正在展示小程序 = 92006, // 0x00016766
+    地点审核失败 = 92007, // 0x00016767
+    程序未展示在该地点 = 92008, // 0x00016768
+    小程序未上架或不可见 = 92009, // 0x00016769
+    地点不存在 = 93010, // 0x00016B52
+    个人类型小程序不可用 = 93011, // 0x00016B53
+    已下发的模板消息法人并未确认且已超时_24h_未进行身份证校验 = 100001, // 0x000186A1
+    已下发的模板消息法人并未确认且已超时_24h_未进行人脸识别校验 = 100002, // 0x000186A2
+    已下发的模板消息法人并未确认且已超时_24h = 100003, // 0x000186A3
+    此账号已被封禁_无法操作 = 200011, // 0x00030D4B
+    私有模板数已达上限_上限_50_个 = 200012, // 0x00030D4C
+    此模版已被封禁_无法选用 = 200013, // 0x00030D4D
+    模版tid参数错误 = 200014, // 0x00030D4E
+    关键词列表kidList参数错误 = 200020, // 0x00030D54
+    场景描述sceneDesc参数错误 = 200021, // 0x00030D55
 }

+ 33 - 36
Admin.NET/Admin.NET.Core/Enum/WeChatUserTypeEnum.cs

@@ -1,46 +1,43 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 微信用户类型枚举
+/// </summary>
+public enum WeChatUserTypeEnum
 {
     /// <summary>
-    /// 微信用户类型枚举
+    /// 微信公众号
     /// </summary>
-    public enum WeChatUserTypeEnum
-    {
-        /// <summary>
-        /// 微信公众号
-        /// </summary>
-        [Description("微信公众号")]
-        微信公众号 = 1,
+    [Description("微信公众号")]
+    微信公众号 = 1,
 
-        /// <summary>
-        /// 微信小程序
-        /// </summary>
-        [Description("微信小程序")]
-        微信小程序 = 2,
+    /// <summary>
+    /// 微信小程序
+    /// </summary>
+    [Description("微信小程序")]
+    微信小程序 = 2,
 
-        /// <summary>
-        /// 支付宝小程序
-        /// </summary>
-        [Description("支付宝小程序")]
-        支付宝小程序 = 3,
+    /// <summary>
+    /// 支付宝小程序
+    /// </summary>
+    [Description("支付宝小程序")]
+    支付宝小程序 = 3,
 
-        /// <summary>
-        /// 微信APP快捷登陆
-        /// </summary>
-        [Description("微信APP快捷登陆")]
-        微信APP快捷登陆 = 4,
+    /// <summary>
+    /// 微信APP快捷登陆
+    /// </summary>
+    [Description("微信APP快捷登陆")]
+    微信APP快捷登陆 = 4,
 
-        /// <summary>
-        /// QQ在APP中快捷登陆
-        /// </summary>
-        [Description("QQ在APP中快捷登陆")]
-        QQ在APP中快捷登陆 = 5,
+    /// <summary>
+    /// QQ在APP中快捷登陆
+    /// </summary>
+    [Description("QQ在APP中快捷登陆")]
+    QQ在APP中快捷登陆 = 5,
 
-        /// <summary>
-        /// 头条系小程序
-        /// </summary>
-        [Description("头条系小程序")]
-        头条系小程序 = 6,
-    }
+    /// <summary>
+    /// 头条系小程序
+    /// </summary>
+    [Description("头条系小程序")]
+    头条系小程序 = 6,
 }

+ 13 - 16
Admin.NET/Admin.NET.Core/Enum/YesNoEnum.cs

@@ -1,22 +1,19 @@
-using System.ComponentModel;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 是否枚举
+/// </summary>
+public enum YesNoEnum
 {
     /// <summary>
-    /// 是否枚举
+    /// 是
     /// </summary>
-    public enum YesNoEnum
-    {
-        /// <summary>
-        /// 是
-        /// </summary>
-        [Description("是")]
-        Y = 1,
+    [Description("是")]
+    Y = 1,
 
-        /// <summary>
-        /// 否
-        /// </summary>
-        [Description("否")]
-        N = 2
-    }
+    /// <summary>
+    /// 否
+    /// </summary>
+    [Description("否")]
+    N = 2
 }

+ 44 - 50
Admin.NET/Admin.NET.Core/EventBus/LogEventSubscriber.cs

@@ -1,59 +1,53 @@
-using Furion.EventBus;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Threading.Tasks;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 日志事件订阅
+/// </summary>
+public class LogEventSubscriber : IEventSubscriber
 {
+    public IServiceProvider Services { get; }
+
+    public LogEventSubscriber(IServiceProvider services)
+    {
+        Services = services;
+    }
+
     /// <summary>
-    /// 日志事件订阅
+    /// 增加操作日志
     /// </summary>
-    public class LogEventSubscriber : IEventSubscriber
+    /// <param name="context"></param>
+    /// <returns></returns>
+    [EventSubscribe("Add:OpLog")]
+    public async Task CreateOpLog(EventHandlerExecutingContext context)
     {
-        public IServiceProvider Services { get; }
-
-        public LogEventSubscriber(IServiceProvider services)
-        {
-            Services = services;
-        }
-
-        /// <summary>
-        /// 增加操作日志
-        /// </summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        [EventSubscribe("Add:OpLog")]
-        public async Task CreateOpLog(EventHandlerExecutingContext context)
-        {
-            using var scope = Services.CreateScope();
-            var _rep = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysLogOp>>();
-            await _rep.InsertAsync((SysLogOp)context.Source.Payload);
-        }
+        using var scope = Services.CreateScope();
+        var _rep = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysLogOp>>();
+        await _rep.InsertAsync((SysLogOp)context.Source.Payload);
+    }
 
-        /// <summary>
-        /// 增加异常日志
-        /// </summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        [EventSubscribe("Add:ExLog")]
-        public async Task CreateExLog(EventHandlerExecutingContext context)
-        {
-            using var scope = Services.CreateScope();
-            var _rep = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysLogEx>>();
-            await _rep.InsertAsync((SysLogEx)context.Source.Payload);
-        }
+    /// <summary>
+    /// 增加异常日志
+    /// </summary>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    [EventSubscribe("Add:ExLog")]
+    public async Task CreateExLog(EventHandlerExecutingContext context)
+    {
+        using var scope = Services.CreateScope();
+        var _rep = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysLogEx>>();
+        await _rep.InsertAsync((SysLogEx)context.Source.Payload);
+    }
 
-        /// <summary>
-        /// 增加访问日志
-        /// </summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        [EventSubscribe("Add:VisLog")]
-        public async Task CreateVisLog(EventHandlerExecutingContext context)
-        {
-            using var scope = Services.CreateScope();
-            var _rep = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysLogVis>>();
-            await _rep.InsertAsync((SysLogVis)context.Source.Payload);
-        }
+    /// <summary>
+    /// 增加访问日志
+    /// </summary>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    [EventSubscribe("Add:VisLog")]
+    public async Task CreateVisLog(EventHandlerExecutingContext context)
+    {
+        using var scope = Services.CreateScope();
+        var _rep = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysLogVis>>();
+        await _rep.InsertAsync((SysLogVis)context.Source.Payload);
     }
 }

+ 12 - 16
Admin.NET/Admin.NET.Core/Extension/LogoExtension.cs

@@ -1,26 +1,22 @@
-using Microsoft.Extensions.DependencyInjection;
-using System;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// logo显示
+/// </summary>
+public static class LogoExtension
 {
-    /// <summary>
-    /// logo显示
-    /// </summary>
-    public static class LogoExtension
+    public static void AddLogoDisplay(this IServiceCollection services)
     {
-        public static void AddLogoDisplay(this IServiceCollection services)
-        {
-            Console.ForegroundColor = ConsoleColor.Blue;
-            Console.WriteLine(@"  ___      _           _         _   _  _____ _____
+        Console.ForegroundColor = ConsoleColor.Blue;
+        Console.WriteLine(@"  ___      _           _         _   _  _____ _____
  / _ \    | |         (_)       | \ | ||  ___|_   _|
 / /_\ \ __| |_ __ ___  _ _ __   |  \| || |__   | |
 |  _  |/ _` | '_ ` _ \| | '_ \  | . ` ||  __|  | |
 | | | | (_| | | | | | | | | | |_| |\  || |___  | |
 \_| |_/\__,_|_| |_| |_|_|_| |_(_)_| \_/\____/  \_/  ");
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.WriteLine(@"源码地址: https://gitee.com/zuohuaijun/Admin.NET");
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.WriteLine(@"让.NET更简单、更通用、更流行!");
-        }
+        Console.ForegroundColor = ConsoleColor.Red;
+        Console.WriteLine(@"源码地址: https://gitee.com/zuohuaijun/Admin.NET");
+        Console.ForegroundColor = ConsoleColor.Yellow;
+        Console.WriteLine(@"让.NET更简单、更通用、更流行!");
     }
 }

+ 92 - 103
Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -1,128 +1,117 @@
-using Furion.DependencyInjection;
-using SqlSugar;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 对象拓展类
+/// </summary>
+[SuppressSniffer]
+public static class ObjectExtension
 {
     /// <summary>
-    /// 对象拓展类
+    /// 获取实体排序
     /// </summary>
-    [SuppressSniffer]
-    public static class ObjectExtension
+    /// <param name="type">排序类型</param>
+    /// <returns>int</returns>
+    public static int GetSqlSugarEntityOrder(this Type type)
     {
-        /// <summary>
-        /// 获取实体排序
-        /// </summary>
-        /// <param name="type">排序类型</param>
-        /// <returns>int</returns>
-        public static int GetSqlSugarEntityOrder(this Type type)
-        {
-            return !type.IsDefined(typeof(SqlSugarEntityAttribute), true) ? 0 : type.GetCustomAttribute<SqlSugarEntityAttribute>(true).Order;
-        }
+        return !type.IsDefined(typeof(SqlSugarEntityAttribute), true) ? 0 : type.GetCustomAttribute<SqlSugarEntityAttribute>(true).Order;
+    }
+
+    /// <summary>
+    /// 判断类型是否实现某个泛型
+    /// </summary>
+    /// <param name="type">类型</param>
+    /// <param name="generic">泛型类型</param>
+    /// <returns>bool</returns>
+    public static bool HasImplementedRawGeneric(this Type type, Type generic)
+    {
+        // 检查接口类型
+        var isTheRawGenericType = type.GetInterfaces().Any(IsTheRawGenericType);
+        if (isTheRawGenericType) return true;
 
-        /// <summary>
-        /// 判断类型是否实现某个泛型
-        /// </summary>
-        /// <param name="type">类型</param>
-        /// <param name="generic">泛型类型</param>
-        /// <returns>bool</returns>
-        public static bool HasImplementedRawGeneric(this Type type, Type generic)
+        // 检查类型
+        while (type != null && type != typeof(object))
         {
-            // 检查接口类型
-            var isTheRawGenericType = type.GetInterfaces().Any(IsTheRawGenericType);
+            isTheRawGenericType = IsTheRawGenericType(type);
             if (isTheRawGenericType) return true;
+            type = type.BaseType;
+        }
 
-            // 检查类型
-            while (type != null && type != typeof(object))
-            {
-                isTheRawGenericType = IsTheRawGenericType(type);
-                if (isTheRawGenericType) return true;
-                type = type.BaseType;
-            }
-
-            return false;
+        return false;
 
-            // 判断逻辑
-            bool IsTheRawGenericType(Type type) => generic == (type.IsGenericType ? type.GetGenericTypeDefinition() : type);
-        }
+        // 判断逻辑
+        bool IsTheRawGenericType(Type type) => generic == (type.IsGenericType ? type.GetGenericTypeDefinition() : type);
+    }
 
-        /// <summary>
-        /// 将字典转化为QueryString格式
-        /// </summary>
-        /// <param name="dict"></param>
-        /// <param name="urlEncode"></param>
-        /// <returns></returns>
-        public static string ToQueryString(this Dictionary<string, string> dict, bool urlEncode = true)
-        {
-            return string.Join("&", dict.Select(p => $"{(urlEncode ? p.Key?.UrlEncode() : "")}={(urlEncode ? p.Value?.UrlEncode() : "")}"));
-        }
+    /// <summary>
+    /// 将字典转化为QueryString格式
+    /// </summary>
+    /// <param name="dict"></param>
+    /// <param name="urlEncode"></param>
+    /// <returns></returns>
+    public static string ToQueryString(this Dictionary<string, string> dict, bool urlEncode = true)
+    {
+        return string.Join("&", dict.Select(p => $"{(urlEncode ? p.Key?.UrlEncode() : "")}={(urlEncode ? p.Value?.UrlEncode() : "")}"));
+    }
 
-        /// <summary>
-        /// 将字符串URL编码
-        /// </summary>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        public static string UrlEncode(this string str)
-        {
-            return string.IsNullOrEmpty(str) ? "" : System.Web.HttpUtility.UrlEncode(str, Encoding.UTF8);
-        }
+    /// <summary>
+    /// 将字符串URL编码
+    /// </summary>
+    /// <param name="str"></param>
+    /// <returns></returns>
+    public static string UrlEncode(this string str)
+    {
+        return string.IsNullOrEmpty(str) ? "" : System.Web.HttpUtility.UrlEncode(str, Encoding.UTF8);
+    }
 
-        /// <summary>
-        /// List转DataTable
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="list"></param>
-        /// <returns></returns>
-        public static DataTable ToDataTable<T>(this List<T> list)
+    /// <summary>
+    /// List转DataTable
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="list"></param>
+    /// <returns></returns>
+    public static DataTable ToDataTable<T>(this List<T> list)
+    {
+        DataTable result = new();
+        if (list.Count > 0)
         {
-            DataTable result = new();
-            if (list.Count > 0)
+            result.TableName = list[0].GetType().Name; // 表名赋值
+            PropertyInfo[] propertys = list[0].GetType().GetProperties();
+            foreach (PropertyInfo pi in propertys)
+            {
+                Type colType = pi.PropertyType;
+                if (colType.IsGenericType && colType.GetGenericTypeDefinition() == typeof(Nullable<>))
+                {
+                    colType = colType.GetGenericArguments()[0];
+                }
+                if (IsIgnoreColumn(pi))
+                    continue;
+                result.Columns.Add(pi.Name, colType);
+            }
+            for (int i = 0; i < list.Count; i++)
             {
-                result.TableName = list[0].GetType().Name; // 表名赋值
-                PropertyInfo[] propertys = list[0].GetType().GetProperties();
+                ArrayList tempList = new();
                 foreach (PropertyInfo pi in propertys)
                 {
-                    Type colType = pi.PropertyType;
-                    if (colType.IsGenericType && colType.GetGenericTypeDefinition() == typeof(Nullable<>))
-                    {
-                        colType = colType.GetGenericArguments()[0];
-                    }
                     if (IsIgnoreColumn(pi))
                         continue;
-                    result.Columns.Add(pi.Name, colType);
-                }
-                for (int i = 0; i < list.Count; i++)
-                {
-                    ArrayList tempList = new();
-                    foreach (PropertyInfo pi in propertys)
-                    {
-                        if (IsIgnoreColumn(pi))
-                            continue;
-                        object obj = pi.GetValue(list[i], null);
-                        tempList.Add(obj);
-                    }
-                    object[] array = tempList.ToArray();
-                    result.LoadDataRow(array, true);
+                    object obj = pi.GetValue(list[i], null);
+                    tempList.Add(obj);
                 }
+                object[] array = tempList.ToArray();
+                result.LoadDataRow(array, true);
             }
-            return result;
         }
+        return result;
+    }
 
-        /// <summary>
-        /// 排除SqlSugar忽略的列
-        /// </summary>
-        /// <param name="pi"></param>
-        /// <returns></returns>
-        private static bool IsIgnoreColumn(PropertyInfo pi)
-        {
-            var sc = pi.GetCustomAttributes<SugarColumn>(false).FirstOrDefault(u => u.IsIgnore == true);
-            return sc != null;
-        }
+    /// <summary>
+    /// 排除SqlSugar忽略的列
+    /// </summary>
+    /// <param name="pi"></param>
+    /// <returns></returns>
+    private static bool IsIgnoreColumn(PropertyInfo pi)
+    {
+        var sc = pi.GetCustomAttributes<SugarColumn>(false).FirstOrDefault(u => u.IsIgnore == true);
+        return sc != null;
     }
 }

+ 38 - 43
Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs

@@ -1,51 +1,46 @@
-using Mapster;
-using MapsterMapper;
-using SqlSugar;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core.Extension
+public static class RepositoryExtension
 {
-    public static class RepositoryExtension
+    /// <summary>
+    /// 实体假删除 _rep.Context.Updateable(entity).FakeDelete().ExecuteCommandAsync();
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="updateable"></param>
+    /// <returns></returns>
+    public static IUpdateable<T> FakeDelete<T>(this IUpdateable<T> updateable) where T : EntityBase, new()
     {
-        /// <summary>
-        /// 实体假删除 _rep.Context.Updateable(entity).FakeDelete().ExecuteCommandAsync();
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="updateable"></param>
-        /// <returns></returns>
-        public static IUpdateable<T> FakeDelete<T>(this IUpdateable<T> updateable) where T : EntityBase, new()
+        return updateable.ReSetValue(x => { x.IsDelete = true; })
+            .IgnoreColumns(ignoreAllNullColumns: true)
+            .EnableDiffLogEvent()   // 记录差异日志
+            .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId });  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
+    }
+
+    /// <summary>
+    /// 排序方式(默认降序)
+    /// </summary>
+    /// <param name="queryable"></param>
+    /// <param name="pageInput"> </param>
+    /// <param name="defualtSortField"> 默认排序字段 </param>
+    /// <param name="descSort"> 是否降序 </param>
+    /// <returns> </returns>
+    public static ISugarQueryable<T> OrderBuilder<T>(this ISugarQueryable<T> queryable, BasePageInput pageInput, string defualtSortField = "Id", bool descSort = true)
+    {
+        var orderStr = "";
+        // 约定默认每张表都有Id排序
+        if (!string.IsNullOrWhiteSpace(defualtSortField))
         {
-            return updateable.ReSetValue(x => { x.IsDelete = true; })
-                .IgnoreColumns(ignoreAllNullColumns: true)
-                .EnableDiffLogEvent()   // 记录差异日志
-                .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId });  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
+            orderStr = descSort ? defualtSortField + " Desc" : defualtSortField + " Asc";
         }
-
-        /// <summary>
-        /// 排序方式(默认降序)
-        /// </summary>
-        /// <param name="queryable"></param>
-        /// <param name="pageInput"> </param>
-        /// <param name="defualtSortField"> 默认排序字段 </param>
-        /// <param name="descSort"> 是否降序 </param>
-        /// <returns> </returns>
-        public static ISugarQueryable<T> OrderBuilder<T>(this ISugarQueryable<T> queryable, BasePageInput pageInput, string defualtSortField = "Id", bool descSort = true)
+        TypeAdapterConfig config = new();
+        config.ForType<T, BasePageInput>().IgnoreNullValues(true);
+        Mapper mapper = new(config); // 务必将mapper设为单实例
+        var nowPagerInput = mapper.Map<BasePageInput>(pageInput);
+        // 排序是否可用-排序字段和排序顺序都为非空才启用排序
+        if (!string.IsNullOrEmpty(nowPagerInput.Field) && !string.IsNullOrEmpty(nowPagerInput.Order))
         {
-            var orderStr = "";
-            // 约定默认每张表都有Id排序
-            if (!string.IsNullOrWhiteSpace(defualtSortField))
-            {
-                orderStr = descSort ? defualtSortField + " Desc" : defualtSortField + " Asc";
-            }
-            TypeAdapterConfig config = new();
-            config.ForType<T, BasePageInput>().IgnoreNullValues(true);
-            Mapper mapper = new(config); // 务必将mapper设为单实例
-            var nowPagerInput = mapper.Map<BasePageInput>(pageInput);
-            // 排序是否可用-排序字段和排序顺序都为非空才启用排序
-            if (!string.IsNullOrEmpty(nowPagerInput.Field) && !string.IsNullOrEmpty(nowPagerInput.Order))
-            {
-                orderStr = $"{nowPagerInput.Field} {(nowPagerInput.Order == nowPagerInput.DescStr ? "Desc" : "Asc")}";
-            }
-            return queryable.OrderByIF(!string.IsNullOrWhiteSpace(orderStr), orderStr);
+            orderStr = $"{nowPagerInput.Field} {(nowPagerInput.Order == nowPagerInput.DescStr ? "Desc" : "Asc")}";
         }
+        return queryable.OrderByIF(!string.IsNullOrWhiteSpace(orderStr), orderStr);
     }
-}
+}

+ 27 - 35
Admin.NET/Admin.NET.Core/Filter/LogExceptionHandler.cs

@@ -1,42 +1,34 @@
-using Furion.DependencyInjection;
-using Furion.EventBus;
-using Furion.FriendlyException;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Serilog;
-using System.Threading.Tasks;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 全局异常处理
+/// </summary>
+public class LogExceptionHandler : IGlobalExceptionHandler, ISingleton
 {
-    /// <summary>
-    /// 全局异常处理
-    /// </summary>
-    public class LogExceptionHandler : IGlobalExceptionHandler, ISingleton
-    {
-        private readonly IEventPublisher _eventPublisher;
+    private readonly IEventPublisher _eventPublisher;
 
-        public LogExceptionHandler(IEventPublisher eventPublisher)
-        {
-            _eventPublisher = eventPublisher;
-        }
+    public LogExceptionHandler(IEventPublisher eventPublisher)
+    {
+        _eventPublisher = eventPublisher;
+    }
 
-        public async Task OnExceptionAsync(ExceptionContext context)
-        {
-            await _eventPublisher.PublishAsync(new ChannelEventSource("Add:ExLog",
-                new SysLogEx
-                {
-                    ClassName = context.Exception.TargetSite.DeclaringType?.FullName,
-                    MethodName = context.Exception.TargetSite.Name,
-                    ExceptionName = context.Exception.Message,
-                    ExceptionMsg = context.Exception.Message,
-                    ExceptionSource = context.Exception.Source,
-                    StackTrace = context.Exception.StackTrace,
-                    ParamsObj = context.Exception.TargetSite.GetParameters().ToString(),
-                    UserName = context.HttpContext.User?.FindFirst(ClaimConst.UserName)?.Value,
-                    RealName = context.HttpContext.User?.FindFirst(ClaimConst.RealName)?.Value
-                }));
+    public async Task OnExceptionAsync(ExceptionContext context)
+    {
+        await _eventPublisher.PublishAsync(new ChannelEventSource("Add:ExLog",
+            new SysLogEx
+            {
+                ClassName = context.Exception.TargetSite.DeclaringType?.FullName,
+                MethodName = context.Exception.TargetSite.Name,
+                ExceptionName = context.Exception.Message,
+                ExceptionMsg = context.Exception.Message,
+                ExceptionSource = context.Exception.Source,
+                StackTrace = context.Exception.StackTrace,
+                ParamsObj = context.Exception.TargetSite.GetParameters().ToString(),
+                UserName = context.HttpContext.User?.FindFirst(ClaimConst.UserName)?.Value,
+                RealName = context.HttpContext.User?.FindFirst(ClaimConst.RealName)?.Value
+            }));
 
-            // 写日志文件
-            Log.Error(context.Exception.ToString());
-        }
+        // 写日志文件
+        Log.Error(context.Exception.ToString());
     }
 }

+ 51 - 66
Admin.NET/Admin.NET.Core/Filter/RequestActionFilter.cs

@@ -1,80 +1,65 @@
-using Admin.NET.Core.Service;
-using Furion;
-using Furion.EventBus;
-using Furion.JsonSerialization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.AspNetCore.Mvc.Filters;
-using System.Diagnostics;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using UAParser;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 请求操作拦截
+/// </summary>
+public class RequestActionFilter : IAsyncActionFilter
 {
-    /// <summary>
-    /// 请求操作拦截
-    /// </summary>
-    public class RequestActionFilter : IAsyncActionFilter
+    private readonly IEventPublisher _eventPublisher;
+
+    public RequestActionFilter(IEventPublisher eventPublisher)
     {
-        private readonly IEventPublisher _eventPublisher;
+        _eventPublisher = eventPublisher;
+    }
 
-        public RequestActionFilter(IEventPublisher eventPublisher)
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        // 是否有禁用操作日志属性
+        if (context.ActionDescriptor.EndpointMetadata.Any(m => m.GetType() == typeof(NotLogAttribute)))
         {
-            _eventPublisher = eventPublisher;
+            await next();
+            return;
         }
 
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        // 是否开启操作日志
+        var value = await App.GetService<SysConfigService>().GetConfigCache(CommonConst.SysOpLogFlag);
+        if (string.IsNullOrWhiteSpace(value) || !bool.Parse(value))
         {
-            // 是否有禁用操作日志属性
-            if (context.ActionDescriptor.EndpointMetadata.Any(m => m.GetType() == typeof(NotLogAttribute)))
-            {
-                await next();
-                return;
-            }
-
-            // 是否开启操作日志
-            var value = await App.GetService<SysConfigService>().GetConfigCache(CommonConst.SysOpLogFlag);
-            if (string.IsNullOrWhiteSpace(value) || !bool.Parse(value))
-            {
-                await next();
-                return;
-            }
+            await next();
+            return;
+        }
 
-            var sw = new Stopwatch();
-            sw.Start();
-            var actionContext = await next();
-            sw.Stop();
+        var sw = new Stopwatch();
+        sw.Start();
+        var actionContext = await next();
+        sw.Stop();
 
-            var httpContext = context.HttpContext;
-            var httpRequest = httpContext.Request;
+        var httpContext = context.HttpContext;
+        var httpRequest = httpContext.Request;
 
-            var isRequestSucceed = actionContext.Exception == null; // 判断是否请求成功(没有异常就是成功)
-            var headers = httpRequest.Headers;
-            var clientInfo = headers.ContainsKey("User-Agent") ? Parser.GetDefault().Parse(headers["User-Agent"]) : null;
-            var actionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-            var ip = httpContext.GetRemoteIpAddressToIPv4();
+        var isRequestSucceed = actionContext.Exception == null; // 判断是否请求成功(没有异常就是成功)
+        var headers = httpRequest.Headers;
+        var clientInfo = headers.ContainsKey("User-Agent") ? Parser.GetDefault().Parse(headers["User-Agent"]) : null;
+        var actionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        var ip = httpContext.GetRemoteIpAddressToIPv4();
 
-            await _eventPublisher.PublishAsync(new ChannelEventSource("Add:OpLog",
-                new SysLogOp
-                {
-                    Success = isRequestSucceed ? YesNoEnum.Y : YesNoEnum.N,
-                    Ip = ip,
-                    Location = httpRequest.GetRequestUrlAddress(),
-                    Browser = clientInfo?.UA.Family + clientInfo?.UA.Major,
-                    Os = clientInfo?.OS.Family + clientInfo?.OS.Major,
-                    Url = httpRequest.Path,
-                    ClassName = context.Controller.ToString(),
-                    MethodName = actionDescriptor?.ActionName,
-                    ReqMethod = httpRequest.Method,
-                    Param = context.ActionArguments.Count < 1 ? string.Empty : JSON.Serialize(context.ActionArguments),
-                    Result = actionContext.Result?.GetType() == typeof(JsonResult) ? JSON.Serialize(actionContext.Result) : string.Empty,
-                    ElapsedTime = sw.ElapsedMilliseconds,
-                    UserName = httpContext.User?.FindFirstValue(ClaimConst.UserName),
-                    RealName = httpContext.User?.FindFirstValue(ClaimConst.RealName)
-                }));
-        }
+        await _eventPublisher.PublishAsync(new ChannelEventSource("Add:OpLog",
+            new SysLogOp
+            {
+                Success = isRequestSucceed ? YesNoEnum.Y : YesNoEnum.N,
+                Ip = ip,
+                Location = httpRequest.GetRequestUrlAddress(),
+                Browser = clientInfo?.UA.Family + clientInfo?.UA.Major,
+                Os = clientInfo?.OS.Family + clientInfo?.OS.Major,
+                Url = httpRequest.Path,
+                ClassName = context.Controller.ToString(),
+                MethodName = actionDescriptor?.ActionName,
+                ReqMethod = httpRequest.Method,
+                Param = context.ActionArguments.Count < 1 ? string.Empty : JSON.Serialize(context.ActionArguments),
+                Result = actionContext.Result?.GetType() == typeof(JsonResult) ? JSON.Serialize(actionContext.Result) : string.Empty,
+                ElapsedTime = sw.ElapsedMilliseconds,
+                UserName = httpContext.User?.FindFirstValue(ClaimConst.UserName),
+                RealName = httpContext.User?.FindFirstValue(ClaimConst.RealName)
+            }));
     }
 }

+ 60 - 67
Admin.NET/Admin.NET.Core/Filter/SqlSugarUnitOfWorkFilter.cs

@@ -1,91 +1,84 @@
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.AspNetCore.Mvc.Filters;
-using SqlSugar;
-using System.Linq;
-using System.Threading.Tasks;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// SqlSugar工作单元拦截器
+/// </summary>
+public class SqlSugarUnitOfWorkFilter : IAsyncActionFilter, IOrderedFilter
 {
     /// <summary>
-    /// SqlSugar工作单元拦截器
+    /// 过滤器排序
     /// </summary>
-    public class SqlSugarUnitOfWorkFilter : IAsyncActionFilter, IOrderedFilter
-    {
-        /// <summary>
-        /// 过滤器排序
-        /// </summary>
-        internal const int FilterOrder = 9999;
+    internal const int FilterOrder = 9999;
 
-        /// <summary>
-        /// 排序属性
-        /// </summary>
-        public int Order => FilterOrder;
+    /// <summary>
+    /// 排序属性
+    /// </summary>
+    public int Order => FilterOrder;
 
-        /// <summary>
-        /// SqlSugar 对象
-        /// </summary>
-        private readonly SqlSugarClient _sqlSugarClient;
+    /// <summary>
+    /// SqlSugar 对象
+    /// </summary>
+    private readonly SqlSugarClient _sqlSugarClient;
 
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="sqlSugarClient"></param>
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    /// <param name="sqlSugarClient"></param>
+
+    public SqlSugarUnitOfWorkFilter(ISqlSugarClient sqlSugarClient)
+    {
+        _sqlSugarClient = (SqlSugarClient)sqlSugarClient;
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="next"></param>
+    /// <returns></returns>
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        // 获取动作方法描述器
+        var actionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        var method = actionDescriptor.MethodInfo;
 
-        public SqlSugarUnitOfWorkFilter(ISqlSugarClient sqlSugarClient)
+        // 判断是否贴有工作单元特性
+        if (!method.IsDefined(typeof(SqlSugarUnitOfWorkAttribute), true))
         {
-            _sqlSugarClient = (SqlSugarClient)sqlSugarClient;
+            // 调用方法
+            _ = await next();
         }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="next"></param>
-        /// <returns></returns>
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        else
         {
-            // 获取动作方法描述器
-            var actionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-            var method = actionDescriptor.MethodInfo;
-
-            // 判断是否贴有工作单元特性
-            if (!method.IsDefined(typeof(SqlSugarUnitOfWorkAttribute), true))
-            {
-                // 调用方法
-                _ = await next();
-            }
-            else
-            {
-                var attribute = (method.GetCustomAttributes(typeof(SqlSugarUnitOfWorkAttribute), true).FirstOrDefault() as SqlSugarUnitOfWorkAttribute);
+            var attribute = (method.GetCustomAttributes(typeof(SqlSugarUnitOfWorkAttribute), true).FirstOrDefault() as SqlSugarUnitOfWorkAttribute);
 
-                // 开启事务
-                _sqlSugarClient.Ado.BeginTran(attribute.IsolationLevel);
+            // 开启事务
+            _sqlSugarClient.Ado.BeginTran(attribute.IsolationLevel);
 
-                // 调用方法
-                var resultContext = await next();
+            // 调用方法
+            var resultContext = await next();
 
-                if (resultContext.Exception == null)
+            if (resultContext.Exception == null)
+            {
+                try
                 {
-                    try
-                    {
-                        _sqlSugarClient.Ado.CommitTran();
-                    }
-                    catch
-                    {
-                        _sqlSugarClient.Ado.RollbackTran();
-                    }
-                    finally
-                    {
-                        _sqlSugarClient.Ado.Dispose();
-                    }
+                    _sqlSugarClient.Ado.CommitTran();
                 }
-                else
+                catch
                 {
-                    // 回滚事务
                     _sqlSugarClient.Ado.RollbackTran();
+                }
+                finally
+                {
                     _sqlSugarClient.Ado.Dispose();
                 }
             }
+            else
+            {
+                // 回滚事务
+                _sqlSugarClient.Ado.RollbackTran();
+                _sqlSugarClient.Ado.Dispose();
+            }
         }
     }
 }

+ 50 - 0
Admin.NET/Admin.NET.Core/GlobalUsings.cs

@@ -0,0 +1,50 @@
+global using Admin.NET.Core.Service;
+global using Admin.NET.Core.Util;
+global using Furion;
+global using Furion.ConfigurableOptions;
+global using Furion.DataEncryption;
+global using Furion.DataValidation;
+global using Furion.DependencyInjection;
+global using Furion.DynamicApiController;
+global using Furion.EventBus;
+global using Furion.FriendlyException;
+global using Furion.JsonSerialization;
+global using Furion.RemoteRequest.Extensions;
+global using Furion.TaskScheduler;
+global using Furion.UnifyResult;
+global using Furion.UnifyResult.Internal;
+global using Furion.ViewEngine;
+global using Mapster;
+global using MapsterMapper;
+global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Http;
+global using Microsoft.AspNetCore.Mvc;
+global using Microsoft.AspNetCore.Mvc.Controllers;
+global using Microsoft.AspNetCore.Mvc.Filters;
+global using Microsoft.Extensions.Caching.Distributed;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Options;
+global using Serilog;
+global using SKIT.FlurlHttpClient;
+global using SKIT.FlurlHttpClient.Wechat.Api;
+global using SKIT.FlurlHttpClient.Wechat.Api.Models;
+global using SKIT.FlurlHttpClient.Wechat.TenpayV3;
+global using SKIT.FlurlHttpClient.Wechat.TenpayV3.Events;
+global using SKIT.FlurlHttpClient.Wechat.TenpayV3.Models;
+global using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings;
+global using SqlSugar;
+global using System.Collections;
+global using System.ComponentModel;
+global using System.ComponentModel.DataAnnotations;
+global using System.Data;
+global using System.Diagnostics;
+global using System.Linq.Dynamic.Core;
+global using System.Linq.Expressions;
+global using System.Reflection;
+global using System.Runtime.InteropServices;
+global using System.Security.Claims;
+global using System.Text;
+global using System.Text.RegularExpressions;
+global using System.Web;
+global using UAParser;

+ 15 - 18
Admin.NET/Admin.NET.Core/Option/CacheOptions.cs

@@ -1,25 +1,22 @@
-using Furion.ConfigurableOptions;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 缓存配置选项
+/// </summary>
+public sealed class CacheOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 缓存配置选项
+    /// 缓存类型
     /// </summary>
-    public sealed class CacheOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 缓存类型
-        /// </summary>
-        public string CacheType { get; set; }
+    public string CacheType { get; set; }
 
-        /// <summary>
-        /// Redis连接
-        /// </summary>
-        public string RedisConnectionString { get; set; }
+    /// <summary>
+    /// Redis连接
+    /// </summary>
+    public string RedisConnectionString { get; set; }
 
-        /// <summary>
-        /// 键值前缀
-        /// </summary>
-        public string InstanceName { get; set; }
-    }
+    /// <summary>
+    /// 键值前缀
+    /// </summary>
+    public string InstanceName { get; set; }
 }

+ 55 - 59
Admin.NET/Admin.NET.Core/Option/ConnectionStringsOptions.cs

@@ -1,63 +1,59 @@
-using Furion.ConfigurableOptions;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 数据库链接配置
+/// </summary>
+public class ConnectionStringsOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 数据库链接配置
-    /// </summary>
-    public class ConnectionStringsOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 默认数据库编号
-        /// </summary>
-        public string DefaultConfigId { get; set; } = SqlSugarConst.ConfigId;
-
-        /// <summary>
-        /// 默认数据库类型
-        /// </summary>
-        public string DefaultDbType { get; set; }
-
-        /// <summary>
-        /// 默认数据库连接字符串
-        /// </summary>
-
-        public string DefaultConnection { get; set; }
-
-        /// <summary>
-        /// 初始化表和数据
-        /// </summary>
-        public bool InitTable { get; set; }
-
-        /// <summary>
-        /// 业务库集合
-        /// </summary>
-        public List<DbConfig> DbConfigs { get; set; } = new List<DbConfig>();
-    }
-
-    /// <summary>
-    /// 数据库参数
-    /// </summary>
-    public class DbConfig
-    {
-        /// <summary>
-        /// 数据库编号
-        /// </summary>
-        public string DbConfigId { get; set; }
-
-        /// <summary>
-        /// 数据库类型
-        /// </summary>
-        public string DbType { get; set; }
-
-        /// <summary>
-        /// 数据库连接字符串
-        /// </summary>
-        public string DbConnection { get; set; }
-
-        /// <summary>
-        /// 初始化表和数据
-        /// </summary>
-        public bool InitTable { get; set; }
-    }
+    /// 默认数据库编号
+    /// </summary>
+    public string DefaultConfigId { get; set; } = SqlSugarConst.ConfigId;
+
+    /// <summary>
+    /// 默认数据库类型
+    /// </summary>
+    public string DefaultDbType { get; set; }
+
+    /// <summary>
+    /// 默认数据库连接字符串
+    /// </summary>
+
+    public string DefaultConnection { get; set; }
+
+    /// <summary>
+    /// 初始化表和数据
+    /// </summary>
+    public bool InitTable { get; set; }
+
+    /// <summary>
+    /// 业务库集合
+    /// </summary>
+    public List<DbConfig> DbConfigs { get; set; } = new List<DbConfig>();
+}
+
+/// <summary>
+/// 数据库参数
+/// </summary>
+public class DbConfig
+{
+    /// <summary>
+    /// 数据库编号
+    /// </summary>
+    public string DbConfigId { get; set; }
+
+    /// <summary>
+    /// 数据库类型
+    /// </summary>
+    public string DbType { get; set; }
+
+    /// <summary>
+    /// 数据库连接字符串
+    /// </summary>
+    public string DbConnection { get; set; }
+
+    /// <summary>
+    /// 初始化表和数据
+    /// </summary>
+    public bool InitTable { get; set; }
 }

+ 15 - 18
Admin.NET/Admin.NET.Core/Option/OSSProviderOptions.cs

@@ -1,31 +1,28 @@
-using Furion.ConfigurableOptions;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 对象存储配置选项
+/// </summary>
+public sealed class OSSProviderOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 对象存储配置选项
+    /// 是否启用OSS存储
     /// </summary>
-    public sealed class OSSProviderOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 是否启用OSS存储
-        /// </summary>
-        public bool IsEnable { get; set; }
+    public bool IsEnable { get; set; }
 
-        public int Provider { get; set; }
+    public int Provider { get; set; }
 
-        public string Endpoint { get; set; }
+    public string Endpoint { get; set; }
 
-        public string AccessKey { get; set; }
+    public string AccessKey { get; set; }
 
-        public string SecretKey { get; set; }
+    public string SecretKey { get; set; }
 
-        public string Region { get; set; }
+    public string Region { get; set; }
 
-        public string SessionToken { get; set; }
+    public string SessionToken { get; set; }
 
-        public bool IsEnableHttps { get; set; }
+    public bool IsEnableHttps { get; set; }
 
-        public bool IsEnableCache { get; set; }
-    }
+    public bool IsEnableCache { get; set; }
 }

+ 19 - 22
Admin.NET/Admin.NET.Core/Option/PayCallBackOptions.cs

@@ -1,30 +1,27 @@
-using Furion.ConfigurableOptions;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 支付回调配置选项
+/// </summary>
+public sealed class PayCallBackOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 支付回调配置选项
+    /// 微信支付回调
     /// </summary>
-    public sealed class PayCallBackOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 微信支付回调
-        /// </summary>
-        public string WechatPayUrl { get; set; }
+    public string WechatPayUrl { get; set; }
 
-        /// <summary>
-        /// 微信退款回调
-        /// </summary>
-        public string WechatRefundUrl { get; set; }
+    /// <summary>
+    /// 微信退款回调
+    /// </summary>
+    public string WechatRefundUrl { get; set; }
 
-        /// <summary>
-        /// 支付宝支付回调
-        /// </summary>
-        public string AlipayUrl { get; set; }
+    /// <summary>
+    /// 支付宝支付回调
+    /// </summary>
+    public string AlipayUrl { get; set; }
 
-        /// <summary>
-        /// 支付宝退款回调
-        /// </summary>
-        public string AlipayRefundUrl { get; set; }
-    }
+    /// <summary>
+    /// 支付宝退款回调
+    /// </summary>
+    public string AlipayRefundUrl { get; set; }
 }

+ 7 - 10
Admin.NET/Admin.NET.Core/Option/RefreshTokenOptions.cs

@@ -1,15 +1,12 @@
-using Furion.ConfigurableOptions;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 刷新Token配置选项
+/// </summary>
+public sealed class RefreshTokenOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 刷新Token配置选项
+    /// 令牌过期时间(分钟) 默认2天
     /// </summary>
-    public sealed class RefreshTokenOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 令牌过期时间(分钟) 默认2天
-        /// </summary>
-        public int ExpiredTime { get; set; }
-    }
+    public int ExpiredTime { get; set; }
 }

+ 7 - 10
Admin.NET/Admin.NET.Core/Option/SnowIdOptions.cs

@@ -1,15 +1,12 @@
-using Furion.ConfigurableOptions;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 雪花Id配置选项
+/// </summary>
+public sealed class SnowIdOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 雪花Id配置选项
+    /// 机器码
     /// </summary>
-    public sealed class SnowIdOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 机器码
-        /// </summary>
-        public ushort WorkerId { get; set; }
-    }
+    public ushort WorkerId { get; set; }
 }

+ 15 - 19
Admin.NET/Admin.NET.Core/Option/UploadOptions.cs

@@ -1,26 +1,22 @@
-using Furion.ConfigurableOptions;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 文件上传配置选项
+/// </summary>
+public sealed class UploadOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 文件上传配置选项
+    /// 路径
     /// </summary>
-    public sealed class UploadOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 路径
-        /// </summary>
-        public string Path { get; set; }
+    public string Path { get; set; }
 
-        /// <summary>
-        /// 大小
-        /// </summary>
-        public long MaxSize { get; set; }
+    /// <summary>
+    /// 大小
+    /// </summary>
+    public long MaxSize { get; set; }
 
-        /// <summary>
-        /// 上传格式
-        /// </summary>
-        public List<string> ContentType { get; set; }
-    }
+    /// <summary>
+    /// 上传格式
+    /// </summary>
+    public List<string> ContentType { get; set; }
 }

+ 15 - 18
Admin.NET/Admin.NET.Core/Option/WechatOptions.cs

@@ -1,28 +1,25 @@
-using Furion.ConfigurableOptions;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 微信相关配置选项
+/// </summary>
+public sealed class WechatOptions : IConfigurableOptions
 {
-    /// <summary>
-    /// 微信相关配置选项
-    /// </summary>
-    public sealed class WechatOptions : IConfigurableOptions
-    {
-        //公众号
-        public string WechatAppId { get; set; }
+    //公众号
+    public string WechatAppId { get; set; }
 
-        public string WechatAppSecret { get; set; }
+    public string WechatAppSecret { get; set; }
 
-        public string EncodingAESKey { get; set; }
+    public string EncodingAESKey { get; set; }
 
-        public string Token { get; set; }
+    public string Token { get; set; }
 
-        //小程序
-        public string WxOpenAppId { get; set; }
+    //小程序
+    public string WxOpenAppId { get; set; }
 
-        public string WxOpenAppSecret { get; set; }
+    public string WxOpenAppSecret { get; set; }
 
-        public string WxOpenToken { get; set; }
+    public string WxOpenToken { get; set; }
 
-        public string WxOpenEncodingAESKey { get; set; }
-    }
+    public string WxOpenEncodingAESKey { get; set; }
 }

+ 27 - 30
Admin.NET/Admin.NET.Core/Option/WechatPayOptions.cs

@@ -1,40 +1,37 @@
-using Furion.ConfigurableOptions;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 微信支付配置选项
+/// </summary>
+public sealed class WechatPayOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 微信支付配置选项
+    /// 微信公众平台AppId、开放平台AppId、小程序AppId、企业微信CorpId
     /// </summary>
-    public sealed class WechatPayOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 微信公众平台AppId、开放平台AppId、小程序AppId、企业微信CorpId
-        /// </summary>
-        public string AppId { get; set; }
+    public string AppId { get; set; }
 
-        /// <summary>
-        ///商户平台的商户号
-        /// </summary>
-        public string MerchantId { get; set; }
+    /// <summary>
+    ///商户平台的商户号
+    /// </summary>
+    public string MerchantId { get; set; }
 
-        /// <summary>
-        /// 商户平台的APIv3密钥
-        /// </summary>
-        public string MerchantV3Secret { get; set; }
+    /// <summary>
+    /// 商户平台的APIv3密钥
+    /// </summary>
+    public string MerchantV3Secret { get; set; }
 
-        /// <summary>
-        /// 商户平台的证书序列号
-        /// </summary>
-        public string MerchantCertificateSerialNumber { get; set; }
+    /// <summary>
+    /// 商户平台的证书序列号
+    /// </summary>
+    public string MerchantCertificateSerialNumber { get; set; }
 
-        /// <summary>
-        /// 商户平台的API证书私钥(apiclient_key.pem文件内容)
-        /// </summary>
-        public string MerchantCertificatePrivateKey { get; set; }
+    /// <summary>
+    /// 商户平台的API证书私钥(apiclient_key.pem文件内容)
+    /// </summary>
+    public string MerchantCertificatePrivateKey { get; set; }
 
-        /// <summary>
-        /// RSA公钥 仅调用"企业付款到银行卡API"时使用
-        /// </summary>
-        public string RsaPublicKey { get; set; }
-    }
+    /// <summary>
+    /// RSA公钥 仅调用"企业付款到银行卡API"时使用
+    /// </summary>
+    public string RsaPublicKey { get; set; }
 }

+ 14 - 18
Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -1,26 +1,22 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统配置表种子数据
+/// </summary>
+public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
 {
     /// <summary>
-    /// 系统配置表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
+    /// <returns></returns>
+    public IEnumerable<SysConfig> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysConfig> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysConfig{ Id=252885263003800, Name="演示环境", Code="SysDemoEnv", Value="False", SysFlag=YesNoEnum.Y, Remark="演示环境", Order=1, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysConfig{ Id=252885263003801, Name="默认密码", Code="SysPassword", Value="123456", SysFlag=YesNoEnum.Y, Remark="默认密码", Order=2, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysConfig{ Id=252885263003802, Name="Token过期时间", Code="SysTokenExpire", Value="10080", SysFlag=YesNoEnum.Y, Remark="Token过期时间", Order=3, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysConfig{ Id=252885263003803, Name="操作日志", Code="SysOpLog", Value="True", SysFlag=YesNoEnum.Y, Remark="开启操作日志", Order=4, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") }
-            };
-        }
+            new SysConfig{ Id=252885263003800, Name="演示环境", Code="SysDemoEnv", Value="False", SysFlag=YesNoEnum.Y, Remark="演示环境", Order=1, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003801, Name="默认密码", Code="SysPassword", Value="123456", SysFlag=YesNoEnum.Y, Remark="默认密码", Order=2, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003802, Name="Token过期时间", Code="SysTokenExpire", Value="10080", SysFlag=YesNoEnum.Y, Remark="Token过期时间", Order=3, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003803, Name="操作日志", Code="SysOpLog", Value="True", SysFlag=YesNoEnum.Y, Remark="开启操作日志", Order=4, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") }
+        };
     }
 }

+ 17 - 21
Admin.NET/Admin.NET.Core/SeedData/SysDataResourceSeedData.cs

@@ -1,28 +1,24 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core.SeedData
+/// <summary>
+/// 系统数据资源种子数据
+/// </summary>
+public class SysDataResourceSeedData : ISqlSugarEntitySeedData<SysDataResource>
 {
     /// <summary>
-    /// 系统数据资源种子数据
+    /// 种子数据
     /// </summary>
-    public class SysDataResourceSeedData : ISqlSugarEntitySeedData<SysDataResource>
+    /// <returns></returns>
+    public IEnumerable<SysDataResource> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysDataResource> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysDataResource{ Id=243848612100001, Pid=0, Name="行政区",Value="district", Code="1001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="行政区"},
-                new SysDataResource{ Id=243848612100002, Pid=243848612100001, Name="北京市",Value="110000", Code="1001001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="北京市"},
-                new SysDataResource{ Id=243848612100003, Pid=243848612100002, Name="东城区",Value="110101", Code="1001001001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="东城区"},
-                new SysDataResource{ Id=243848612100004, Pid=0, Name="行业",Value="industry", Code="1002", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="行业"},
-                new SysDataResource{ Id=243848612100005, Pid=243848612100004, Name="一产",Value="一产", Code="1002001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="一产"},
-                new SysDataResource{ Id=243848612100006, Pid=243848612100005, Name="农、林、牧、渔",Value="农、林、牧、渔", Code="1002001001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="农、林、牧、渔"},
-            };
-        }
+            new SysDataResource{ Id=243848612100001, Pid=0, Name="行政区",Value="district", Code="1001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="行政区"},
+            new SysDataResource{ Id=243848612100002, Pid=243848612100001, Name="北京市",Value="110000", Code="1001001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="北京市"},
+            new SysDataResource{ Id=243848612100003, Pid=243848612100002, Name="东城区",Value="110101", Code="1001001001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="东城区"},
+            new SysDataResource{ Id=243848612100004, Pid=0, Name="行业",Value="industry", Code="1002", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="行业"},
+            new SysDataResource{ Id=243848612100005, Pid=243848612100004, Name="一产",Value="一产", Code="1002001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="一产"},
+            new SysDataResource{ Id=243848612100006, Pid=243848612100005, Name="农、林、牧、渔",Value="农、林、牧、渔", Code="1002001001", CreateTime=DateTime.Parse("2022-05-30 00:00:00"), Remark="农、林、牧、渔"},
+        };
     }
-}
+}

+ 40 - 44
Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -1,55 +1,51 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core.SeedData
+/// <summary>
+/// 系统字典值表种子数据
+/// </summary>
+public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
 {
     /// <summary>
-    /// 系统字典值表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
+    /// <returns></returns>
+    public IEnumerable<SysDictData> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysDictData> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysDictData{ Id=269037953100001, DictTypeId=269037954100001, Value="输入框", Code="Input", Order=100, Remark="输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100002, DictTypeId=269037954100001, Value="外键", Code="fk", Order=100, Remark="外键", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100003, DictTypeId=269037954100001, Value="时间选择", Code="DatePicker", Order=100, Remark="时间选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100004, DictTypeId=269037954100001, Value="选择器", Code="Select", Order=100, Remark="选择器", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100005, DictTypeId=269037954100001, Value="数字输入框", Code="InputNumber", Order=100, Remark="数字输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100006, DictTypeId=269037954100001, Value="文本域", Code="InputTextArea", Order=100, Remark="文本域", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100007, DictTypeId=269037954100001, Value="上传", Code="Upload", Order=100, Remark="上传", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100008, DictTypeId=269037954100001, Value="树选择", Code="ApiTreeSelect", Order=100, Remark="树选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953100009, DictTypeId=269037954100001, Value="开关", Code="Switch", Order=100, Remark="开关", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100001, DictTypeId=269037954100001, Value="输入框", Code="Input", Order=100, Remark="输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100002, DictTypeId=269037954100001, Value="外键", Code="fk", Order=100, Remark="外键", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100003, DictTypeId=269037954100001, Value="时间选择", Code="DatePicker", Order=100, Remark="时间选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100004, DictTypeId=269037954100001, Value="选择器", Code="Select", Order=100, Remark="选择器", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100005, DictTypeId=269037954100001, Value="数字输入框", Code="InputNumber", Order=100, Remark="数字输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100006, DictTypeId=269037954100001, Value="文本域", Code="InputTextArea", Order=100, Remark="文本域", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100007, DictTypeId=269037954100001, Value="上传", Code="Upload", Order=100, Remark="上传", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100008, DictTypeId=269037954100001, Value="树选择", Code="ApiTreeSelect", Order=100, Remark="树选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100009, DictTypeId=269037954100001, Value="开关", Code="Switch", Order=100, Remark="开关", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-                new SysDictData{ Id=269037953110001, DictTypeId=269037954100002, Value="等于", Code="==", Order=1, Remark="等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110002, DictTypeId=269037954100002, Value="模糊", Code="like", Order=1, Remark="模糊", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110003, DictTypeId=269037954100002, Value="大于", Code=">", Order=1, Remark="大于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110004, DictTypeId=269037954100002, Value="小于", Code="<", Order=1, Remark="小于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110005, DictTypeId=269037954100002, Value="不等于", Code="!=", Order=1, Remark="不等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110006, DictTypeId=269037954100002, Value="大于等于", Code=">=", Order=1, Remark="大于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110007, DictTypeId=269037954100002, Value="小于等于", Code="<=", Order=1, Remark="小于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110008, DictTypeId=269037954100002, Value="不为空", Code="isNotNull", Order=1, Remark="不为空", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953110009, DictTypeId=269037954100002, Value="时间范围", Code="~", Order=1, Remark="时间范围", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110001, DictTypeId=269037954100002, Value="等于", Code="==", Order=1, Remark="等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110002, DictTypeId=269037954100002, Value="模糊", Code="like", Order=1, Remark="模糊", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110003, DictTypeId=269037954100002, Value="大于", Code=">", Order=1, Remark="大于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110004, DictTypeId=269037954100002, Value="小于", Code="<", Order=1, Remark="小于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110005, DictTypeId=269037954100002, Value="不等于", Code="!=", Order=1, Remark="不等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110006, DictTypeId=269037954100002, Value="大于等于", Code=">=", Order=1, Remark="大于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110007, DictTypeId=269037954100002, Value="小于等于", Code="<=", Order=1, Remark="小于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110008, DictTypeId=269037954100002, Value="不为空", Code="isNotNull", Order=1, Remark="不为空", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110009, DictTypeId=269037954100002, Value="时间范围", Code="~", Order=1, Remark="时间范围", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-                new SysDictData{ Id=269037953120001, DictTypeId=269037954100003, Value="long", Code="long", Order=1, Remark="long", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120002, DictTypeId=269037954100003, Value="string", Code="string", Order=1, Remark="string", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120003, DictTypeId=269037954100003, Value="DateTime", Code="DateTime", Order=1, Remark="DateTime", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120004, DictTypeId=269037954100003, Value="bool", Code="bool", Order=1, Remark="bool", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120005, DictTypeId=269037954100003, Value="int", Code="int", Order=1, Remark="int", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120006, DictTypeId=269037954100003, Value="double", Code="double", Order=1, Remark="double", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120007, DictTypeId=269037954100003, Value="float", Code="float", Order=1, Remark="float", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120008, DictTypeId=269037954100003, Value="decimal", Code="decimal", Order=1, Remark="decimal", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120009, DictTypeId=269037954100003, Value="Guid", Code="Guid", Order=1, Remark="Guid", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953120010, DictTypeId=269037954100003, Value="DateTimeOffset", Code="DateTimeOffset", Order=1, Remark="DateTimeOffset", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120001, DictTypeId=269037954100003, Value="long", Code="long", Order=1, Remark="long", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120002, DictTypeId=269037954100003, Value="string", Code="string", Order=1, Remark="string", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120003, DictTypeId=269037954100003, Value="DateTime", Code="DateTime", Order=1, Remark="DateTime", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120004, DictTypeId=269037954100003, Value="bool", Code="bool", Order=1, Remark="bool", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120005, DictTypeId=269037954100003, Value="int", Code="int", Order=1, Remark="int", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120006, DictTypeId=269037954100003, Value="double", Code="double", Order=1, Remark="double", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120007, DictTypeId=269037954100003, Value="float", Code="float", Order=1, Remark="float", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120008, DictTypeId=269037954100003, Value="decimal", Code="decimal", Order=1, Remark="decimal", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120009, DictTypeId=269037954100003, Value="Guid", Code="Guid", Order=1, Remark="Guid", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120010, DictTypeId=269037954100003, Value="DateTimeOffset", Code="DateTimeOffset", Order=1, Remark="DateTimeOffset", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-                new SysDictData{ Id=269037953130001, DictTypeId=269037954100004, Value="下载压缩包", Code="1", Order=1, Remark="下载压缩包", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictData{ Id=269037953130002, DictTypeId=269037954100004, Value="生成到本项目", Code="2", Order=1, Remark="生成到本项目", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            };
-        }
+            new SysDictData{ Id=269037953130001, DictTypeId=269037954100004, Value="下载压缩包", Code="1", Order=1, Remark="下载压缩包", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953130002, DictTypeId=269037954100004, Value="生成到本项目", Code="2", Order=1, Remark="生成到本项目", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+        };
     }
 }

+ 14 - 18
Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs

@@ -1,26 +1,22 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core.SeedData
+/// <summary>
+/// 系统字典类型表种子数据
+/// </summary>
+public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
 {
     /// <summary>
-    /// 系统字典类型表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
+    /// <returns></returns>
+    public IEnumerable<SysDictType> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysDictType> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysDictType{ Id=269037954100001, Name="代码生成控件类型", Code="code_gen_effect_type", Order=100, Remark="代码生成控件类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictType{ Id=269037954100002, Name="代码生成查询类型", Code="code_gen_query_type", Order=100, Remark="代码生成查询类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictType{ Id=269037954100003, Name="代码生成.NET类型", Code="code_gen_net_type", Order=100, Remark="代码生成.NET类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysDictType{ Id=269037954100004, Name="代码生成方式", Code="code_gen_create_type", Order=100, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            };
-        }
+            new SysDictType{ Id=269037954100001, Name="代码生成控件类型", Code="code_gen_effect_type", Order=100, Remark="代码生成控件类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=269037954100002, Name="代码生成查询类型", Code="code_gen_query_type", Order=100, Remark="代码生成查询类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=269037954100003, Name="代码生成.NET类型", Code="code_gen_net_type", Order=100, Remark="代码生成.NET类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=269037954100004, Name="代码生成方式", Code="code_gen_create_type", Order=100, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+        };
     }
 }

+ 12 - 15
Admin.NET/Admin.NET.Core/SeedData/SysEmpExtOrgPosSeedData.cs

@@ -1,23 +1,20 @@
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统用户附属机构职位表种子数据
+/// </summary>
+public class SysEmpExtOrgPosSeedData : ISqlSugarEntitySeedData<SysUserExtOrgPos>
 {
     /// <summary>
-    /// 系统用户附属机构职位表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysEmpExtOrgPosSeedData : ISqlSugarEntitySeedData<SysUserExtOrgPos>
+    /// <returns></returns>
+    public IEnumerable<SysUserExtOrgPos> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysUserExtOrgPos> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysUserExtOrgPos{ Id=252885263003000, UserId=252885263003721, OrgId=252885263003730, PosId=252885263003720 },
-                new SysUserExtOrgPos{ Id=252885263003001, UserId=252885263003722, OrgId=252885263003740, PosId=252885263003722  }
-            };
-        }
+            new SysUserExtOrgPos{ Id=252885263003000, UserId=252885263003721, OrgId=252885263003730, PosId=252885263003720 },
+            new SysUserExtOrgPos{ Id=252885263003001, UserId=252885263003722, OrgId=252885263003740, PosId=252885263003722  }
+        };
     }
 }

+ 121 - 125
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -1,133 +1,129 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统菜单表种子数据
+/// </summary>
+public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
 {
     /// <summary>
-    /// 系统菜单表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
+    /// <returns></returns>
+    public IEnumerable<SysMenu> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysMenu> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysMenu{ Id=252885263003710, Pid=0, Title="数据面板", Path="/dashboard", Name="Dashboard", Component="LAYOUT", Redirect="/dashboard/analysis", Icon="ant-design:home-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysMenu{ Id=252885263003711, Pid=252885263003710, Title="分析页", Path="analysis", Name="Analysis", Component="/dashboard/analysis/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysMenu{ Id=252885263003712, Pid=252885263003710, Title="工作台", Path="workbench", Name="Workbench", Component="/dashboard/workbench/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-
-                new SysMenu{ Id=252885263003720, Pid=0, Title="系统管理", Path="/sys", Name="sys", Component="LAYOUT", Redirect="", Icon="ant-design:setting-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003730, Pid=252885263003720, Title="账号管理", Path="user", Name="UserManagement", Component="/sys/admin/user/index", Icon="ant-design:user-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003731, Pid=252885263003730, Title="账号查询", Permission="sysUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003732, Pid=252885263003730, Title="账号编辑", Permission="sysUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003733, Pid=252885263003730, Title="账号增加", Permission="sysUser:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003734, Pid=252885263003730, Title="账号删除", Permission="sysUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003735, Pid=252885263003730, Title="授权角色", Permission="sysUser:grantRole", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003736, Pid=252885263003730, Title="授权数据", Permission="sysUser:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003737, Pid=252885263003730, Title="重置密码", Permission="sysUser:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003738, Pid=252885263003730, Title="设置状态", Permission="sysUser:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003740, Pid=252885263003720, Title="角色管理", Path="role", Name="RoleManagement", Component="/sys/admin/role/index", Icon="ant-design:bulb-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003741, Pid=252885263003740, Title="角色查询", Permission="sysRole:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003742, Pid=252885263003740, Title="角色编辑", Permission="sysRole:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003743, Pid=252885263003740, Title="角色增加", Permission="sysRole:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003744, Pid=252885263003740, Title="角色删除", Permission="sysRole:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003745, Pid=252885263003740, Title="授权菜单", Permission="sysRole:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003746, Pid=252885263003740, Title="授权数据", Permission="sysRole:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003747, Pid=252885263003740, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003750, Pid=252885263003720, Title="菜单管理", Path="menu", Name="MenuManagement", Component="/sys/admin/menu/index", Icon="ant-design:menu-fold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003751, Pid=252885263003750, Title="菜单查询", Permission="sysMenu:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003752, Pid=252885263003750, Title="菜单编辑", Permission="sysMenu:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003753, Pid=252885263003750, Title="菜单增加", Permission="sysMenu:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003754, Pid=252885263003750, Title="菜单删除", Permission="sysMenu:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003760, Pid=252885263003720, Title="机构管理", Path="org", Name="OrgManagement", Component="/sys/admin/org/index", Icon="ant-design:gold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003761, Pid=252885263003760, Title="机构查询", Permission="sysOrg:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003762, Pid=252885263003760, Title="机构编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003763, Pid=252885263003760, Title="机构增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003764, Pid=252885263003760, Title="机构删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003770, Pid=252885263003720, Title="职位管理", Path="pos", Name="PosManagement", Component="/sys/admin/pos/index",Icon="ant-design:tool-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003771, Pid=252885263003770, Title="职位查询", Permission="sysPos:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003772, Pid=252885263003770, Title="职位编辑", Permission="sysPos:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003773, Pid=252885263003770, Title="职位增加", Permission="sysPos:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003774, Pid=252885263003770, Title="职位删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003775, Pid=252885263003720, Title="修改密码", Path="password", Name="PasswordManagement", Component="/sys/admin/password/index",Icon="ant-design:eye-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003780, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="LAYOUT", Redirect="", Icon="ant-design:ant-design-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=200 },
-                new SysMenu{ Id=252885263003790, Pid=252885263003780, Title="租户管理", Path="tenant", Name="TenantManagement", Component="/sys/admin/tenant/index", Icon="ant-design:cluster-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003791, Pid=252885263003790, Title="租户查询", Permission="sysTenant:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003792, Pid=252885263003790, Title="租户编辑", Permission="sysTenant:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003793, Pid=252885263003790, Title="租户增加", Permission="sysTenant:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003794, Pid=252885263003790, Title="租户删除", Permission="sysTenant:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003795, Pid=252885263003790, Title="授权菜单", Permission="sysTenant:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003796, Pid=252885263003790, Title="重置密码", Permission="sysTenant:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003800, Pid=252885263003780, Title="系统配置", Path="config", Name="ConfigManagement", Component="/sys/admin/config/index", Icon="ant-design:deployment-unit-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003801, Pid=252885263003800, Title="配置查询", Permission="sysConfig:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003802, Pid=252885263003800, Title="配置编辑", Permission="sysConfig:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003803, Pid=252885263003800, Title="配置增加", Permission="sysConfig:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003804, Pid=252885263003800, Title="配置删除", Permission="sysConfig:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003810, Pid=252885263003780, Title="字典管理", Path="dict", Name="DictManagement", Component="/sys/admin/dict/index", Icon="ant-design:book-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003811, Pid=252885263003810, Title="字典查询", Permission="sysDict:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003812, Pid=252885263003810, Title="字典编辑", Permission="sysDict:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003813, Pid=252885263003810, Title="字典增加", Permission="sysDict:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003814, Pid=252885263003810, Title="字典删除", Permission="sysDict:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003820, Pid=252885263003780, Title="短信管理", Path="sms", Name="SmsManagement", Component="/sys/admin/sms/index", Icon="ant-design:mail-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003830, Pid=252885263003780, Title="任务调度", Path="timer", Name="TimerManagement", Component="/sys/admin/timer/index", Icon="ant-design:clock-circle-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003831, Pid=252885263003830, Title="任务查询", Permission="sysTimer:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003832, Pid=252885263003830, Title="任务编辑", Permission="sysTimer:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003833, Pid=252885263003830, Title="任务增加", Permission="sysTimer:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003834, Pid=252885263003830, Title="任务删除", Permission="sysTimer:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003835, Pid=252885263003830, Title="设置状态", Permission="sysTimer:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003840, Pid=252885263003780, Title="代码生成", Path="code", Name="CodeManagement", Component="/sys/admin/code/index", Icon="ant-design:bug-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003850, Pid=252885263003780, Title="数据库管理", Path="database", Name="DBManagement", Component="/sys/admin/database/index",Icon="ant-design:database-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003860, Pid=252885263003780, Title="在线用户", Path="online", Name="OnlineManagement", Component="/sys/admin/online/index", Icon="ant-design:user-switch-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003861, Pid=252885263003860, Title="用户查询", Permission="online:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003862, Pid=252885263003860, Title="用户删除", Permission="online:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003870, Pid=252885263003780, Title="系统监控", Path="server", Name="ServerManagement", Component="/sys/admin/server/index", Icon="ant-design:alert-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003880, Pid=252885263003780, Title="缓存管理", Path="cache", Name="CacheManagement", Component="/sys/admin/cache/index", Icon="ant-design:thunderbolt-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003881, Pid=252885263003880, Title="缓存查询", Permission="cache:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003882, Pid=252885263003880, Title="缓存删除", Permission="cache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003890, Pid=252885263003780, Title="数据资源", Path="dataResource", Name="DataResourceManagement", Component="/sys/admin/dataResource/index", Icon="ant-design:funnel-plot-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003891, Pid=252885263003890, Title="资源查询", Permission="sysDataResource:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003892, Pid=252885263003890, Title="资源编辑", Permission="sysDataResource:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003893, Pid=252885263003890, Title="资源增加", Permission="sysDataResource:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003894, Pid=252885263003890, Title="资源删除", Permission="sysDataResource:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003900, Pid=0, Title="日志管理", Path="/log", Name="log", Component="LAYOUT", Redirect="", Icon="ant-design:carry-out-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=300 },
-                new SysMenu{ Id=252885263003910, Pid=252885263003900, Title="访问日志", Path="vislog", Name="VislogManagement", Component="/sys/admin/log/vislog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003911, Pid=252885263003910, Title="日志查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003912, Pid=252885263003910, Title="日志清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003920, Pid=252885263003900, Title="操作日志", Path="oplog", Name="OplogManagement", Component="/sys/admin/log/oplog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003921, Pid=252885263003920, Title="日志查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003922, Pid=252885263003920, Title="日志清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003930, Pid=252885263003900, Title="异常日志", Path="exlog", Name="ExlogManagement", Component="/sys/admin/log/exlog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003931, Pid=252885263003930, Title="日志查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003932, Pid=252885263003930, Title="日志清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003940, Pid=0, Title="文件管理", Path="/file", Name="file", Component="LAYOUT", Redirect="", Icon="ant-design:file-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=400 },
-                new SysMenu{ Id=252885263003950, Pid=252885263003940, Title="文件管理", Path="file", Name="FileManagement", Component="/sys/admin/file/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003951, Pid=252885263003950, Title="文件查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003952, Pid=252885263003950, Title="文件上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003953, Pid=252885263003950, Title="文件下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003954, Pid=252885263003950, Title="文件删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-                new SysMenu{ Id=252885263003960, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="LAYOUT", Redirect="", Icon="ant-design:read-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=500 },
-                new SysMenu{ Id=252885263003961, Pid=252885263003960, Title="接口文档", Path="api", Name="Api", FrameSrc="https://localhost:44326/api/", Component="IFrame", Icon="ant-design:api-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003962, Pid=252885263003960, Title="Furion文档", Path="https://dotnetchina.gitee.io/furion/", Name="Furion", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                new SysMenu{ Id=252885263003963, Pid=252885263003960, Title="Vben文档", Path="https://vvbin.cn/doc-next/", Name="Vben", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            };
-        }
+            new SysMenu{ Id=252885263003710, Pid=0, Title="数据面板", Path="/dashboard", Name="Dashboard", Component="LAYOUT", Redirect="/dashboard/analysis", Icon="ant-design:home-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysMenu{ Id=252885263003711, Pid=252885263003710, Title="分析页", Path="analysis", Name="Analysis", Component="/dashboard/analysis/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysMenu{ Id=252885263003712, Pid=252885263003710, Title="工作台", Path="workbench", Name="Workbench", Component="/dashboard/workbench/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+
+            new SysMenu{ Id=252885263003720, Pid=0, Title="系统管理", Path="/sys", Name="sys", Component="LAYOUT", Redirect="", Icon="ant-design:setting-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003730, Pid=252885263003720, Title="账号管理", Path="user", Name="UserManagement", Component="/sys/admin/user/index", Icon="ant-design:user-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003731, Pid=252885263003730, Title="账号查询", Permission="sysUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003732, Pid=252885263003730, Title="账号编辑", Permission="sysUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003733, Pid=252885263003730, Title="账号增加", Permission="sysUser:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003734, Pid=252885263003730, Title="账号删除", Permission="sysUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003735, Pid=252885263003730, Title="授权角色", Permission="sysUser:grantRole", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003736, Pid=252885263003730, Title="授权数据", Permission="sysUser:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003737, Pid=252885263003730, Title="重置密码", Permission="sysUser:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003738, Pid=252885263003730, Title="设置状态", Permission="sysUser:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003740, Pid=252885263003720, Title="角色管理", Path="role", Name="RoleManagement", Component="/sys/admin/role/index", Icon="ant-design:bulb-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003741, Pid=252885263003740, Title="角色查询", Permission="sysRole:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003742, Pid=252885263003740, Title="角色编辑", Permission="sysRole:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003743, Pid=252885263003740, Title="角色增加", Permission="sysRole:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003744, Pid=252885263003740, Title="角色删除", Permission="sysRole:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003745, Pid=252885263003740, Title="授权菜单", Permission="sysRole:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003746, Pid=252885263003740, Title="授权数据", Permission="sysRole:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003747, Pid=252885263003740, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003750, Pid=252885263003720, Title="菜单管理", Path="menu", Name="MenuManagement", Component="/sys/admin/menu/index", Icon="ant-design:menu-fold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003751, Pid=252885263003750, Title="菜单查询", Permission="sysMenu:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003752, Pid=252885263003750, Title="菜单编辑", Permission="sysMenu:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003753, Pid=252885263003750, Title="菜单增加", Permission="sysMenu:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003754, Pid=252885263003750, Title="菜单删除", Permission="sysMenu:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003760, Pid=252885263003720, Title="机构管理", Path="org", Name="OrgManagement", Component="/sys/admin/org/index", Icon="ant-design:gold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003761, Pid=252885263003760, Title="机构查询", Permission="sysOrg:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003762, Pid=252885263003760, Title="机构编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003763, Pid=252885263003760, Title="机构增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003764, Pid=252885263003760, Title="机构删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003770, Pid=252885263003720, Title="职位管理", Path="pos", Name="PosManagement", Component="/sys/admin/pos/index",Icon="ant-design:tool-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003771, Pid=252885263003770, Title="职位查询", Permission="sysPos:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003772, Pid=252885263003770, Title="职位编辑", Permission="sysPos:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003773, Pid=252885263003770, Title="职位增加", Permission="sysPos:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003774, Pid=252885263003770, Title="职位删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003775, Pid=252885263003720, Title="修改密码", Path="password", Name="PasswordManagement", Component="/sys/admin/password/index",Icon="ant-design:eye-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003780, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="LAYOUT", Redirect="", Icon="ant-design:ant-design-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=200 },
+            new SysMenu{ Id=252885263003790, Pid=252885263003780, Title="租户管理", Path="tenant", Name="TenantManagement", Component="/sys/admin/tenant/index", Icon="ant-design:cluster-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003791, Pid=252885263003790, Title="租户查询", Permission="sysTenant:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003792, Pid=252885263003790, Title="租户编辑", Permission="sysTenant:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003793, Pid=252885263003790, Title="租户增加", Permission="sysTenant:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003794, Pid=252885263003790, Title="租户删除", Permission="sysTenant:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003795, Pid=252885263003790, Title="授权菜单", Permission="sysTenant:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003796, Pid=252885263003790, Title="重置密码", Permission="sysTenant:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003800, Pid=252885263003780, Title="系统配置", Path="config", Name="ConfigManagement", Component="/sys/admin/config/index", Icon="ant-design:deployment-unit-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003801, Pid=252885263003800, Title="配置查询", Permission="sysConfig:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003802, Pid=252885263003800, Title="配置编辑", Permission="sysConfig:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003803, Pid=252885263003800, Title="配置增加", Permission="sysConfig:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003804, Pid=252885263003800, Title="配置删除", Permission="sysConfig:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003810, Pid=252885263003780, Title="字典管理", Path="dict", Name="DictManagement", Component="/sys/admin/dict/index", Icon="ant-design:book-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003811, Pid=252885263003810, Title="字典查询", Permission="sysDict:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003812, Pid=252885263003810, Title="字典编辑", Permission="sysDict:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003813, Pid=252885263003810, Title="字典增加", Permission="sysDict:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003814, Pid=252885263003810, Title="字典删除", Permission="sysDict:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003820, Pid=252885263003780, Title="短信管理", Path="sms", Name="SmsManagement", Component="/sys/admin/sms/index", Icon="ant-design:mail-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003830, Pid=252885263003780, Title="任务调度", Path="timer", Name="TimerManagement", Component="/sys/admin/timer/index", Icon="ant-design:clock-circle-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003831, Pid=252885263003830, Title="任务查询", Permission="sysTimer:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003832, Pid=252885263003830, Title="任务编辑", Permission="sysTimer:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003833, Pid=252885263003830, Title="任务增加", Permission="sysTimer:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003834, Pid=252885263003830, Title="任务删除", Permission="sysTimer:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003835, Pid=252885263003830, Title="设置状态", Permission="sysTimer:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003840, Pid=252885263003780, Title="代码生成", Path="code", Name="CodeManagement", Component="/sys/admin/code/index", Icon="ant-design:bug-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003850, Pid=252885263003780, Title="数据库管理", Path="database", Name="DBManagement", Component="/sys/admin/database/index",Icon="ant-design:database-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003860, Pid=252885263003780, Title="在线用户", Path="online", Name="OnlineManagement", Component="/sys/admin/online/index", Icon="ant-design:user-switch-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003861, Pid=252885263003860, Title="用户查询", Permission="online:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003862, Pid=252885263003860, Title="用户删除", Permission="online:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003870, Pid=252885263003780, Title="系统监控", Path="server", Name="ServerManagement", Component="/sys/admin/server/index", Icon="ant-design:alert-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003880, Pid=252885263003780, Title="缓存管理", Path="cache", Name="CacheManagement", Component="/sys/admin/cache/index", Icon="ant-design:thunderbolt-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003881, Pid=252885263003880, Title="缓存查询", Permission="cache:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003882, Pid=252885263003880, Title="缓存删除", Permission="cache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003890, Pid=252885263003780, Title="数据资源", Path="dataResource", Name="DataResourceManagement", Component="/sys/admin/dataResource/index", Icon="ant-design:funnel-plot-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003891, Pid=252885263003890, Title="资源查询", Permission="sysDataResource:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003892, Pid=252885263003890, Title="资源编辑", Permission="sysDataResource:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003893, Pid=252885263003890, Title="资源增加", Permission="sysDataResource:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003894, Pid=252885263003890, Title="资源删除", Permission="sysDataResource:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003900, Pid=0, Title="日志管理", Path="/log", Name="log", Component="LAYOUT", Redirect="", Icon="ant-design:carry-out-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=300 },
+            new SysMenu{ Id=252885263003910, Pid=252885263003900, Title="访问日志", Path="vislog", Name="VislogManagement", Component="/sys/admin/log/vislog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003911, Pid=252885263003910, Title="日志查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003912, Pid=252885263003910, Title="日志清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003920, Pid=252885263003900, Title="操作日志", Path="oplog", Name="OplogManagement", Component="/sys/admin/log/oplog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003921, Pid=252885263003920, Title="日志查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003922, Pid=252885263003920, Title="日志清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003930, Pid=252885263003900, Title="异常日志", Path="exlog", Name="ExlogManagement", Component="/sys/admin/log/exlog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003931, Pid=252885263003930, Title="日志查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003932, Pid=252885263003930, Title="日志清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003940, Pid=0, Title="文件管理", Path="/file", Name="file", Component="LAYOUT", Redirect="", Icon="ant-design:file-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=400 },
+            new SysMenu{ Id=252885263003950, Pid=252885263003940, Title="文件管理", Path="file", Name="FileManagement", Component="/sys/admin/file/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003951, Pid=252885263003950, Title="文件查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003952, Pid=252885263003950, Title="文件上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003953, Pid=252885263003950, Title="文件下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003954, Pid=252885263003950, Title="文件删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263003960, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="LAYOUT", Redirect="", Icon="ant-design:read-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=500 },
+            new SysMenu{ Id=252885263003961, Pid=252885263003960, Title="接口文档", Path="api", Name="Api", FrameSrc="https://localhost:44326/api/", Component="IFrame", Icon="ant-design:api-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003962, Pid=252885263003960, Title="Furion文档", Path="https://dotnetchina.gitee.io/furion/", Name="Furion", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003963, Pid=252885263003960, Title="Vben文档", Path="https://vvbin.cn/doc-next/", Name="Vben", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+        };
     }
 }

+ 25 - 29
Admin.NET/Admin.NET.Core/SeedData/SysOrgSeedData.cs

@@ -1,40 +1,36 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统机构表种子数据
+/// </summary>
+public class SysOrgSeedData : ISqlSugarEntitySeedData<SysOrg>
 {
     /// <summary>
-    /// 系统机构表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysOrgSeedData : ISqlSugarEntitySeedData<SysOrg>
+    /// <returns></returns>
+    public IEnumerable<SysOrg> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysOrg> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysOrg{ Id=252885263003720, Pid=0, Name="华北地区", Code="1001", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="华北地区", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003721, Pid=252885263003720, Name="市场部", Code="100101", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003722, Pid=252885263003720, Name="研发部", Code="100102", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="研发部", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003723, Pid=252885263003720, Name="财务部", Code="100103", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003724, Pid=252885263003723, Name="财务部1", Code="10010301", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部1", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003725, Pid=252885263003723, Name="财务部2", Code="10010302", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部2", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003720, Pid=0, Name="华北地区", Code="1001", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="华北地区", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003721, Pid=252885263003720, Name="市场部", Code="100101", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003722, Pid=252885263003720, Name="研发部", Code="100102", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="研发部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003723, Pid=252885263003720, Name="财务部", Code="100103", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003724, Pid=252885263003723, Name="财务部1", Code="10010301", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部1", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003725, Pid=252885263003723, Name="财务部2", Code="10010302", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部2", TenantId=142307070918780 },
 
-                new SysOrg{ Id=252885263003730, Pid=0, Name="华东地区", Code="1002", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="华东地区", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003731, Pid=252885263003730, Name="市场部", Code="100201", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003732, Pid=252885263003730, Name="研发部", Code="100202", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="研发部", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003733, Pid=252885263003730, Name="财务部", Code="100203", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003730, Pid=0, Name="华东地区", Code="1002", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="华东地区", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003731, Pid=252885263003730, Name="市场部", Code="100201", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003732, Pid=252885263003730, Name="研发部", Code="100202", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="研发部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003733, Pid=252885263003730, Name="财务部", Code="100203", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务部", TenantId=142307070918780 },
 
-                new SysOrg{ Id=252885263003740, Pid=0, Name="华南地区", Code="1003", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="华南地区", TenantId=142307070918780  },
-                new SysOrg{ Id=252885263003741, Pid=252885263003740, Name="市场部", Code="100301", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003742, Pid=252885263003740, Name="研发部", Code="100302", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
-                new SysOrg{ Id=252885263003743, Pid=252885263003740, Name="财务部", Code="100303", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003740, Pid=0, Name="华南地区", Code="1003", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="华南地区", TenantId=142307070918780  },
+            new SysOrg{ Id=252885263003741, Pid=252885263003740, Name="市场部", Code="100301", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003742, Pid=252885263003740, Name="研发部", Code="100302", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
+            new SysOrg{ Id=252885263003743, Pid=252885263003740, Name="财务部", Code="100303", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="市场部", TenantId=142307070918780 },
 
-                new SysOrg{ Id=252885263003750, Pid=0, Name="租户1公司", Code="2001", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="租户1公司" , TenantId=142307070918781 },
-            };
-        }
+            new SysOrg{ Id=252885263003750, Pid=0, Name="租户1公司", Code="2001", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="租户1公司" , TenantId=142307070918781 },
+        };
     }
 }

+ 20 - 24
Admin.NET/Admin.NET.Core/SeedData/SysPosSeedData.cs

@@ -1,33 +1,29 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统职位表种子数据
+/// </summary>
+public class SysPosSeedData : ISqlSugarEntitySeedData<SysPos>
 {
     /// <summary>
-    /// 系统职位表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysPosSeedData : ISqlSugarEntitySeedData<SysPos>
+    /// <returns></returns>
+    public IEnumerable<SysPos> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysPos> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysPos{ Id=252885263003720, Name="总经理", Code="zjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="总经理", TenantId=142307070918780 },
-                new SysPos{ Id=252885263003721, Name="副总经理", Code="fzjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副总经理", Status=StatusEnum.Disable, TenantId=142307070918780 },
-                new SysPos{ Id=252885263003722, Name="部门经理", Code="bmjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="部门经理", TenantId=142307070918780 },
-                new SysPos{ Id=252885263003723, Name="工作人员", Code="gzry", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="工作人员", TenantId=142307070918780 },
-                new SysPos{ Id=252885263003724, Name="其他", Code="qt", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="其他", TenantId=142307070918780 },
+            new SysPos{ Id=252885263003720, Name="总经理", Code="zjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="总经理", TenantId=142307070918780 },
+            new SysPos{ Id=252885263003721, Name="副总经理", Code="fzjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副总经理", Status=StatusEnum.Disable, TenantId=142307070918780 },
+            new SysPos{ Id=252885263003722, Name="部门经理", Code="bmjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="部门经理", TenantId=142307070918780 },
+            new SysPos{ Id=252885263003723, Name="工作人员", Code="gzry", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="工作人员", TenantId=142307070918780 },
+            new SysPos{ Id=252885263003724, Name="其他", Code="qt", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="其他", TenantId=142307070918780 },
 
-                new SysPos{ Id=252885263003725, Name="总经理", Code="zjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="总经理", TenantId=142307070918781 },
-                new SysPos{ Id=252885263003726, Name="副总经理", Code="fzjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副总经理", Status=StatusEnum.Disable, TenantId=142307070918781 },
-                new SysPos{ Id=252885263003727, Name="部门经理", Code="bmjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="部门经理", TenantId=142307070918781 },
-                new SysPos{ Id=252885263003728, Name="工作人员", Code="gzry", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="工作人员", TenantId=142307070918781 },
-                new SysPos{ Id=252885263003729, Name="其他", Code="qt", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="其他", TenantId=142307070918781 }
-            };
-        }
+            new SysPos{ Id=252885263003725, Name="总经理", Code="zjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="总经理", TenantId=142307070918781 },
+            new SysPos{ Id=252885263003726, Name="副总经理", Code="fzjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副总经理", Status=StatusEnum.Disable, TenantId=142307070918781 },
+            new SysPos{ Id=252885263003727, Name="部门经理", Code="bmjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="部门经理", TenantId=142307070918781 },
+            new SysPos{ Id=252885263003728, Name="工作人员", Code="gzry", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="工作人员", TenantId=142307070918781 },
+            new SysPos{ Id=252885263003729, Name="其他", Code="qt", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="其他", TenantId=142307070918781 }
+        };
     }
 }

+ 39 - 42
Admin.NET/Admin.NET.Core/SeedData/SysRoleMenuSeedData.cs

@@ -1,51 +1,48 @@
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统角色菜单表种子数据
+/// </summary>
+public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
 {
     /// <summary>
-    /// 系统角色菜单表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
+    /// <returns></returns>
+    public IEnumerable<SysRoleMenu> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysRoleMenu> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysRoleMenu{ Id=252885263004000, RoleId=252885263003720, MenuId=252885263003711 },
-                new SysRoleMenu{ Id=252885263004001, RoleId=252885263003720, MenuId=252885263003712 },
-                new SysRoleMenu{ Id=252885263004002, RoleId=252885263003720, MenuId=252885263003730 },
-                new SysRoleMenu{ Id=252885263004003, RoleId=252885263003720, MenuId=252885263003731 },
-                new SysRoleMenu{ Id=252885263004004, RoleId=252885263003720, MenuId=252885263003732 },
-                new SysRoleMenu{ Id=252885263004005, RoleId=252885263003720, MenuId=252885263003733 },
-                new SysRoleMenu{ Id=252885263004006, RoleId=252885263003720, MenuId=252885263003734 },
-                new SysRoleMenu{ Id=252885263004007, RoleId=252885263003720, MenuId=252885263003740 },
-                new SysRoleMenu{ Id=252885263004008, RoleId=252885263003720, MenuId=252885263003741 },
-                new SysRoleMenu{ Id=252885263004009, RoleId=252885263003720, MenuId=252885263003742 },
-                new SysRoleMenu{ Id=252885263004010, RoleId=252885263003720, MenuId=252885263003743 },
-                new SysRoleMenu{ Id=252885263004011, RoleId=252885263003720, MenuId=252885263003744 },
-                new SysRoleMenu{ Id=252885263004012, RoleId=252885263003720, MenuId=252885263003750 },
-                new SysRoleMenu{ Id=252885263004013, RoleId=252885263003720, MenuId=252885263003751 },
-                new SysRoleMenu{ Id=252885263004014, RoleId=252885263003720, MenuId=252885263003752 },
-                new SysRoleMenu{ Id=252885263004015, RoleId=252885263003720, MenuId=252885263003753 },
-                new SysRoleMenu{ Id=252885263004016, RoleId=252885263003720, MenuId=252885263003754 },
-                new SysRoleMenu{ Id=252885263004017, RoleId=252885263003720, MenuId=252885263003760 },
-                new SysRoleMenu{ Id=252885263004018, RoleId=252885263003720, MenuId=252885263003761 },
-                new SysRoleMenu{ Id=252885263004019, RoleId=252885263003720, MenuId=252885263003762 },
-                new SysRoleMenu{ Id=252885263004020, RoleId=252885263003720, MenuId=252885263003763 },
-                new SysRoleMenu{ Id=252885263004021, RoleId=252885263003720, MenuId=252885263003764 },
-                new SysRoleMenu{ Id=252885263004022, RoleId=252885263003720, MenuId=252885263003770 },
-                new SysRoleMenu{ Id=252885263004023, RoleId=252885263003720, MenuId=252885263003771 },
-                new SysRoleMenu{ Id=252885263004024, RoleId=252885263003720, MenuId=252885263003772 },
-                new SysRoleMenu{ Id=252885263004025, RoleId=252885263003720, MenuId=252885263003773 },
-                new SysRoleMenu{ Id=252885263004026, RoleId=252885263003720, MenuId=252885263003774 },
+            new SysRoleMenu{ Id=252885263004000, RoleId=252885263003720, MenuId=252885263003711 },
+            new SysRoleMenu{ Id=252885263004001, RoleId=252885263003720, MenuId=252885263003712 },
+            new SysRoleMenu{ Id=252885263004002, RoleId=252885263003720, MenuId=252885263003730 },
+            new SysRoleMenu{ Id=252885263004003, RoleId=252885263003720, MenuId=252885263003731 },
+            new SysRoleMenu{ Id=252885263004004, RoleId=252885263003720, MenuId=252885263003732 },
+            new SysRoleMenu{ Id=252885263004005, RoleId=252885263003720, MenuId=252885263003733 },
+            new SysRoleMenu{ Id=252885263004006, RoleId=252885263003720, MenuId=252885263003734 },
+            new SysRoleMenu{ Id=252885263004007, RoleId=252885263003720, MenuId=252885263003740 },
+            new SysRoleMenu{ Id=252885263004008, RoleId=252885263003720, MenuId=252885263003741 },
+            new SysRoleMenu{ Id=252885263004009, RoleId=252885263003720, MenuId=252885263003742 },
+            new SysRoleMenu{ Id=252885263004010, RoleId=252885263003720, MenuId=252885263003743 },
+            new SysRoleMenu{ Id=252885263004011, RoleId=252885263003720, MenuId=252885263003744 },
+            new SysRoleMenu{ Id=252885263004012, RoleId=252885263003720, MenuId=252885263003750 },
+            new SysRoleMenu{ Id=252885263004013, RoleId=252885263003720, MenuId=252885263003751 },
+            new SysRoleMenu{ Id=252885263004014, RoleId=252885263003720, MenuId=252885263003752 },
+            new SysRoleMenu{ Id=252885263004015, RoleId=252885263003720, MenuId=252885263003753 },
+            new SysRoleMenu{ Id=252885263004016, RoleId=252885263003720, MenuId=252885263003754 },
+            new SysRoleMenu{ Id=252885263004017, RoleId=252885263003720, MenuId=252885263003760 },
+            new SysRoleMenu{ Id=252885263004018, RoleId=252885263003720, MenuId=252885263003761 },
+            new SysRoleMenu{ Id=252885263004019, RoleId=252885263003720, MenuId=252885263003762 },
+            new SysRoleMenu{ Id=252885263004020, RoleId=252885263003720, MenuId=252885263003763 },
+            new SysRoleMenu{ Id=252885263004021, RoleId=252885263003720, MenuId=252885263003764 },
+            new SysRoleMenu{ Id=252885263004022, RoleId=252885263003720, MenuId=252885263003770 },
+            new SysRoleMenu{ Id=252885263004023, RoleId=252885263003720, MenuId=252885263003771 },
+            new SysRoleMenu{ Id=252885263004024, RoleId=252885263003720, MenuId=252885263003772 },
+            new SysRoleMenu{ Id=252885263004025, RoleId=252885263003720, MenuId=252885263003773 },
+            new SysRoleMenu{ Id=252885263004026, RoleId=252885263003720, MenuId=252885263003774 },
 
-                new SysRoleMenu{ Id=252885263003004, RoleId=252885263003721, MenuId=252885263003711 },
-                new SysRoleMenu{ Id=252885263003005, RoleId=252885263003721, MenuId=252885263003712 },
-            };
-        }
+            new SysRoleMenu{ Id=252885263003004, RoleId=252885263003721, MenuId=252885263003711 },
+            new SysRoleMenu{ Id=252885263003005, RoleId=252885263003721, MenuId=252885263003712 },
+        };
     }
 }

+ 16 - 20
Admin.NET/Admin.NET.Core/SeedData/SysRoleSeedData.cs

@@ -1,29 +1,25 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统角色表种子数据
+/// </summary>
+public class SysRoleSeedData : ISqlSugarEntitySeedData<SysRole>
 {
     /// <summary>
-    /// 系统角色表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysRoleSeedData : ISqlSugarEntitySeedData<SysRole>
+    /// <returns></returns>
+    public IEnumerable<SysRole> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysRole> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysRole{ Id=252885263003721, Name="管理员", DataScope=DataScopeEnum.Dept_with_child, Code="admin", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="管理员", TenantId=142307070918780 },
-                new SysRole{ Id=252885263003722, Name="普通用户", DataScope=DataScopeEnum.Self, Code="common", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="普通用户", TenantId=142307070918780 },
-                new SysRole{ Id=252885263003723, Name="游客", DataScope=DataScopeEnum.Define, Code="guest", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="游客", TenantId=142307070918780 },
+            new SysRole{ Id=252885263003721, Name="管理员", DataScope=DataScopeEnum.Dept_with_child, Code="admin", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="管理员", TenantId=142307070918780 },
+            new SysRole{ Id=252885263003722, Name="普通用户", DataScope=DataScopeEnum.Self, Code="common", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="普通用户", TenantId=142307070918780 },
+            new SysRole{ Id=252885263003723, Name="游客", DataScope=DataScopeEnum.Define, Code="guest", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="游客", TenantId=142307070918780 },
 
-                new SysRole{ Id=252885263003724, Name="管理员", DataScope=DataScopeEnum.Dept_with_child, Code="admin", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="管理员", TenantId=142307070918781 },
-                new SysRole{ Id=252885263003725, Name="普通用户", DataScope=DataScopeEnum.Self, Code="common", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="普通用户",  TenantId=142307070918781 },
-                new SysRole{ Id=252885263003726, Name="游客", DataScope=DataScopeEnum.Define, Code="guest", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="游客",  TenantId=142307070918781 },
-            };
-        }
+            new SysRole{ Id=252885263003724, Name="管理员", DataScope=DataScopeEnum.Dept_with_child, Code="admin", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="管理员", TenantId=142307070918781 },
+            new SysRole{ Id=252885263003725, Name="普通用户", DataScope=DataScopeEnum.Self, Code="common", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="普通用户",  TenantId=142307070918781 },
+            new SysRole{ Id=252885263003726, Name="游客", DataScope=DataScopeEnum.Define, Code="guest", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="游客",  TenantId=142307070918781 },
+        };
     }
 }

+ 12 - 16
Admin.NET/Admin.NET.Core/SeedData/SysTenantSeedData.cs

@@ -1,24 +1,20 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统租户表种子数据
+/// </summary>
+public class SysTenantSeedData : ISqlSugarEntitySeedData<SysTenant>
 {
     /// <summary>
-    /// 系统租户表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysTenantSeedData : ISqlSugarEntitySeedData<SysTenant>
+    /// <returns></returns>
+    public IEnumerable<SysTenant> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysTenant> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysTenant{ Id=142307070918780, Name="租户1", AdminName="admin1", Host="www.dilon.vip", Email="zuohuaijun@163.com", Phone="18020030720", Connection="D://db//1.db", Remark="租户1", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-                new SysTenant{ Id=142307070918781, Name="租户2", AdminName="admin2", Host="www.dilon.top", Email="515096995@qq.com", Phone="18020030720", Connection="D://db//2.db", Remark="租户2", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            };
-        }
+            new SysTenant{ Id=142307070918780, Name="租户1", AdminName="admin1", Host="www.dilon.vip", Email="zuohuaijun@163.com", Phone="18020030720", Connection="D://db//1.db", Remark="租户1", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysTenant{ Id=142307070918781, Name="租户2", AdminName="admin2", Host="www.dilon.top", Email="515096995@qq.com", Phone="18020030720", Connection="D://db//2.db", Remark="租户2", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+        };
     }
 }

+ 13 - 16
Admin.NET/Admin.NET.Core/SeedData/SysUserOrgSeedData.cs

@@ -1,24 +1,21 @@
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统用户机构表种子数据
+/// </summary>
+public class SysUserOrgSeedData : ISqlSugarEntitySeedData<SysUserOrg>
 {
     /// <summary>
-    /// 系统用户机构表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysUserOrgSeedData : ISqlSugarEntitySeedData<SysUserOrg>
+    /// <returns></returns>
+    public IEnumerable<SysUserOrg> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysUserOrg> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysUserOrg{ Id=252885263003000, UserId=252885263003721, OrgId=252885263003722 },
-                new SysUserOrg{ Id=252885263003001, UserId=252885263003722, OrgId=252885263003724 },
-                new SysUserOrg{ Id=252885263003002, UserId=252885263003723, OrgId=252885263003744 }
-            };
-        }
+            new SysUserOrg{ Id=252885263003000, UserId=252885263003721, OrgId=252885263003722 },
+            new SysUserOrg{ Id=252885263003001, UserId=252885263003722, OrgId=252885263003724 },
+            new SysUserOrg{ Id=252885263003002, UserId=252885263003723, OrgId=252885263003744 }
+        };
     }
 }

+ 13 - 16
Admin.NET/Admin.NET.Core/SeedData/SysUserRoleSeedData.cs

@@ -1,24 +1,21 @@
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统用户角色表种子数据
+/// </summary>
+public class SysUserRoleSeedData : ISqlSugarEntitySeedData<SysUserRole>
 {
     /// <summary>
-    /// 系统用户角色表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysUserRoleSeedData : ISqlSugarEntitySeedData<SysUserRole>
+    /// <returns></returns>
+    public IEnumerable<SysUserRole> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysUserRole> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysUserRole{ Id=252885263003000, UserId=252885263003721, RoleId=252885263003721 },
-                new SysUserRole{ Id=252885263003001, UserId=252885263003722, RoleId=252885263003722 },
-                new SysUserRole{ Id=252885263003002, UserId=252885263003723, RoleId=252885263003724 }
-            };
-        }
+            new SysUserRole{ Id=252885263003000, UserId=252885263003721, RoleId=252885263003721 },
+            new SysUserRole{ Id=252885263003001, UserId=252885263003722, RoleId=252885263003722 },
+            new SysUserRole{ Id=252885263003002, UserId=252885263003723, RoleId=252885263003724 }
+        };
     }
 }

+ 14 - 18
Admin.NET/Admin.NET.Core/SeedData/SysUserSeedData.cs

@@ -1,27 +1,23 @@
-using System;
-using System.Collections.Generic;
+namespace Admin.NET.Core;
 
-namespace Admin.NET.Core
+/// <summary>
+/// 系统用户表种子数据
+/// </summary>
+public class SysUserSeedData : ISqlSugarEntitySeedData<SysUser>
 {
     /// <summary>
-    /// 系统用户表种子数据
+    /// 种子数据
     /// </summary>
-    public class SysUserSeedData : ISqlSugarEntitySeedData<SysUser>
+    /// <returns></returns>
+    public IEnumerable<SysUser> HasData()
     {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<SysUser> HasData()
+        return new[]
         {
-            return new[]
-            {
-                new SysUser{ Id=252885263000000, UserName="vben", Password="e10adc3949ba59abbe56e057f20f883e", NickName="超级管理员", RealName="超级管理员", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Male, UserType=UserTypeEnum.SuperAdmin, Remark="超级管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), TenantId=142307070918780 },
-                new SysUser{ Id=252885263003721, UserName="admin", Password="e10adc3949ba59abbe56e057f20f883e", NickName="管理员", RealName="管理员", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Male, UserType=UserTypeEnum.Admin, Remark="管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=252885263003721, PosId=252885263003720, TenantId=142307070918780 },
-                new SysUser{ Id=252885263003722, UserName="guest", Password="e10adc3949ba59abbe56e057f20f883e", NickName="普通用户", RealName="普通用户", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Female, UserType=UserTypeEnum.None, Remark="普通账号", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=252885263003722, PosId=252885263003721, TenantId=142307070918780 },
+            new SysUser{ Id=252885263000000, UserName="vben", Password="e10adc3949ba59abbe56e057f20f883e", NickName="超级管理员", RealName="超级管理员", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Male, UserType=UserTypeEnum.SuperAdmin, Remark="超级管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), TenantId=142307070918780 },
+            new SysUser{ Id=252885263003721, UserName="admin", Password="e10adc3949ba59abbe56e057f20f883e", NickName="管理员", RealName="管理员", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Male, UserType=UserTypeEnum.Admin, Remark="管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=252885263003721, PosId=252885263003720, TenantId=142307070918780 },
+            new SysUser{ Id=252885263003722, UserName="guest", Password="e10adc3949ba59abbe56e057f20f883e", NickName="普通用户", RealName="普通用户", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Female, UserType=UserTypeEnum.None, Remark="普通账号", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=252885263003722, PosId=252885263003721, TenantId=142307070918780 },
 
-                new SysUser{ Id=252885263003723, UserName="Admin", Password="e10adc3949ba59abbe56e057f20f883e", NickName="管理员", RealName="管理员", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Male, UserType=UserTypeEnum.Admin, Remark="管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=252885263003744, PosId=252885263003724, TenantId=142307070918781 }
-            };
-        }
+            new SysUser{ Id=252885263003723, UserName="Admin", Password="e10adc3949ba59abbe56e057f20f883e", NickName="管理员", RealName="管理员", Phone="18020030720", Birthday=DateTime.Parse("1986-06-28"), Sex=GenderEnum.Male, UserType=UserTypeEnum.Admin, Remark="管理员", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrgId=252885263003744, PosId=252885263003724, TenantId=142307070918781 }
+        };
     }
 }

+ 150 - 166
Admin.NET/Admin.NET.Core/Service/Auth/AuthService.cs

@@ -1,183 +1,167 @@
-using Furion.DataEncryption;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.EventBus;
-using Furion.FriendlyException;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
-using UAParser;
-
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 系统登录授权服务
+/// </summary>
+[ApiDescriptionSettings(Name = "登录授权", Order = 200)]
+public class AuthService : IDynamicApiController, ITransient
 {
+    private readonly SqlSugarRepository<SysUser> _sysUserRep;
+    private readonly RefreshTokenOptions _refreshTokenOptions;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IUserManager _userManager;
+    private readonly IEventPublisher _eventPublisher;
+    private readonly SysUserService _sysUserService;
+    private readonly SysUserRoleService _sysUserRoleService;
+
+    public AuthService(SqlSugarRepository<SysUser> sysUserRep,
+        IOptions<RefreshTokenOptions> refreshTokenOptions,
+        IHttpContextAccessor httpContextAccessor,
+        IUserManager userManager,
+        IEventPublisher eventPublisher,
+        SysUserService sysUserService,
+        SysUserRoleService sysUserRoleService)
+    {
+        _sysUserRep = sysUserRep;
+        _httpContextAccessor = httpContextAccessor;
+        _userManager = userManager;
+        _refreshTokenOptions = refreshTokenOptions.Value;
+        _eventPublisher = eventPublisher;
+        _sysUserService = sysUserService;
+        _sysUserRoleService = sysUserRoleService;
+    }
+
     /// <summary>
-    /// 系统登录授权服务
+    /// 登录系统
     /// </summary>
-    [ApiDescriptionSettings(Name = "登录授权", Order = 200)]
-    public class AuthService : IDynamicApiController, ITransient
+    /// <param name="input"></param>
+    /// <remarks>用户名/密码:admin/123456</remarks>
+    /// <returns></returns>
+    [HttpPost("/login")]
+    [AllowAnonymous]
+    public async Task<LoginOutput> Login([Required] LoginInput input)
     {
-        private readonly SqlSugarRepository<SysUser> _sysUserRep;
-        private readonly RefreshTokenOptions _refreshTokenOptions;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IUserManager _userManager;
-        private readonly IEventPublisher _eventPublisher;
-        private readonly SysUserService _sysUserService;
-        private readonly SysUserRoleService _sysUserRoleService;
-
-        public AuthService(SqlSugarRepository<SysUser> sysUserRep,
-            IOptions<RefreshTokenOptions> refreshTokenOptions,
-            IHttpContextAccessor httpContextAccessor,
-            IUserManager userManager,
-            IEventPublisher eventPublisher,
-            SysUserService sysUserService,
-            SysUserRoleService sysUserRoleService)
-        {
-            _sysUserRep = sysUserRep;
-            _httpContextAccessor = httpContextAccessor;
-            _userManager = userManager;
-            _refreshTokenOptions = refreshTokenOptions.Value;
-            _eventPublisher = eventPublisher;
-            _sysUserService = sysUserService;
-            _sysUserRoleService = sysUserRoleService;
-        }
-
-        /// <summary>
-        /// 登录系统
-        /// </summary>
-        /// <param name="input"></param>
-        /// <remarks>用户名/密码:admin/123456</remarks>
-        /// <returns></returns>
-        [HttpPost("/login")]
-        [AllowAnonymous]
-        public async Task<LoginOutput> Login([Required] LoginInput input)
+        var encryptPasswod = MD5Encryption.Encrypt(input.Password); // 加密密码
+
+        // 判断用户名密码
+        var user = await _sysUserRep.AsQueryable().Includes(u => u.SysOrg)
+            .FirstAsync(u => u.UserName.Equals(input.UserName) && u.Password.Equals(encryptPasswod));
+        _ = user ?? throw Oops.Oh(ErrorCodeEnum.D1000);
+
+        // 验证账号是否被冻结
+        if (user.Status == StatusEnum.Disable)
+            throw Oops.Oh(ErrorCodeEnum.D1017);
+
+        // 生成Token令牌
+        var accessToken = JWTEncryption.Encrypt(new Dictionary<string, object>
         {
-            var encryptPasswod = MD5Encryption.Encrypt(input.Password); // 加密密码
+            {ClaimConst.UserId, user.Id},
+            {ClaimConst.TenantId, user.TenantId},
+            {ClaimConst.UserName, user.UserName},
+            {ClaimConst.RealName, user.RealName},
+            {ClaimConst.SuperAdmin, user.UserType},
+            {ClaimConst.OrgId, user.OrgId},
+            {ClaimConst.OrgName, user.SysOrg?.Name},
+        });
 
-            // 判断用户名密码
-            var user = await _sysUserRep.AsQueryable().Includes(u => u.SysOrg)
-                .FirstAsync(u => u.UserName.Equals(input.UserName) && u.Password.Equals(encryptPasswod));
-            _ = user ?? throw Oops.Oh(ErrorCodeEnum.D1000);
+        // 设置Swagger自动登录
+        _httpContextAccessor.HttpContext.SigninToSwagger(accessToken);
 
-            // 验证账号是否被冻结
-            if (user.Status == StatusEnum.Disable)
-                throw Oops.Oh(ErrorCodeEnum.D1017);
+        // 生成刷新Token令牌
+        var refreshToken = JWTEncryption.GenerateRefreshToken(accessToken, _refreshTokenOptions.ExpiredTime);
 
-            // 生成Token令牌
-            var accessToken = JWTEncryption.Encrypt(new Dictionary<string, object>
-            {
-                {ClaimConst.UserId, user.Id},
-                {ClaimConst.TenantId, user.TenantId},
-                {ClaimConst.UserName, user.UserName},
-                {ClaimConst.RealName, user.RealName},
-                {ClaimConst.SuperAdmin, user.UserType},
-                {ClaimConst.OrgId, user.OrgId},
-                {ClaimConst.OrgName, user.SysOrg?.Name},
-            });
+        // 设置刷新Token令牌
+        _httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = refreshToken;
+
+        return new LoginOutput
+        {
+            UserId = user.Id,
+            Token = accessToken
+        };
+    }
 
-            // 设置Swagger自动登录
-            _httpContextAccessor.HttpContext.SigninToSwagger(accessToken);
+    /// <summary>
+    /// 获取用户信息
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("/getUserInfo")]
+    public async Task<LoginUserInfoOutput> GetUserInfo()
+    {
+        var user = _userManager.User;
+        if (user == null)
+            throw Oops.Oh(ErrorCodeEnum.D1011);
 
-            // 生成刷新Token令牌
-            var refreshToken = JWTEncryption.GenerateRefreshToken(accessToken, _refreshTokenOptions.ExpiredTime);
+        // 角色信息
+        var roles = await _sysUserRoleService.GetUserRoleList(user.Id);
 
-            // 设置刷新Token令牌
-            _httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = refreshToken;
+        // 数据范围
+        var dataScopes = await _sysUserService.GetUserOrgIdList();
 
-            return new LoginOutput
+        // 增加登录日志
+        var client = Parser.GetDefault().Parse(_httpContextAccessor.HttpContext.Request.Headers["User-Agent"]);
+        await _eventPublisher.PublishAsync(new ChannelEventSource("Add:VisLog",
+            new SysLogVis
             {
-                UserId = user.Id,
-                Token = accessToken
-            };
-        }
-
-        /// <summary>
-        /// 获取用户信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("/getUserInfo")]
-        public async Task<LoginUserInfoOutput> GetUserInfo()
+                Success = YesNoEnum.Y,
+                Message = "登录",
+                Ip = _httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(),
+                Browser = client.UA.Family + client.UA.Major,
+                Os = client.OS.Family + client.OS.Major,
+                VisType = LoginTypeEnum.Login,
+                UserName = user.UserName,
+                RealName = user.RealName
+            }));
+
+        return new LoginUserInfoOutput
         {
-            var user = _userManager.User;
-            if (user == null)
-                throw Oops.Oh(ErrorCodeEnum.D1011);
-
-            // 角色信息
-            var roles = await _sysUserRoleService.GetUserRoleList(user.Id);
-
-            // 数据范围
-            var dataScopes = await _sysUserService.GetUserOrgIdList();
-
-            // 增加登录日志
-            var client = Parser.GetDefault().Parse(_httpContextAccessor.HttpContext.Request.Headers["User-Agent"]);
-            await _eventPublisher.PublishAsync(new ChannelEventSource("Add:VisLog",
-                new SysLogVis
-                {
-                    Success = YesNoEnum.Y,
-                    Message = "登录",
-                    Ip = _httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(),
-                    Browser = client.UA.Family + client.UA.Major,
-                    Os = client.OS.Family + client.OS.Major,
-                    VisType = LoginTypeEnum.Login,
-                    UserName = user.UserName,
-                    RealName = user.RealName
-                }));
-
-            return new LoginUserInfoOutput
+            UserId = user.Id,
+            Username = user.UserName,
+            RealName = user.RealName,
+            Avatar = user.Avatar,
+            Desc = user.Introduction,
+            Roles = roles.Select(u => new LoginRole
             {
-                UserId = user.Id,
-                Username = user.UserName,
-                RealName = user.RealName,
-                Avatar = user.Avatar,
-                Desc = user.Introduction,
-                Roles = roles.Select(u => new LoginRole
-                {
-                    RoleName = u.Name,
-                    Value = u.Code
-                }).ToList(),
-            };
-        }
-
-        /// <summary>
-        /// 获取刷新Token
-        /// </summary>
-        /// <param name="accessToken"></param>
-        /// <returns></returns>
-        [HttpPost("/getRefreshToken")]
-        public string RefreshToken([Required] string accessToken)
-        {
-            return JWTEncryption.GenerateRefreshToken(accessToken, _refreshTokenOptions.ExpiredTime);
-        }
-
-        /// <summary>
-        /// 退出系统
-        /// </summary>
-        [HttpGet("/logout")]
-        public async void Logout()
-        {
-            var user = _userManager.User;
-            if (user == null)
-                throw Oops.Oh(ErrorCodeEnum.D1011);
-
-            // 退出Swagger
-            _httpContextAccessor.HttpContext.SignoutToSwagger();
-            //_httpContextAccessor.HttpContext.Response.Headers["access-token"] = "invalid token";
-
-            // 增加退出日志
-            await _eventPublisher.PublishAsync(new ChannelEventSource("Add:VisLog",
-                new SysLogVis
-                {
-                    Success = YesNoEnum.Y,
-                    Message = "退出",
-                    VisType = LoginTypeEnum.Logout,
-                    Ip = _httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(),
-                    UserName = user.UserName,
-                    RealName = user.RealName
-                }));
-        }
+                RoleName = u.Name,
+                Value = u.Code
+            }).ToList(),
+        };
+    }
+
+    /// <summary>
+    /// 获取刷新Token
+    /// </summary>
+    /// <param name="accessToken"></param>
+    /// <returns></returns>
+    [HttpPost("/getRefreshToken")]
+    public string RefreshToken([Required] string accessToken)
+    {
+        return JWTEncryption.GenerateRefreshToken(accessToken, _refreshTokenOptions.ExpiredTime);
+    }
+
+    /// <summary>
+    /// 退出系统
+    /// </summary>
+    [HttpGet("/logout")]
+    public async void Logout()
+    {
+        var user = _userManager.User;
+        if (user == null)
+            throw Oops.Oh(ErrorCodeEnum.D1011);
+
+        // 退出Swagger
+        _httpContextAccessor.HttpContext.SignoutToSwagger();
+        //_httpContextAccessor.HttpContext.Response.Headers["access-token"] = "invalid token";
+
+        // 增加退出日志
+        await _eventPublisher.PublishAsync(new ChannelEventSource("Add:VisLog",
+            new SysLogVis
+            {
+                Success = YesNoEnum.Y,
+                Message = "退出",
+                VisType = LoginTypeEnum.Logout,
+                Ip = _httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(),
+                UserName = user.UserName,
+                RealName = user.RealName
+            }));
     }
 }

+ 15 - 18
Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginInput.cs

@@ -1,24 +1,21 @@
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core.Service;
 
-namespace Admin.NET.Core.Service
+/// <summary>
+/// 用户登录参数
+/// </summary>
+public class LoginInput
 {
     /// <summary>
-    /// 用户登录参数
+    /// 用户名
     /// </summary>
-    public class LoginInput
-    {
-        /// <summary>
-        /// 用户名
-        /// </summary>
-        /// <example>admin</example>
-        [Required(ErrorMessage = "用户名不能为空"), MinLength(3, ErrorMessage = "用户名不能少于3个字符")]
-        public string UserName { get; set; }
+    /// <example>admin</example>
+    [Required(ErrorMessage = "用户名不能为空"), MinLength(3, ErrorMessage = "用户名不能少于3个字符")]
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// 密码
-        /// </summary>
-        /// <example>123456</example>
-        [Required(ErrorMessage = "密码不能为空"), MinLength(3, ErrorMessage = "密码不能少于3个字符")]
-        public string Password { get; set; }
-    }
+    /// <summary>
+    /// 密码
+    /// </summary>
+    /// <example>123456</example>
+    [Required(ErrorMessage = "密码不能为空"), MinLength(3, ErrorMessage = "密码不能少于3个字符")]
+    public string Password { get; set; }
 }

+ 16 - 17
Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginOutput.cs

@@ -1,23 +1,22 @@
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 用户登录结果
+/// </summary>
+public class LoginOutput
 {
     /// <summary>
-    /// 用户登录结果
+    /// 用户Id
     /// </summary>
-    public class LoginOutput
-    {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        public long UserId { get; set; }
+    public long UserId { get; set; }
 
-        /// <summary>
-        /// 令牌Token
-        /// </summary>
-        public string Token { get; set; }
+    /// <summary>
+    /// 令牌Token
+    /// </summary>
+    public string Token { get; set; }
 
-        /// <summary>
-        /// 角色
-        /// </summary>
-        public LoginRole RoleInfo { get; set; }
-    }
+    /// <summary>
+    /// 角色
+    /// </summary>
+    public LoginRole RoleInfo { get; set; }
 }

+ 48 - 51
Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginUserInfoOutput.cs

@@ -1,55 +1,52 @@
-using System.Collections.Generic;
+namespace Admin.NET.Core.Service;
 
-namespace Admin.NET.Core.Service
+/// <summary>
+/// 用户登录信息
+/// </summary>
+public class LoginUserInfoOutput
 {
     /// <summary>
-    /// 用户登录信息
-    /// </summary>
-    public class LoginUserInfoOutput
-    {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        public long UserId { get; set; }
-
-        /// <summary>
-        /// 账号名称
-        /// </summary>
-        public string Username { get; set; }
-
-        /// <summary>
-        /// 真实姓名
-        /// </summary>
-        public string RealName { get; set; }
-
-        /// <summary>
-        /// 头像
-        /// </summary>
-        public string Avatar { get; set; }
-
-        /// <summary>
-        /// 个人简介
-        /// </summary>
-        public string Desc { get; set; }
-
-        /// <summary>
-        /// 角色集合
-        /// </summary>
-        public List<LoginRole> Roles { get; set; }
-    }
-
-    public class LoginRole
-    {
-        /// <summary>
-        /// 角色名称
-        /// </summary>
-        /// <example>admin</example>
-        public string RoleName { get; set; }
-
-        /// <summary>
-        /// 角色编码
-        /// </summary>
-        /// <example>123456</example>
-        public string Value { get; set; }
-    }
+    /// 用户Id
+    /// </summary>
+    public long UserId { get; set; }
+
+    /// <summary>
+    /// 账号名称
+    /// </summary>
+    public string Username { get; set; }
+
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    public string RealName { get; set; }
+
+    /// <summary>
+    /// 头像
+    /// </summary>
+    public string Avatar { get; set; }
+
+    /// <summary>
+    /// 个人简介
+    /// </summary>
+    public string Desc { get; set; }
+
+    /// <summary>
+    /// 角色集合
+    /// </summary>
+    public List<LoginRole> Roles { get; set; }
+}
+
+public class LoginRole
+{
+    /// <summary>
+    /// 角色名称
+    /// </summary>
+    /// <example>admin</example>
+    public string RoleName { get; set; }
+
+    /// <summary>
+    /// 角色编码
+    /// </summary>
+    /// <example>123456</example>
+    public string Value { get; set; }
 }

+ 16 - 20
Admin.NET/Admin.NET.Core/Service/Cache/ISysCacheService.cs

@@ -1,36 +1,32 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+namespace Admin.NET.Core.Service;
 
-namespace Admin.NET.Core.Service
+public interface ISysCacheService
 {
-    public interface ISysCacheService
-    {
-        Task AddCacheKey(string cacheKey);
+    Task AddCacheKey(string cacheKey);
 
-        Task DelByPatternAsync(string key);
+    Task DelByPatternAsync(string key);
 
-        Task DelCacheKey(string cacheKey);
+    Task DelCacheKey(string cacheKey);
 
-        bool Exists(string cacheKey);
+    bool Exists(string cacheKey);
 
-        Task<List<string>> GetAllCacheKeys();
+    Task<List<string>> GetAllCacheKeys();
 
-        Task<T> GetAsync<T>(string cacheKey);
+    Task<T> GetAsync<T>(string cacheKey);
 
-        Task<string> GetStringAsync(string cacheKey);
+    Task<string> GetStringAsync(string cacheKey);
 
-        Task RemoveAsync(string key);
+    Task RemoveAsync(string key);
 
-        Task SetAsync(string cacheKey, object value);
+    Task SetAsync(string cacheKey, object value);
 
-        Task SetStringAsync(string cacheKey, string value);
+    Task SetStringAsync(string cacheKey, string value);
 
-        Task<List<long>> GetOrgIdList(long userId);
+    Task<List<long>> GetOrgIdList(long userId);
 
-        Task SetOrgIdList(long userId, List<long> orgIdList);
+    Task SetOrgIdList(long userId, List<long> orgIdList);
 
-        Task<List<string>> GetPermission(long userId);
+    Task<List<string>> GetPermission(long userId);
 
-        Task SetPermission(long userId, List<string> permissions);
-    }
+    Task SetPermission(long userId, List<string> permissions);
 }

+ 212 - 223
Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

@@ -1,255 +1,244 @@
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.JsonSerialization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 系统缓存服务
+/// </summary>
+[ApiDescriptionSettings(Name = "系统缓存", Order = 190)]
+public class SysCacheService : ISysCacheService, IDynamicApiController, ISingleton
 {
+    private readonly IDistributedCache _cache;
+
+    public SysCacheService(IDistributedCache cache)
+    {
+        _cache = cache;
+    }
+
     /// <summary>
-    /// 系统缓存服务
+    /// 获取所有缓存列表
     /// </summary>
-    [ApiDescriptionSettings(Name = "系统缓存", Order = 190)]
-    public class SysCacheService : ISysCacheService, IDynamicApiController, ISingleton
+    /// <returns></returns>
+    [HttpGet("/sysCache/keyList")]
+    public async Task<List<string>> GetAllCacheKeys()
     {
-        private readonly IDistributedCache _cache;
-
-        public SysCacheService(IDistributedCache cache)
-        {
-            _cache = cache;
-        }
+        var res = await _cache.GetStringAsync(CacheConst.KeyAll);
+        return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<string>>(res);
+    }
 
-        /// <summary>
-        /// 获取所有缓存列表
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("/sysCache/keyList")]
-        public async Task<List<string>> GetAllCacheKeys()
-        {
-            var res = await _cache.GetStringAsync(CacheConst.KeyAll);
-            return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<string>>(res);
-        }
+    /// <summary>
+    /// 增加对象缓存
+    /// </summary>
+    /// <param name="cacheKey"></param>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    [HttpPost("/sysCache/addObject")]
+    public async Task SetAsync(string cacheKey, object value)
+    {
+        await _cache.SetAsync(cacheKey, Encoding.UTF8.GetBytes(JSON.Serialize(value)));
 
-        /// <summary>
-        /// 增加对象缓存
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        [HttpPost("/sysCache/addObject")]
-        public async Task SetAsync(string cacheKey, object value)
-        {
-            await _cache.SetAsync(cacheKey, Encoding.UTF8.GetBytes(JSON.Serialize(value)));
+        await AddCacheKey(cacheKey);
+    }
 
-            await AddCacheKey(cacheKey);
-        }
+    /// <summary>
+    /// 增加字符串缓存
+    /// </summary>
+    /// <param name="cacheKey"></param>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    [HttpPost("/sysCache/addString")]
+    public async Task SetStringAsync(string cacheKey, string value)
+    {
+        await _cache.SetStringAsync(cacheKey, value);
 
-        /// <summary>
-        /// 增加字符串缓存
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        [HttpPost("/sysCache/addString")]
-        public async Task SetStringAsync(string cacheKey, string value)
-        {
-            await _cache.SetStringAsync(cacheKey, value);
+        await AddCacheKey(cacheKey);
+    }
 
-            await AddCacheKey(cacheKey);
-        }
+    /// <summary>
+    /// 获取缓存
+    /// </summary>
+    /// <param name="cacheKey"></param>
+    /// <returns></returns>
+    [HttpGet("/sysCache/detail")]
+    public async Task<string> GetStringAsync(string cacheKey)
+    {
+        return await _cache.GetStringAsync(cacheKey);
+    }
 
-        /// <summary>
-        /// 获取缓存
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        [HttpGet("/sysCache/detail")]
-        public async Task<string> GetStringAsync(string cacheKey)
-        {
-            return await _cache.GetStringAsync(cacheKey);
-        }
+    /// <summary>
+    /// 删除缓存
+    /// </summary>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    [HttpGet("/sysCache/remove")]
+    public async Task RemoveAsync(string key)
+    {
+        await _cache.RemoveAsync(key);
 
-        /// <summary>
-        /// 删除缓存
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        [HttpGet("/sysCache/remove")]
-        public async Task RemoveAsync(string key)
-        {
-            await _cache.RemoveAsync(key);
+        await DelCacheKey(key);
+    }
 
-            await DelCacheKey(key);
-        }
+    /// <summary>
+    /// 删除某特征关键字缓存
+    /// </summary>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task DelByPatternAsync(string key)
+    {
+        var allkeys = await GetAllCacheKeys();
+        if (allkeys == null) return;
 
-        /// <summary>
-        /// 删除某特征关键字缓存
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task DelByPatternAsync(string key)
+        var delAllkeys = allkeys.Where(u => u.Contains(key)).ToList();
+        delAllkeys.ForEach(u =>
         {
-            var allkeys = await GetAllCacheKeys();
-            if (allkeys == null) return;
+            _cache.Remove(u);
+        });
 
-            var delAllkeys = allkeys.Where(u => u.Contains(key)).ToList();
-            delAllkeys.ForEach(u =>
-            {
-                _cache.Remove(u);
-            });
+        // 更新所有缓存键
+        allkeys = allkeys.Where(u => !u.Contains(key)).ToList();
+        await _cache.SetStringAsync(CacheConst.KeyAll, JSON.Serialize(allkeys));
+    }
 
-            // 更新所有缓存键
-            allkeys = allkeys.Where(u => !u.Contains(key)).ToList();
-            await _cache.SetStringAsync(CacheConst.KeyAll, JSON.Serialize(allkeys));
-        }
+    /// <summary>
+    /// 获取缓存
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="cacheKey"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task<T> GetAsync<T>(string cacheKey)
+    {
+        var res = await _cache.GetAsync(cacheKey);
+        return res == null ? default : JSON.Deserialize<T>(Encoding.UTF8.GetString(res));
+    }
 
-        /// <summary>
-        /// 获取缓存
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task<T> GetAsync<T>(string cacheKey)
-        {
-            var res = await _cache.GetAsync(cacheKey);
-            return res == null ? default : JSON.Deserialize<T>(Encoding.UTF8.GetString(res));
-        }
+    /// <summary>
+    /// 检查给定 key 是否存在
+    /// </summary>
+    /// <param name="cacheKey">键</param>
+    /// <returns></returns>
+    [NonAction]
+    public bool Exists(string cacheKey)
+    {
+        return _cache.Equals(cacheKey);
+    }
 
-        /// <summary>
-        /// 检查给定 key 是否存在
-        /// </summary>
-        /// <param name="cacheKey">键</param>
-        /// <returns></returns>
-        [NonAction]
-        public bool Exists(string cacheKey)
+    /// <summary>
+    /// 增加缓存Key
+    /// </summary>
+    /// <param name="cacheKey"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task AddCacheKey(string cacheKey)
+    {
+        var res = await _cache.GetStringAsync(CacheConst.KeyAll);
+        var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JSON.Deserialize<List<string>>(res);
+        if (!allkeys.Any(m => m == cacheKey))
         {
-            return _cache.Equals(cacheKey);
+            allkeys.Add(cacheKey);
+            await _cache.SetStringAsync(CacheConst.KeyAll, JSON.Serialize(allkeys));
         }
+    }
 
-        /// <summary>
-        /// 增加缓存Key
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task AddCacheKey(string cacheKey)
+    /// <summary>
+    /// 删除缓存
+    /// </summary>
+    /// <param name="cacheKey"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task DelCacheKey(string cacheKey)
+    {
+        var res = await _cache.GetStringAsync(CacheConst.KeyAll);
+        var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JSON.Deserialize<List<string>>(res);
+        if (allkeys.Any(m => m == cacheKey))
         {
-            var res = await _cache.GetStringAsync(CacheConst.KeyAll);
-            var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JSON.Deserialize<List<string>>(res);
-            if (!allkeys.Any(m => m == cacheKey))
-            {
-                allkeys.Add(cacheKey);
-                await _cache.SetStringAsync(CacheConst.KeyAll, JSON.Serialize(allkeys));
-            }
+            allkeys.Remove(cacheKey);
+            await _cache.SetStringAsync(CacheConst.KeyAll, JSON.Serialize(allkeys));
         }
+    }
 
-        /// <summary>
-        /// 删除缓存
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task DelCacheKey(string cacheKey)
-        {
-            var res = await _cache.GetStringAsync(CacheConst.KeyAll);
-            var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JSON.Deserialize<List<string>>(res);
-            if (allkeys.Any(m => m == cacheKey))
-            {
-                allkeys.Remove(cacheKey);
-                await _cache.SetStringAsync(CacheConst.KeyAll, JSON.Serialize(allkeys));
-            }
-        }
+    /// <summary>
+    /// 获取机构Id集合
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task<List<long>> GetOrgIdList(long userId)
+    {
+        var cacheKey = CacheConst.KeyOrgIdList + userId;
+        var res = await _cache.GetStringAsync(cacheKey);
+        return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<long>>(res);
+    }
 
-        /// <summary>
-        /// 获取机构Id集合
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task<List<long>> GetOrgIdList(long userId)
-        {
-            var cacheKey = CacheConst.KeyOrgIdList + userId;
-            var res = await _cache.GetStringAsync(cacheKey);
-            return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<long>>(res);
-        }
+    /// <summary>
+    /// 缓存机构Id集合
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="orgIdList"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task SetOrgIdList(long userId, List<long> orgIdList)
+    {
+        var cacheKey = CacheConst.KeyOrgIdList + userId;
+        await _cache.SetStringAsync(cacheKey, JSON.Serialize(orgIdList));
 
-        /// <summary>
-        /// 缓存机构Id集合
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="orgIdList"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task SetOrgIdList(long userId, List<long> orgIdList)
-        {
-            var cacheKey = CacheConst.KeyOrgIdList + userId;
-            await _cache.SetStringAsync(cacheKey, JSON.Serialize(orgIdList));
+        await AddCacheKey(cacheKey);
+    }
 
-            await AddCacheKey(cacheKey);
-        }
+    ///// <summary>
+    ///// 获取菜单缓存
+    ///// </summary>
+    ///// <param name="userId"></param>
+    ///// <param name="appCode"></param>
+    ///// <returns></returns>
+    //[NonAction]
+    //public async Task<List<AntDesignTreeNode>> GetMenu(long userId, string appCode)
+    //{
+    //    var cacheKey = CacheConst.KeyMenu + $"{userId}-{appCode}";
+    //    var res = await _cache.GetStringAsync(cacheKey);
+    //    return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<AntDesignTreeNode>>(res);
+    //}
+
+    ///// <summary>
+    ///// 缓存菜单
+    ///// </summary>
+    ///// <param name="userId"></param>
+    ///// <param name="appCode"></param>
+    ///// <param name="menus"></param>
+    ///// <returns></returns>
+    //[NonAction]
+    //public async Task SetMenu(long userId, string appCode, List<AntDesignTreeNode> menus)
+    //{
+    //    var cacheKey = CommonConst.CACHE_KEY_MENU + $"{userId}-{appCode}";
+    //    await _cache.SetStringAsync(cacheKey, JSON.Serialize(menus));
+
+    //    await AddCacheKey(cacheKey);
+    //}
 
-        ///// <summary>
-        ///// 获取菜单缓存
-        ///// </summary>
-        ///// <param name="userId"></param>
-        ///// <param name="appCode"></param>
-        ///// <returns></returns>
-        //[NonAction]
-        //public async Task<List<AntDesignTreeNode>> GetMenu(long userId, string appCode)
-        //{
-        //    var cacheKey = CacheConst.KeyMenu + $"{userId}-{appCode}";
-        //    var res = await _cache.GetStringAsync(cacheKey);
-        //    return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<AntDesignTreeNode>>(res);
-        //}
-
-        ///// <summary>
-        ///// 缓存菜单
-        ///// </summary>
-        ///// <param name="userId"></param>
-        ///// <param name="appCode"></param>
-        ///// <param name="menus"></param>
-        ///// <returns></returns>
-        //[NonAction]
-        //public async Task SetMenu(long userId, string appCode, List<AntDesignTreeNode> menus)
-        //{
-        //    var cacheKey = CommonConst.CACHE_KEY_MENU + $"{userId}-{appCode}";
-        //    await _cache.SetStringAsync(cacheKey, JSON.Serialize(menus));
-
-        //    await AddCacheKey(cacheKey);
-        //}
-
-        /// <summary>
-        /// 获取权限缓存(按钮)
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task<List<string>> GetPermission(long userId)
-        {
-            var cacheKey = CacheConst.KeyPermission + userId;
-            var res = await _cache.GetStringAsync(cacheKey);
-            return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<string>>(res);
-        }
+    /// <summary>
+    /// 获取权限缓存(按钮)
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task<List<string>> GetPermission(long userId)
+    {
+        var cacheKey = CacheConst.KeyPermission + userId;
+        var res = await _cache.GetStringAsync(cacheKey);
+        return string.IsNullOrWhiteSpace(res) ? null : JSON.Deserialize<List<string>>(res);
+    }
 
-        /// <summary>
-        /// 缓存权限
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="permissions"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task SetPermission(long userId, List<string> permissions)
-        {
-            var cacheKey = CacheConst.KeyPermission + userId;
-            await _cache.SetStringAsync(cacheKey, JSON.Serialize(permissions));
+    /// <summary>
+    /// 缓存权限
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="permissions"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task SetPermission(long userId, List<string> permissions)
+    {
+        var cacheKey = CacheConst.KeyPermission + userId;
+        await _cache.SetStringAsync(cacheKey, JSON.Serialize(permissions));
 
-            await AddCacheKey(cacheKey);
-        }
+        await AddCacheKey(cacheKey);
     }
 }

+ 110 - 120
Admin.NET/Admin.NET.Core/Service/CodeGen/CodeGenConfigService.cs

@@ -1,139 +1,129 @@
-using Admin.NET.Core.Util;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 代码生成详细配置服务
+/// </summary>
+[ApiDescriptionSettings(Name = "代码生成配置", Order = 149)]
+public class CodeGenConfigService : IDynamicApiController, ITransient
 {
+    private readonly SqlSugarRepository<SysCodeGenConfig> _sysCodeGenConfigRep;
+
+    public CodeGenConfigService(SqlSugarRepository<SysCodeGenConfig> sysCodeGenConfigRep)
+    {
+        _sysCodeGenConfigRep = sysCodeGenConfigRep;
+    }
+
     /// <summary>
-    /// 代码生成详细配置服务
+    /// 代码生成详细配置列表
     /// </summary>
-    [ApiDescriptionSettings(Name = "代码生成配置", Order = 149)]
-    public class CodeGenConfigService : IDynamicApiController, ITransient
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpGet("/sysCodeGenerateConfig/list")]
+    public async Task<List<CodeGenConfig>> List([FromQuery] CodeGenConfig input)
     {
-        private readonly SqlSugarRepository<SysCodeGenConfig> _sysCodeGenConfigRep;
+        return await _sysCodeGenConfigRep.AsQueryable().Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != YesNoEnum.Y.ToString())
+          .Select<CodeGenConfig>().ToListAsync();
+    }
 
-        public CodeGenConfigService(SqlSugarRepository<SysCodeGenConfig> sysCodeGenConfigRep)
-        {
-            _sysCodeGenConfigRep = sysCodeGenConfigRep;
-        }
+    /// <summary>
+    /// 增加
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task Add(CodeGenConfig input)
+    {
+        var codeGenConfig = input.Adapt<SysCodeGenConfig>();
+        await _sysCodeGenConfigRep.InsertAsync(codeGenConfig);
+    }
 
-        /// <summary>
-        /// 代码生成详细配置列表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet("/sysCodeGenerateConfig/list")]
-        public async Task<List<CodeGenConfig>> List([FromQuery] CodeGenConfig input)
-        {
-            return await _sysCodeGenConfigRep.AsQueryable().Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != YesNoEnum.Y.ToString())
-              .Select<CodeGenConfig>().ToListAsync();
-        }
+    /// <summary>
+    /// 删除
+    /// </summary>
+    /// <param name="codeGenId"></param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task Delete(long codeGenId)
+    {
+        await _sysCodeGenConfigRep.DeleteAsync(u => u.CodeGenId == codeGenId);
+    }
 
-        /// <summary>
-        /// 增加
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task Add(CodeGenConfig input)
-        {
-            var codeGenConfig = input.Adapt<SysCodeGenConfig>();
-            await _sysCodeGenConfigRep.InsertAsync(codeGenConfig);
-        }
+    /// <summary>
+    /// 更新
+    /// </summary>
+    /// <param name="inputList"></param>
+    /// <returns></returns>
+    [HttpPost("/sysCodeGenerateConfig/edit")]
+    public async Task Update(List<CodeGenConfig> inputList)
+    {
+        if (inputList == null || inputList.Count < 1) return;
+        List<SysCodeGenConfig> list = inputList.Adapt<List<SysCodeGenConfig>>();
+        await _sysCodeGenConfigRep.Context.Updateable(list).ExecuteCommandAsync();
+    }
 
-        /// <summary>
-        /// 删除
-        /// </summary>
-        /// <param name="codeGenId"></param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task Delete(long codeGenId)
-        {
-            await _sysCodeGenConfigRep.DeleteAsync(u => u.CodeGenId == codeGenId);
-        }
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpGet("/sysCodeGenerateConfig/detail")]
+    public async Task<SysCodeGenConfig> Detail(CodeGenConfig input)
+    {
+        return await _sysCodeGenConfigRep.AsQueryable().FirstAsync(u => u.Id == input.Id);
+    }
 
-        /// <summary>
-        /// 更新
-        /// </summary>
-        /// <param name="inputList"></param>
-        /// <returns></returns>
-        [HttpPost("/sysCodeGenerateConfig/edit")]
-        public async Task Update(List<CodeGenConfig> inputList)
-        {
-            if (inputList == null || inputList.Count < 1) return;
-            List<SysCodeGenConfig> list = inputList.Adapt<List<SysCodeGenConfig>>();
-            await _sysCodeGenConfigRep.Context.Updateable(list).ExecuteCommandAsync();
-        }
+    /// <summary>
+    /// 批量增加
+    /// </summary>
+    /// <param name="tableColumnOuputList"></param>
+    /// <param name="codeGenerate"></param>
+    [NonAction]
+    public void AddList(List<TableColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
+    {
+        if (tableColumnOuputList == null) return;
 
-        /// <summary>
-        /// 详情
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet("/sysCodeGenerateConfig/detail")]
-        public async Task<SysCodeGenConfig> Detail(CodeGenConfig input)
-        {
-            return await _sysCodeGenConfigRep.AsQueryable().FirstAsync(u => u.Id == input.Id);
-        }
+        var codeGenConfigs = new List<SysCodeGenConfig>();
 
-        /// <summary>
-        /// 批量增加
-        /// </summary>
-        /// <param name="tableColumnOuputList"></param>
-        /// <param name="codeGenerate"></param>
-        [NonAction]
-        public void AddList(List<TableColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
+        foreach (var tableColumn in tableColumnOuputList)
         {
-            if (tableColumnOuputList == null) return;
+            var codeGenConfig = new SysCodeGenConfig();
 
-            var codeGenConfigs = new List<SysCodeGenConfig>();
+            var YesOrNo = YesNoEnum.Y.ToString();
+            if (Convert.ToBoolean(tableColumn.ColumnKey))
+            {
+                YesOrNo = YesNoEnum.N.ToString();
+            }
 
-            foreach (var tableColumn in tableColumnOuputList)
+            if (CodeGenUtil.IsCommonColumn(tableColumn.ColumnName))
             {
-                var codeGenConfig = new SysCodeGenConfig();
-
-                var YesOrNo = YesNoEnum.Y.ToString();
-                if (Convert.ToBoolean(tableColumn.ColumnKey))
-                {
-                    YesOrNo = YesNoEnum.N.ToString();
-                }
-
-                if (CodeGenUtil.IsCommonColumn(tableColumn.ColumnName))
-                {
-                    codeGenConfig.WhetherCommon = YesNoEnum.Y.ToString();
-                    YesOrNo = YesNoEnum.N.ToString();
-                }
-                else
-                {
-                    codeGenConfig.WhetherCommon = YesNoEnum.N.ToString();
-                }
-
-                codeGenConfig.CodeGenId = codeGenerate.Id;
-                codeGenConfig.ColumnName = tableColumn.ColumnName;
-                codeGenConfig.ColumnComment = tableColumn.ColumnComment;
-                codeGenConfig.NetType = CodeGenUtil.ConvertDataType(tableColumn.DataType);
-                codeGenConfig.WhetherRetract = YesNoEnum.N.ToString();
-
-                codeGenConfig.WhetherRequired = YesNoEnum.N.ToString();
-                codeGenConfig.QueryWhether = YesOrNo;
-                codeGenConfig.WhetherAddUpdate = YesOrNo;
-                codeGenConfig.WhetherTable = YesOrNo;
-
-                codeGenConfig.ColumnKey = tableColumn.ColumnKey;
-
-                codeGenConfig.DataType = tableColumn.DataType;
-                codeGenConfig.EffectType = CodeGenUtil.DataTypeToEff(codeGenConfig.NetType);
-                codeGenConfig.QueryType = "=="; // QueryTypeEnum.eq.ToString();
-                codeGenConfigs.Add(codeGenConfig);
+                codeGenConfig.WhetherCommon = YesNoEnum.Y.ToString();
+                YesOrNo = YesNoEnum.N.ToString();
             }
-            //多库代码生成,这里要切回主库
-            _sysCodeGenConfigRep.Context.AsTenant().ChangeDatabase(SqlSugarConst.ConfigId);
-            _sysCodeGenConfigRep.Context.Insertable(codeGenConfigs).ExecuteCommand();
+            else
+            {
+                codeGenConfig.WhetherCommon = YesNoEnum.N.ToString();
+            }
+
+            codeGenConfig.CodeGenId = codeGenerate.Id;
+            codeGenConfig.ColumnName = tableColumn.ColumnName;
+            codeGenConfig.ColumnComment = tableColumn.ColumnComment;
+            codeGenConfig.NetType = CodeGenUtil.ConvertDataType(tableColumn.DataType);
+            codeGenConfig.WhetherRetract = YesNoEnum.N.ToString();
+
+            codeGenConfig.WhetherRequired = YesNoEnum.N.ToString();
+            codeGenConfig.QueryWhether = YesOrNo;
+            codeGenConfig.WhetherAddUpdate = YesOrNo;
+            codeGenConfig.WhetherTable = YesOrNo;
+
+            codeGenConfig.ColumnKey = tableColumn.ColumnKey;
+
+            codeGenConfig.DataType = tableColumn.DataType;
+            codeGenConfig.EffectType = CodeGenUtil.DataTypeToEff(codeGenConfig.NetType);
+            codeGenConfig.QueryType = "=="; // QueryTypeEnum.eq.ToString();
+            codeGenConfigs.Add(codeGenConfig);
         }
+        //多库代码生成,这里要切回主库
+        _sysCodeGenConfigRep.Context.AsTenant().ChangeDatabase(SqlSugarConst.ConfigId);
+        _sysCodeGenConfigRep.Context.Insertable(codeGenConfigs).ExecuteCommand();
     }
 }

+ 363 - 379
Admin.NET/Admin.NET.Core/Service/CodeGen/CodeGenService.cs

@@ -1,428 +1,412 @@
-using Admin.NET.Core.Util;
-using Furion;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Furion.ViewEngine;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Core.Service.CodeGen
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 代码生成器服务
+/// </summary>
+[ApiDescriptionSettings(Name = "代码生成器", Order = 150)]
+public class CodeGenService : IDynamicApiController, ITransient
 {
+    private readonly SqlSugarRepository<SysCodeGen> _sysCodeGenRep;
+    private readonly SqlSugarRepository<SysMenu> _sysMenuRep;
+    private readonly CodeGenConfigService _codeGenConfigService;
+    private readonly IViewEngine _viewEngine;
+    private readonly ICommonService _commonService;
+
+    public CodeGenService(SqlSugarRepository<SysCodeGen> sysCodeGenRep,
+        SqlSugarRepository<SysMenu> sysMenuRep,
+        CodeGenConfigService codeGenConfigService,
+        IViewEngine viewEngine,
+        ICommonService commonService)
+    {
+        _sysCodeGenRep = sysCodeGenRep;
+        _sysMenuRep = sysMenuRep;
+        _codeGenConfigService = codeGenConfigService;
+        _viewEngine = viewEngine;
+        _commonService = commonService;
+    }
+
     /// <summary>
-    /// 代码生成器服务
+    /// 分页查询
     /// </summary>
-    [ApiDescriptionSettings(Name = "代码生成器", Order = 150)]
-    public class CodeGenService : IDynamicApiController, ITransient
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpGet("/codeGenerate/page")]
+    public async Task<dynamic> QueryCodeGenPageList([FromQuery] CodeGenInput input)
     {
-        private readonly SqlSugarRepository<SysCodeGen> _sysCodeGenRep;
-        private readonly SqlSugarRepository<SysMenu> _sysMenuRep;
-        private readonly CodeGenConfigService _codeGenConfigService;
-        private readonly IViewEngine _viewEngine;
-        private readonly ICommonService _commonService;
-
-        public CodeGenService(SqlSugarRepository<SysCodeGen> sysCodeGenRep,
-            SqlSugarRepository<SysMenu> sysMenuRep,
-            CodeGenConfigService codeGenConfigService,
-            IViewEngine viewEngine,
-            ICommonService commonService)
-        {
-            _sysCodeGenRep = sysCodeGenRep;
-            _sysMenuRep = sysMenuRep;
-            _codeGenConfigService = codeGenConfigService;
-            _viewEngine = viewEngine;
-            _commonService = commonService;
-        }
+        var tableName = !string.IsNullOrEmpty(input.TableName?.Trim());
+        var codeGens = await _sysCodeGenRep.AsQueryable()
+            .WhereIF(!string.IsNullOrWhiteSpace(input.TableName), u => u.TableName.Contains(input.TableName.Trim()))
+            .ToPagedListAsync(input.Page, input.PageSize);
+        return codeGens;
+    }
 
-        /// <summary>
-        /// 分页查询
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet("/codeGenerate/page")]
-        public async Task<dynamic> QueryCodeGenPageList([FromQuery] CodeGenInput input)
-        {
-            var tableName = !string.IsNullOrEmpty(input.TableName?.Trim());
-            var codeGens = await _sysCodeGenRep.AsQueryable()
-                .WhereIF(!string.IsNullOrWhiteSpace(input.TableName), u => u.TableName.Contains(input.TableName.Trim()))
-                .ToPagedListAsync(input.Page, input.PageSize);
-            return codeGens;
-        }
+    /// <summary>
+    /// 增加
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("/codeGenerate/add")]
+    public async Task AddCodeGen(AddCodeGenInput input)
+    {
+        var isExist = await _sysCodeGenRep.AsQueryable().Where(u => u.TableName == input.TableName).AnyAsync();
+        if (isExist)
+            throw Oops.Oh(ErrorCodeEnum.D1400);
+
+        var codeGen = input.Adapt<SysCodeGen>();
+        var newCodeGen = await _sysCodeGenRep.Context.Insertable(codeGen).ExecuteReturnEntityAsync();
+        // 加入配置表中
+        _codeGenConfigService.AddList(GetColumnList(input), newCodeGen);
+    }
 
-        /// <summary>
-        /// 增加
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost("/codeGenerate/add")]
-        public async Task AddCodeGen(AddCodeGenInput input)
-        {
-            var isExist = await _sysCodeGenRep.AsQueryable().Where(u => u.TableName == input.TableName).AnyAsync();
-            if (isExist)
-                throw Oops.Oh(ErrorCodeEnum.D1400);
-
-            var codeGen = input.Adapt<SysCodeGen>();
-            var newCodeGen = await _sysCodeGenRep.Context.Insertable(codeGen).ExecuteReturnEntityAsync();
-            // 加入配置表中
-            _codeGenConfigService.AddList(GetColumnList(input), newCodeGen);
-        }
+    /// <summary>
+    /// 删除
+    /// </summary>
+    /// <param name="inputs"></param>
+    /// <returns></returns>
+    [HttpPost("/codeGenerate/delete")]
+    public async Task DeleteCodeGen(List<DeleteCodeGenInput> inputs)
+    {
+        if (inputs == null || inputs.Count < 1) return;
 
-        /// <summary>
-        /// 删除
-        /// </summary>
-        /// <param name="inputs"></param>
-        /// <returns></returns>
-        [HttpPost("/codeGenerate/delete")]
-        public async Task DeleteCodeGen(List<DeleteCodeGenInput> inputs)
+        var codeGenConfigTaskList = new List<Task>();
+        inputs.ForEach(u =>
         {
-            if (inputs == null || inputs.Count < 1) return;
+            _sysCodeGenRep.DeleteById(u.Id);
 
-            var codeGenConfigTaskList = new List<Task>();
-            inputs.ForEach(u =>
-            {
-                _sysCodeGenRep.DeleteById(u.Id);
-
-                // 删除配置表中
-                codeGenConfigTaskList.Add(_codeGenConfigService.Delete(u.Id));
-            });
-            await Task.WhenAll(codeGenConfigTaskList);
-        }
+            // 删除配置表中
+            codeGenConfigTaskList.Add(_codeGenConfigService.Delete(u.Id));
+        });
+        await Task.WhenAll(codeGenConfigTaskList);
+    }
 
-        /// <summary>
-        /// 更新
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost("/codeGenerate/edit")]
-        public async Task UpdateCodeGen(UpdateCodeGenInput input)
-        {
-            var isExist = await _sysCodeGenRep.AsQueryable().AnyAsync(u => u.TableName == input.TableName && u.Id != input.Id);
-            if (isExist)
-                throw Oops.Oh(ErrorCodeEnum.D1400);
+    /// <summary>
+    /// 更新
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("/codeGenerate/edit")]
+    public async Task UpdateCodeGen(UpdateCodeGenInput input)
+    {
+        var isExist = await _sysCodeGenRep.AsQueryable().AnyAsync(u => u.TableName == input.TableName && u.Id != input.Id);
+        if (isExist)
+            throw Oops.Oh(ErrorCodeEnum.D1400);
 
-            var codeGen = input.Adapt<SysCodeGen>();
-            await _sysCodeGenRep.UpdateAsync(codeGen);
-        }
+        var codeGen = input.Adapt<SysCodeGen>();
+        await _sysCodeGenRep.UpdateAsync(codeGen);
+    }
 
-        /// <summary>
-        /// 详情
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet("/codeGenerate/detail")]
-        public async Task<SysCodeGen> GetCodeGen([FromQuery] QueryCodeGenInput input)
-        {
-            return await _sysCodeGenRep.AsQueryable().SingleAsync(m => m.Id == input.Id);
-        }
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpGet("/codeGenerate/detail")]
+    public async Task<SysCodeGen> GetCodeGen([FromQuery] QueryCodeGenInput input)
+    {
+        return await _sysCodeGenRep.AsQueryable().SingleAsync(m => m.Id == input.Id);
+    }
 
-        /// <summary>
-        /// 获取数据库库集合
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("codeGenerate/DatabaseList")]
-        public async Task<List<DatabaseOutput>> GetDatabaseList()
+    /// <summary>
+    /// 获取数据库库集合
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("codeGenerate/DatabaseList")]
+    public async Task<List<DatabaseOutput>> GetDatabaseList()
+    {
+        var result = new List<DatabaseOutput>();
+        foreach (var item in SqlSugarConst.ConnectionConfigs)
         {
-            var result = new List<DatabaseOutput>();
-            foreach (var item in SqlSugarConst.ConnectionConfigs)
+            result.Add(new DatabaseOutput()
             {
-                result.Add(new DatabaseOutput()
-                {
-                    DbConfigId = item.ConfigId,
-                    DbType = item.DbType.ToString(),
-                    ConnectionString = item.ConnectionString,
-                });
-            }
-            return await Task.FromResult(result);
+                DbConfigId = item.ConfigId,
+                DbType = item.DbType.ToString(),
+                ConnectionString = item.ConnectionString,
+            });
         }
+        return await Task.FromResult(result);
+    }
 
-        /// <summary>
-        /// 获取数据库表(实体)集合
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("/codeGenerate/InformationList/{dbConfigId}")]
-        public async Task<List<TableOutput>> GetTableList(string dbConfigId = SqlSugarConst.ConfigId)
-        {
-            //切库,多库代码生成用
-            if (dbConfigId != SqlSugarConst.ConfigId)
-                _sysCodeGenRep.Context.AsTenant().ChangeDatabase(dbConfigId);
+    /// <summary>
+    /// 获取数据库表(实体)集合
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("/codeGenerate/InformationList/{dbConfigId}")]
+    public async Task<List<TableOutput>> GetTableList(string dbConfigId = SqlSugarConst.ConfigId)
+    {
+        //切库,多库代码生成用
+        if (dbConfigId != SqlSugarConst.ConfigId)
+            _sysCodeGenRep.Context.AsTenant().ChangeDatabase(dbConfigId);
 
-            List<DbTableInfo> dbTableInfos = _sysCodeGenRep.Context.DbMaintenance.GetTableInfoList(false);//这里不能走缓存,否则切库不起作用
-            List<string> dbTableNames = dbTableInfos.Select(x => x.Name).ToList();
+        List<DbTableInfo> dbTableInfos = _sysCodeGenRep.Context.DbMaintenance.GetTableInfoList(false);//这里不能走缓存,否则切库不起作用
+        List<string> dbTableNames = dbTableInfos.Select(x => x.Name).ToList();
 
-            IEnumerable<EntityInfo> entityInfos = await _commonService.GetEntityInfos();
-            entityInfos = entityInfos.Where(x => dbTableNames.Contains(x.DbTableName));
-            var result = new List<TableOutput>();
-            foreach (var item in entityInfos)
+        IEnumerable<EntityInfo> entityInfos = await _commonService.GetEntityInfos();
+        entityInfos = entityInfos.Where(x => dbTableNames.Contains(x.DbTableName));
+        var result = new List<TableOutput>();
+        foreach (var item in entityInfos)
+        {
+            result.Add(new TableOutput()
             {
-                result.Add(new TableOutput()
-                {
-                    DbConfigId = dbConfigId,
-                    EntityName = item.EntityName,
-                    TableName = item.DbTableName,
-                    TableComment = item.TableDescription
-                });
-            }
-            return result;
+                DbConfigId = dbConfigId,
+                EntityName = item.EntityName,
+                TableName = item.DbTableName,
+                TableComment = item.TableDescription
+            });
         }
+        return result;
+    }
+
+    /// <summary>
+    /// 根据表名获取列
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("/codeGenerate/ColumnList/{dbConfigId}/{tableName}")]
+    public List<TableColumnOuput> GetColumnListByTableName(string tableName, string dbConfigId = SqlSugarConst.ConfigId)
+    {
+        //切库,多库代码生成用
+        if (dbConfigId != SqlSugarConst.ConfigId)
+            _sysCodeGenRep.Context.AsTenant().ChangeDatabase(dbConfigId);
 
-        /// <summary>
-        /// 根据表名获取列
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("/codeGenerate/ColumnList/{dbConfigId}/{tableName}")]
-        public List<TableColumnOuput> GetColumnListByTableName(string tableName, string dbConfigId = SqlSugarConst.ConfigId)
+        // 获取实体类型属性
+        var entityType = _sysCodeGenRep.Context.DbMaintenance.GetTableInfoList().FirstOrDefault(u => u.Name == tableName);
+        if (entityType == null) return null;
+
+        // 按原始类型的顺序获取所有实体类型属性(不包含导航属性,会返回null)
+        return _sysCodeGenRep.Context.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new TableColumnOuput
         {
-            //切库,多库代码生成用
-            if (dbConfigId != SqlSugarConst.ConfigId)
-                _sysCodeGenRep.Context.AsTenant().ChangeDatabase(dbConfigId);
+            ColumnName = u.DbColumnName,
+            ColumnKey = u.IsPrimarykey.ToString(),
+            DataType = u.DataType.ToString(),
+            NetType = CodeGenUtil.ConvertDataType(u.DataType.ToString()),
+            ColumnComment = u.ColumnDescription
+        }).ToList();
+    }
 
-            // 获取实体类型属性
-            var entityType = _sysCodeGenRep.Context.DbMaintenance.GetTableInfoList().FirstOrDefault(u => u.Name == tableName);
-            if (entityType == null) return null;
+    /// <summary>
+    /// 获取数据表列(实体属性)集合
+    /// </summary>
+    /// <returns></returns>
+    [NonAction]
+    public List<TableColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input)
+    {
+        //切库,多库代码生成用
+        if (!string.IsNullOrEmpty(input.DbConfigId) && input.DbConfigId != SqlSugarConst.ConfigId)
+            _sysCodeGenRep.Context.AsTenant().ChangeDatabase(input.DbConfigId);
 
-            // 按原始类型的顺序获取所有实体类型属性(不包含导航属性,会返回null)
-            return _sysCodeGenRep.Context.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new TableColumnOuput
-            {
-                ColumnName = u.DbColumnName,
-                ColumnKey = u.IsPrimarykey.ToString(),
-                DataType = u.DataType.ToString(),
-                NetType = CodeGenUtil.ConvertDataType(u.DataType.ToString()),
-                ColumnComment = u.ColumnDescription
-            }).ToList();
-        }
+        var entityType = _commonService.GetEntityInfos().Result.FirstOrDefault(m => m.EntityName == input.TableName);
+        if (entityType == null)
+            return null;
 
-        /// <summary>
-        /// 获取数据表列(实体属性)集合
-        /// </summary>
-        /// <returns></returns>
-        [NonAction]
-        public List<TableColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input)
+        return _sysCodeGenRep.Context.DbMaintenance.GetColumnInfosByTableName(entityType.DbTableName, false).Select(u => new TableColumnOuput
         {
-            //切库,多库代码生成用
-            if (!string.IsNullOrEmpty(input.DbConfigId) && input.DbConfigId != SqlSugarConst.ConfigId)
-                _sysCodeGenRep.Context.AsTenant().ChangeDatabase(input.DbConfigId);
+            ColumnName = u.DbColumnName,
+            ColumnKey = u.IsPrimarykey.ToString(),
+            DataType = u.DataType.ToString(),
+            ColumnComment = string.IsNullOrWhiteSpace(u.ColumnDescription) ? u.DbColumnName : u.ColumnDescription
+        }).ToList();
+    }
+
+    /// <summary>
+    /// 代码生成_本地项目
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("/codeGenerate/runLocal")]
+    public async Task RunLocal(SysCodeGen input)
+    {
+        // 先删除该表已生成的菜单列表
+        var templatePathList = GetTemplatePathList();
+        var targetPathList = GetTargetPathList(input);
+        for (var i = 0; i < templatePathList.Count; i++)
+        {
+            var tContent = File.ReadAllText(templatePathList[i]);
 
-            var entityType = _commonService.GetEntityInfos().Result.FirstOrDefault(m => m.EntityName == input.TableName);
-            if (entityType == null)
-                return null;
+            var tableFieldList = await _codeGenConfigService.List(new CodeGenConfig() { CodeGenId = input.Id }); // 字段集合
+            var queryWhetherList = tableFieldList.Where(u => u.QueryWhether == YesNoEnum.Y.ToString()).ToList(); // 前端查询集合
+            var joinTableList = tableFieldList.Where(u => u.EffectType == "Upload" || u.EffectType == "fk").ToList();//需要连表查询的字段
+            (string joinTableNames, string lowerJoinTableNames) = GetJoinTableStr(joinTableList);//获取连表的实体名和别名
 
-            return _sysCodeGenRep.Context.DbMaintenance.GetColumnInfosByTableName(entityType.DbTableName, false).Select(u => new TableColumnOuput
+            var data = new CustomViewEngine(_sysCodeGenRep)
+            {
+                DbConfigId = input.DbConfigId,
+                AuthorName = input.AuthorName,
+                BusName = input.BusName,
+                NameSpace = input.NameSpace,
+                ClassName = input.TableName,
+                QueryWhetherList = queryWhetherList,
+                TableField = tableFieldList,
+                IsJoinTable = joinTableList.Count > 0,
+                IsUpload = joinTableList.Where(u => u.EffectType == "Upload").Any(),
+            };
+            var tResult = _viewEngine.RunCompile<CustomViewEngine>(tContent, data, builderAction: builder =>
             {
-                ColumnName = u.DbColumnName,
-                ColumnKey = u.IsPrimarykey.ToString(),
-                DataType = u.DataType.ToString(),
-                ColumnComment = string.IsNullOrWhiteSpace(u.ColumnDescription) ? u.DbColumnName : u.ColumnDescription
-            }).ToList();
+                builder.AddAssemblyReferenceByName("System.Linq");
+                builder.AddAssemblyReferenceByName("System.Collections");
+                builder.AddUsing("System.Collections.Generic");
+                builder.AddUsing("System.Linq");
+            });
+            var dirPath = new DirectoryInfo(targetPathList[i]).Parent.FullName;
+            if (!Directory.Exists(dirPath))
+                Directory.CreateDirectory(dirPath);
+            File.WriteAllText(targetPathList[i], tResult, Encoding.UTF8);
         }
 
-        /// <summary>
-        /// 代码生成_本地项目
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("/codeGenerate/runLocal")]
-        public async Task RunLocal(SysCodeGen input)
+        await AddMenu(input.TableName, input.BusName, input.MenuPid);
+    }
+
+    /// <summary>
+    /// 获取连表的实体名和别名
+    /// </summary>
+    /// <param name="configs"></param>
+    /// <returns></returns>
+    private (string, string) GetJoinTableStr(List<CodeGenConfig> configs)
+    {
+        var uploads = configs.Where(u => u.EffectType == "Upload").ToList();
+        var fks = configs.Where(u => u.EffectType == "fk").ToList();
+        string str = ""; //<Order, OrderItem, Custom>
+        string lowerStr = ""; //(o, i, c)
+        foreach (var item in uploads)
         {
-            // 先删除该表已生成的菜单列表
-            var templatePathList = GetTemplatePathList();
-            var targetPathList = GetTargetPathList(input);
-            for (var i = 0; i < templatePathList.Count; i++)
-            {
-                var tContent = File.ReadAllText(templatePathList[i]);
-
-                var tableFieldList = await _codeGenConfigService.List(new CodeGenConfig() { CodeGenId = input.Id }); // 字段集合
-                var queryWhetherList = tableFieldList.Where(u => u.QueryWhether == YesNoEnum.Y.ToString()).ToList(); // 前端查询集合
-                var joinTableList = tableFieldList.Where(u => u.EffectType == "Upload" || u.EffectType == "fk").ToList();//需要连表查询的字段
-                (string joinTableNames, string lowerJoinTableNames) = GetJoinTableStr(joinTableList);//获取连表的实体名和别名
-
-                var data = new CustomViewEngine(_sysCodeGenRep)
-                {
-                    DbConfigId = input.DbConfigId,
-                    AuthorName = input.AuthorName,
-                    BusName = input.BusName,
-                    NameSpace = input.NameSpace,
-                    ClassName = input.TableName,
-                    QueryWhetherList = queryWhetherList,
-                    TableField = tableFieldList,
-                    IsJoinTable = joinTableList.Count > 0,
-                    IsUpload = joinTableList.Where(u => u.EffectType == "Upload").Any(),
-                };
-                var tResult = _viewEngine.RunCompile<CustomViewEngine>(tContent, data, builderAction: builder =>
-                {
-                    builder.AddAssemblyReferenceByName("System.Linq");
-                    builder.AddAssemblyReferenceByName("System.Collections");
-                    builder.AddUsing("System.Collections.Generic");
-                    builder.AddUsing("System.Linq");
-                });
-                var dirPath = new DirectoryInfo(targetPathList[i]).Parent.FullName;
-                if (!Directory.Exists(dirPath))
-                    Directory.CreateDirectory(dirPath);
-                File.WriteAllText(targetPathList[i], tResult, Encoding.UTF8);
-            }
-
-            await AddMenu(input.TableName, input.BusName, input.MenuPid);
+            lowerStr += "sysFile_FK_" + item.LowerColumnName + ",";
+            str += "SysFile,";
         }
-
-        /// <summary>
-        /// 获取连表的实体名和别名
-        /// </summary>
-        /// <param name="configs"></param>
-        /// <returns></returns>
-        private (string, string) GetJoinTableStr(List<CodeGenConfig> configs)
+        foreach (var item in fks)
         {
-            var uploads = configs.Where(u => u.EffectType == "Upload").ToList();
-            var fks = configs.Where(u => u.EffectType == "fk").ToList();
-            string str = ""; //<Order, OrderItem, Custom>
-            string lowerStr = ""; //(o, i, c)
-            foreach (var item in uploads)
-            {
-                lowerStr += "sysFile_FK_" + item.LowerColumnName + ",";
-                str += "SysFile,";
-            }
-            foreach (var item in fks)
-            {
-                lowerStr += item.LowerFkEntityName + "_FK_" + item.LowerFkColumnName + ",";
-                str += item.FkEntityName + ",";
-            }
-            return (str.TrimEnd(','), lowerStr.TrimEnd(','));
+            lowerStr += item.LowerFkEntityName + "_FK_" + item.LowerFkColumnName + ",";
+            str += item.FkEntityName + ",";
         }
+        return (str.TrimEnd(','), lowerStr.TrimEnd(','));
+    }
 
-        private async Task AddMenu(string className, string busName, long pid)
+    private async Task AddMenu(string className, string busName, long pid)
+    {
+        // 如果 pid 为 0 说明为顶级菜单, 需要创建顶级目录
+        if (pid == 0)
         {
-            // 如果 pid 为 0 说明为顶级菜单, 需要创建顶级目录
-            if (pid == 0)
-            {
-                // 目录
-                var menuType0 = new SysMenu
-                {
-                    Pid = 0,
-                    Title = busName + "管理",
-                    Type = MenuTypeEnum.Dir,
-                    Icon = "robot",
-                    Path = "/" + className.ToLower(),
-                    Component = "LAYOUT",
-                };
-                pid = (await _sysMenuRep.Context.Insertable(menuType0).ExecuteReturnEntityAsync()).Id;
-            }
-            // 由于后续菜单会有修改, 需要判断下 pid 是否存在, 不存在报错
-            else if (!await _sysMenuRep.AsQueryable().AnyAsync(e => e.Id == pid))
-                throw Oops.Oh(ErrorCodeEnum.D1505);
-
-            // 菜单
-            var menuType1 = new SysMenu
+            // 目录
+            var menuType0 = new SysMenu
             {
-                Pid = pid,
+                Pid = 0,
                 Title = busName + "管理",
-                Name = className + "Management",
-                Type = MenuTypeEnum.Menu,
+                Type = MenuTypeEnum.Dir,
+                Icon = "robot",
                 Path = "/" + className.ToLower(),
-                Component = "/main/" + className + "/index",
-            };
-            var pid1 = (await _sysMenuRep.Context.Insertable(menuType1).ExecuteReturnEntityAsync()).Id;
-
-            // 按钮-page
-            var menuType2 = new SysMenu
-            {
-                Pid = pid1,
-                Title = busName + "查询",
-                Type = MenuTypeEnum.Btn,
-                Permission = className + ":page",
-            };
-
-            // 按钮-detail
-            var menuType2_1 = new SysMenu
-            {
-                Pid = pid1,
-                Title = busName + "详情",
-                Type = MenuTypeEnum.Btn,
-                Permission = className + ":detail",
-            };
-
-            // 按钮-add
-            var menuType2_2 = new SysMenu
-            {
-                Pid = pid1,
-                Title = busName + "增加",
-                Type = MenuTypeEnum.Btn,
-                Permission = className + ":add",
-            };
-
-            // 按钮-delete
-            var menuType2_3 = new SysMenu
-            {
-                Pid = pid1,
-                Title = busName + "删除",
-                Type = MenuTypeEnum.Btn,
-                Permission = className + ":delete",
+                Component = "LAYOUT",
             };
-
-            // 按钮-edit
-            var menuType2_4 = new SysMenu
-            {
-                Pid = pid1,
-                Title = busName + "编辑",
-                Type = MenuTypeEnum.Btn,
-                Permission = className + ":update",
-            };
-
-            var menuList = new List<SysMenu>() { menuType2, menuType2_1, menuType2_2, menuType2_3, menuType2_4 };
-            await _sysMenuRep.Context.Insertable(menuList).ExecuteCommandAsync();
+            pid = (await _sysMenuRep.Context.Insertable(menuType0).ExecuteReturnEntityAsync()).Id;
         }
+        // 由于后续菜单会有修改, 需要判断下 pid 是否存在, 不存在报错
+        else if (!await _sysMenuRep.AsQueryable().AnyAsync(e => e.Id == pid))
+            throw Oops.Oh(ErrorCodeEnum.D1505);
 
-        /// <summary>
-        /// 获取模板文件路径集合
-        /// </summary>
-        /// <returns></returns>
-        private static List<string> GetTemplatePathList()
+        // 菜单
+        var menuType1 = new SysMenu
         {
-            var templatePath = App.WebHostEnvironment.WebRootPath + @"\Template\";
-            return new List<string>()
-            {
-                Path.Combine(templatePath , "Service.cs.vm"),
-                Path.Combine(templatePath , "Input.cs.vm"),
-                Path.Combine(templatePath , "Output.cs.vm"),
-                Path.Combine(templatePath , "Dto.cs.vm"),
-                Path.Combine(templatePath , "index.vue.vm"),
-                Path.Combine(templatePath , "data.data.ts.vm"),
-                Path.Combine(templatePath , "dataModal.vue.vm"),
-                Path.Combine(templatePath , "manage.js.vm"),
-            };
-        }
+            Pid = pid,
+            Title = busName + "管理",
+            Name = className + "Management",
+            Type = MenuTypeEnum.Menu,
+            Path = "/" + className.ToLower(),
+            Component = "/main/" + className + "/index",
+        };
+        var pid1 = (await _sysMenuRep.Context.Insertable(menuType1).ExecuteReturnEntityAsync()).Id;
+
+        // 按钮-page
+        var menuType2 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "查询",
+            Type = MenuTypeEnum.Btn,
+            Permission = className + ":page",
+        };
+
+        // 按钮-detail
+        var menuType2_1 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "详情",
+            Type = MenuTypeEnum.Btn,
+            Permission = className + ":detail",
+        };
+
+        // 按钮-add
+        var menuType2_2 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "增加",
+            Type = MenuTypeEnum.Btn,
+            Permission = className + ":add",
+        };
+
+        // 按钮-delete
+        var menuType2_3 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "删除",
+            Type = MenuTypeEnum.Btn,
+            Permission = className + ":delete",
+        };
+
+        // 按钮-edit
+        var menuType2_4 = new SysMenu
+        {
+            Pid = pid1,
+            Title = busName + "编辑",
+            Type = MenuTypeEnum.Btn,
+            Permission = className + ":update",
+        };
+
+        var menuList = new List<SysMenu>() { menuType2, menuType2_1, menuType2_2, menuType2_3, menuType2_4 };
+        await _sysMenuRep.Context.Insertable(menuList).ExecuteCommandAsync();
+    }
 
-        /// <summary>
-        /// 设置生成文件路径
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        private static List<string> GetTargetPathList(SysCodeGen input)
+    /// <summary>
+    /// 获取模板文件路径集合
+    /// </summary>
+    /// <returns></returns>
+    private static List<string> GetTemplatePathList()
+    {
+        var templatePath = App.WebHostEnvironment.WebRootPath + @"\Template\";
+        return new List<string>()
         {
-            var backendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName, "Admin.NET.Application", "Service", input.TableName);
-            var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs");
-            var inputPath = Path.Combine(backendPath, "Dto", input.TableName + "Input.cs");
-            var outputPath = Path.Combine(backendPath, "Dto", input.TableName + "Output.cs");
-            var viewPath = Path.Combine(backendPath, "Dto", input.TableName + "Dto.cs");
-            var frontendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, "Vben2", "src", "views", "main");
-            var indexPath = Path.Combine(frontendPath, input.TableName, "index.vue");
-            var formDataPath = Path.Combine(frontendPath, input.TableName, "data.data.ts");
-            var formModalPath = Path.Combine(frontendPath, input.TableName, "dataModal.vue");
-            var apiJsPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, "Vben2", "src", "api", "main", input.TableName + ".ts");
-
-            return new List<string>()
-            {
-                servicePath,
-                inputPath,
-                outputPath,
-                viewPath,
-                indexPath,
-                formDataPath,
-                formModalPath,
-                apiJsPath
-            };
-        }
+            Path.Combine(templatePath , "Service.cs.vm"),
+            Path.Combine(templatePath , "Input.cs.vm"),
+            Path.Combine(templatePath , "Output.cs.vm"),
+            Path.Combine(templatePath , "Dto.cs.vm"),
+            Path.Combine(templatePath , "index.vue.vm"),
+            Path.Combine(templatePath , "data.data.ts.vm"),
+            Path.Combine(templatePath , "dataModal.vue.vm"),
+            Path.Combine(templatePath , "manage.js.vm"),
+        };
+    }
+
+    /// <summary>
+    /// 设置生成文件路径
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private static List<string> GetTargetPathList(SysCodeGen input)
+    {
+        var backendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName, "Admin.NET.Application", "Service", input.TableName);
+        var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs");
+        var inputPath = Path.Combine(backendPath, "Dto", input.TableName + "Input.cs");
+        var outputPath = Path.Combine(backendPath, "Dto", input.TableName + "Output.cs");
+        var viewPath = Path.Combine(backendPath, "Dto", input.TableName + "Dto.cs");
+        var frontendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, "Vben2", "src", "views", "main");
+        var indexPath = Path.Combine(frontendPath, input.TableName, "index.vue");
+        var formDataPath = Path.Combine(frontendPath, input.TableName, "data.data.ts");
+        var formModalPath = Path.Combine(frontendPath, input.TableName, "dataModal.vue");
+        var apiJsPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.Parent.FullName, "Vben2", "src", "api", "main", input.TableName + ".ts");
+
+        return new List<string>()
+        {
+            servicePath,
+            inputPath,
+            outputPath,
+            viewPath,
+            indexPath,
+            formDataPath,
+            formModalPath,
+            apiJsPath
+        };
     }
 }

+ 151 - 152
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenConfig.cs

@@ -1,164 +1,163 @@
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 代码生成详细配置参数
+/// </summary>
+public class CodeGenConfig
 {
     /// <summary>
-    /// 代码生成详细配置参数
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 代码生成主表ID
+    /// </summary>
+    public long CodeGenId { get; set; }
+
+    /// <summary>
+    /// 数据库字段名
+    /// </summary>
+    public string ColumnName { get; set; }
+
+    /// <summary>
+    /// 数据库字段名(首字母小写)
+    /// </summary>
+    public string LowerColumnName =>
+        string.IsNullOrWhiteSpace(ColumnName)
+        ? null : ColumnName[..1].ToLower() + ColumnName[1..];
+
+    /// <summary>
+    /// 字段描述
+    /// </summary>
+    public string ColumnComment { get; set; }
+
+    /// <summary>
+    /// .NET类型
+    /// </summary>
+    public string NetType { get; set; }
+
+    /// <summary>
+    /// 作用类型(字典)
+    /// </summary>
+    public string EffectType { get; set; }
+
+    /// <summary>
+    /// 外键实体名称
+    /// </summary>
+    public string FkEntityName { get; set; }
+
+    /// <summary>
+    /// 外键表名称
+    /// </summary>
+    public string FkTableName { get; set; }
+
+    /// <summary>
+    /// 外键实体名称(首字母小写)
+    /// </summary>
+    public string LowerFkEntityName =>
+        string.IsNullOrWhiteSpace(FkEntityName)
+        ? null : FkEntityName[..1].ToLower() + FkEntityName[1..];
+
+    /// <summary>
+    /// 外键显示字段
+    /// </summary>
+    public string FkColumnName { get; set; }
+
+    /// <summary>
+    /// 外键显示字段(首字母小写)
+    /// </summary>
+    public string LowerFkColumnName =>
+        string.IsNullOrWhiteSpace(FkColumnName)
+        ? null : FkColumnName[..1].ToLower() + FkColumnName[1..];
+
+    /// <summary>
+    /// 外键显示字段.NET类型
+    /// </summary>
+    public string FkColumnNetType { get; set; }
+
+    /// <summary>
+    /// 字典code
     /// </summary>
-    public class CodeGenConfig
+    public string DictTypeCode { get; set; }
+
+    /// <summary>
+    /// 列表是否缩进(字典)
+    /// </summary>
+    public string WhetherRetract { get; set; }
+
+    /// <summary>
+    /// 是否必填(字典)
+    /// </summary>
+    public string WhetherRequired { get; set; }
+
+    /// <summary>
+    /// 是否是查询条件
+    /// </summary>
+    public string QueryWhether { get; set; }
+
+    /// <summary>
+    /// 查询方式
+    /// </summary>
+    public string QueryType { get; set; }
+
+    /// <summary>
+    /// 列表显示
+    /// </summary>
+    public string WhetherTable { get; set; }
+
+    /// <summary>
+    /// 增改
+    /// </summary>
+    public string WhetherAddUpdate { get; set; }
+
+    /// <summary>
+    /// 主外键
+    /// </summary>
+    public string ColumnKey { get; set; }
+
+    /// <summary>
+    /// 数据库中类型(物理类型)
+    /// </summary>
+    public string DataType { get; set; }
+
+    /// <summary>
+    /// 是否是通用字段
+    /// </summary>
+    public string WhetherCommon { get; set; }
+
+    /// <summary>
+    /// 表的别名 Table as XXX
+    /// </summary>
+    public string TableNickName
     {
-        /// <summary>
-        /// 主键Id
-        /// </summary>
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 代码生成主表ID
-        /// </summary>
-        public long CodeGenId { get; set; }
-
-        /// <summary>
-        /// 数据库字段名
-        /// </summary>
-        public string ColumnName { get; set; }
-
-        /// <summary>
-        /// 数据库字段名(首字母小写)
-        /// </summary>
-        public string LowerColumnName =>
-            string.IsNullOrWhiteSpace(ColumnName)
-            ? null : ColumnName[..1].ToLower() + ColumnName[1..];
-
-        /// <summary>
-        /// 字段描述
-        /// </summary>
-        public string ColumnComment { get; set; }
-
-        /// <summary>
-        /// .NET类型
-        /// </summary>
-        public string NetType { get; set; }
-
-        /// <summary>
-        /// 作用类型(字典)
-        /// </summary>
-        public string EffectType { get; set; }
-
-        /// <summary>
-        /// 外键实体名称
-        /// </summary>
-        public string FkEntityName { get; set; }
-
-        /// <summary>
-        /// 外键表名称
-        /// </summary>
-        public string FkTableName { get; set; }
-
-        /// <summary>
-        /// 外键实体名称(首字母小写)
-        /// </summary>
-        public string LowerFkEntityName =>
-            string.IsNullOrWhiteSpace(FkEntityName)
-            ? null : FkEntityName[..1].ToLower() + FkEntityName[1..];
-
-        /// <summary>
-        /// 外键显示字段
-        /// </summary>
-        public string FkColumnName { get; set; }
-
-        /// <summary>
-        /// 外键显示字段(首字母小写)
-        /// </summary>
-        public string LowerFkColumnName =>
-            string.IsNullOrWhiteSpace(FkColumnName)
-            ? null : FkColumnName[..1].ToLower() + FkColumnName[1..];
-
-        /// <summary>
-        /// 外键显示字段.NET类型
-        /// </summary>
-        public string FkColumnNetType { get; set; }
-
-        /// <summary>
-        /// 字典code
-        /// </summary>
-        public string DictTypeCode { get; set; }
-
-        /// <summary>
-        /// 列表是否缩进(字典)
-        /// </summary>
-        public string WhetherRetract { get; set; }
-
-        /// <summary>
-        /// 是否必填(字典)
-        /// </summary>
-        public string WhetherRequired { get; set; }
-
-        /// <summary>
-        /// 是否是查询条件
-        /// </summary>
-        public string QueryWhether { get; set; }
-
-        /// <summary>
-        /// 查询方式
-        /// </summary>
-        public string QueryType { get; set; }
-
-        /// <summary>
-        /// 列表显示
-        /// </summary>
-        public string WhetherTable { get; set; }
-
-        /// <summary>
-        /// 增改
-        /// </summary>
-        public string WhetherAddUpdate { get; set; }
-
-        /// <summary>
-        /// 主外键
-        /// </summary>
-        public string ColumnKey { get; set; }
-
-        /// <summary>
-        /// 数据库中类型(物理类型)
-        /// </summary>
-        public string DataType { get; set; }
-
-        /// <summary>
-        /// 是否是通用字段
-        /// </summary>
-        public string WhetherCommon { get; set; }
-
-        /// <summary>
-        /// 表的别名 Table as XXX
-        /// </summary>
-        public string TableNickName
+        get
         {
-            get
+            string str = "";
+            if (EffectType == "fk")
             {
-                string str = "";
-                if (EffectType == "fk")
-                {
-                    str = LowerFkEntityName + "_FK_" + LowerFkColumnName;
-                }
-                else if (EffectType == "Upload")
-                {
-                    str = "sysFile_FK_" + LowerColumnName;
-                }
-                return str;
+                str = LowerFkEntityName + "_FK_" + LowerFkColumnName;
             }
+            else if (EffectType == "Upload")
+            {
+                str = "sysFile_FK_" + LowerColumnName;
+            }
+            return str;
         }
+    }
 
-        /// <summary>
-        /// 显示文本字段
-        /// </summary>
-        public string DisplayColumn { get; set; }
+    /// <summary>
+    /// 显示文本字段
+    /// </summary>
+    public string DisplayColumn { get; set; }
 
-        /// <summary>
-        /// 选中值字段
-        /// </summary>
-        public string ValueColumn { get; set; }
+    /// <summary>
+    /// 选中值字段
+    /// </summary>
+    public string ValueColumn { get; set; }
 
-        /// <summary>
-        /// 父级字段
-        /// </summary>
-        public string PidColumn { get; set; }
-    }
+    /// <summary>
+    /// 父级字段
+    /// </summary>
+    public string PidColumn { get; set; }
 }

+ 152 - 155
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs

@@ -1,159 +1,156 @@
-using System.ComponentModel.DataAnnotations;
+namespace Admin.NET.Core.Service;
 
-namespace Admin.NET.Core.Service
+/// <summary>
+/// 代码生成参数类
+/// </summary>
+public class CodeGenInput : BasePageInput
 {
     /// <summary>
-    /// 代码生成参数类
-    /// </summary>
-    public class CodeGenInput : BasePageInput
-    {
-        /// <summary>
-        /// 作者姓名
-        /// </summary>
-        public virtual string AuthorName { get; set; }
-
-        /// <summary>
-        /// 类名
-        /// </summary>
-        public virtual string ClassName { get; set; }
-
-        /// <summary>
-        /// 是否移除表前缀
-        /// </summary>
-        public virtual string TablePrefix { get; set; }
-
-        /// <summary>
-        /// 库定位器名
-        /// </summary>
-        public virtual string DbConfigId { get; set; }
-
-        /// <summary>
-        /// 数据库名(保留字段)
-        /// </summary>
-        public virtual string DbName { get; set; }
-
-        /// <summary>
-        /// 数据库类型
-        /// </summary>
-        public virtual string DbType { get; set; }
-
-        /// <summary>
-        /// 数据库链接
-        /// </summary>
-        public virtual string ConnectionString { get; set; }
-
-        /// <summary>
-        /// 生成方式
-        /// </summary>
-        public virtual string GenerateType { get; set; }
-
-        /// <summary>
-        /// 数据库表名
-        /// </summary>
-        public virtual string TableName { get; set; }
-
-        /// <summary>
-        /// 命名空间
-        /// </summary>
-        public virtual string NameSpace { get; set; }
-
-        /// <summary>
-        /// 业务名(业务代码包名称)
-        /// </summary>
-        public virtual string BusName { get; set; }
-
-        /// <summary>
-        /// 功能名(数据库表名称)
-        /// </summary>
-        public virtual string TableComment { get; set; }
-
-        /// <summary>
-        /// 菜单应用分类(应用编码)
-        /// </summary>
-        public virtual string MenuApplication { get; set; }
-
-        /// <summary>
-        /// 菜单父级
-        /// </summary>
-        public virtual long MenuPid { get; set; }
-    }
-
-    public class AddCodeGenInput : CodeGenInput
-    {
-        /// <summary>
-        /// 数据库表名
-        /// </summary>
-        [Required(ErrorMessage = "数据库表名不能为空")]
-        public override string TableName { get; set; }
-
-        /// <summary>
-        /// 业务名(业务代码包名称)
-        /// </summary>
-        [Required(ErrorMessage = "业务名不能为空")]
-        public override string BusName { get; set; }
-
-        /// <summary>
-        /// 命名空间
-        /// </summary>
-        [Required(ErrorMessage = "命名空间不能为空")]
-        public override string NameSpace { get; set; }
-
-        /// <summary>
-        /// 作者姓名
-        /// </summary>
-        [Required(ErrorMessage = "作者姓名不能为空")]
-        public override string AuthorName { get; set; }
-
-        ///// <summary>
-        ///// 类名
-        ///// </summary>
-        //[Required(ErrorMessage = "类名不能为空")]
-        //public override string ClassName { get; set; }
-
-        ///// <summary>
-        ///// 是否移除表前缀
-        ///// </summary>
-        //[Required(ErrorMessage = "是否移除表前缀不能为空")]
-        //public override string TablePrefix { get; set; }
-
-        /// <summary>
-        /// 生成方式
-        /// </summary>
-        [Required(ErrorMessage = "生成方式不能为空")]
-        public override string GenerateType { get; set; }
-
-        ///// <summary>
-        ///// 功能名(数据库表名称)
-        ///// </summary>
-        //[Required(ErrorMessage = "数据库表名不能为空")]
-        //public override string TableComment { get; set; }
-
-        /// <summary>
-        /// 菜单父级
-        /// </summary>
-        [Required(ErrorMessage = "菜单父级不能为空")]
-        public override long MenuPid { get; set; }
-    }
-
-    public class DeleteCodeGenInput
-    {
-        /// <summary>
-        /// 代码生成器Id
-        /// </summary>
-        [Required(ErrorMessage = "代码生成器Id不能为空")]
-        public long Id { get; set; }
-    }
-
-    public class UpdateCodeGenInput : CodeGenInput
-    {
-        /// <summary>
-        /// 代码生成器Id
-        /// </summary>
-        [Required(ErrorMessage = "代码生成器Id不能为空")]
-        public long Id { get; set; }
-    }
-
-    public class QueryCodeGenInput : DeleteCodeGenInput
-    {
-    }
+    /// 作者姓名
+    /// </summary>
+    public virtual string AuthorName { get; set; }
+
+    /// <summary>
+    /// 类名
+    /// </summary>
+    public virtual string ClassName { get; set; }
+
+    /// <summary>
+    /// 是否移除表前缀
+    /// </summary>
+    public virtual string TablePrefix { get; set; }
+
+    /// <summary>
+    /// 库定位器名
+    /// </summary>
+    public virtual string DbConfigId { get; set; }
+
+    /// <summary>
+    /// 数据库名(保留字段)
+    /// </summary>
+    public virtual string DbName { get; set; }
+
+    /// <summary>
+    /// 数据库类型
+    /// </summary>
+    public virtual string DbType { get; set; }
+
+    /// <summary>
+    /// 数据库链接
+    /// </summary>
+    public virtual string ConnectionString { get; set; }
+
+    /// <summary>
+    /// 生成方式
+    /// </summary>
+    public virtual string GenerateType { get; set; }
+
+    /// <summary>
+    /// 数据库表名
+    /// </summary>
+    public virtual string TableName { get; set; }
+
+    /// <summary>
+    /// 命名空间
+    /// </summary>
+    public virtual string NameSpace { get; set; }
+
+    /// <summary>
+    /// 业务名(业务代码包名称)
+    /// </summary>
+    public virtual string BusName { get; set; }
+
+    /// <summary>
+    /// 功能名(数据库表名称)
+    /// </summary>
+    public virtual string TableComment { get; set; }
+
+    /// <summary>
+    /// 菜单应用分类(应用编码)
+    /// </summary>
+    public virtual string MenuApplication { get; set; }
+
+    /// <summary>
+    /// 菜单父级
+    /// </summary>
+    public virtual long MenuPid { get; set; }
+}
+
+public class AddCodeGenInput : CodeGenInput
+{
+    /// <summary>
+    /// 数据库表名
+    /// </summary>
+    [Required(ErrorMessage = "数据库表名不能为空")]
+    public override string TableName { get; set; }
+
+    /// <summary>
+    /// 业务名(业务代码包名称)
+    /// </summary>
+    [Required(ErrorMessage = "业务名不能为空")]
+    public override string BusName { get; set; }
+
+    /// <summary>
+    /// 命名空间
+    /// </summary>
+    [Required(ErrorMessage = "命名空间不能为空")]
+    public override string NameSpace { get; set; }
+
+    /// <summary>
+    /// 作者姓名
+    /// </summary>
+    [Required(ErrorMessage = "作者姓名不能为空")]
+    public override string AuthorName { get; set; }
+
+    ///// <summary>
+    ///// 类名
+    ///// </summary>
+    //[Required(ErrorMessage = "类名不能为空")]
+    //public override string ClassName { get; set; }
+
+    ///// <summary>
+    ///// 是否移除表前缀
+    ///// </summary>
+    //[Required(ErrorMessage = "是否移除表前缀不能为空")]
+    //public override string TablePrefix { get; set; }
+
+    /// <summary>
+    /// 生成方式
+    /// </summary>
+    [Required(ErrorMessage = "生成方式不能为空")]
+    public override string GenerateType { get; set; }
+
+    ///// <summary>
+    ///// 功能名(数据库表名称)
+    ///// </summary>
+    //[Required(ErrorMessage = "数据库表名不能为空")]
+    //public override string TableComment { get; set; }
+
+    /// <summary>
+    /// 菜单父级
+    /// </summary>
+    [Required(ErrorMessage = "菜单父级不能为空")]
+    public override long MenuPid { get; set; }
+}
+
+public class DeleteCodeGenInput
+{
+    /// <summary>
+    /// 代码生成器Id
+    /// </summary>
+    [Required(ErrorMessage = "代码生成器Id不能为空")]
+    public long Id { get; set; }
+}
+
+public class UpdateCodeGenInput : CodeGenInput
+{
+    /// <summary>
+    /// 代码生成器Id
+    /// </summary>
+    [Required(ErrorMessage = "代码生成器Id不能为空")]
+    public long Id { get; set; }
+}
+
+public class QueryCodeGenInput : DeleteCodeGenInput
+{
 }

+ 59 - 60
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs

@@ -1,63 +1,62 @@
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 代码生成参数类
+/// </summary>
+public class CodeGenOutput
 {
     /// <summary>
-    /// 代码生成参数类
-    /// </summary>
-    public class CodeGenOutput
-    {
-        /// <summary>
-        /// 代码生成器Id
-        /// </summary>
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 作者姓名
-        /// </summary>
-        public string AuthorName { get; set; }
-
-        /// <summary>
-        /// 类名
-        /// </summary>
-        public string ClassName { get; set; }
-
-        /// <summary>
-        /// 是否移除表前缀
-        /// </summary>
-        public string TablePrefix { get; set; }
-
-        /// <summary>
-        /// 生成方式
-        /// </summary>
-        public string GenerateType { get; set; }
-
-        /// <summary>
-        /// 数据库表名
-        /// </summary>
-        public string TableName { get; set; }
-
-        /// <summary>
-        /// 包名
-        /// </summary>
-        public string PackageName { get; set; }
-
-        /// <summary>
-        /// 业务名(业务代码包名称)
-        /// </summary>
-        public string BusName { get; set; }
-
-        /// <summary>
-        /// 功能名(数据库表名称)
-        /// </summary>
-        public string TableComment { get; set; }
-
-        /// <summary>
-        /// 菜单应用分类(应用编码)
-        /// </summary>
-        public string MenuApplication { get; set; }
-
-        /// <summary>
-        /// 菜单父级
-        /// </summary>
-        public long MenuPid { get; set; }
-    }
+    /// 代码生成器Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 作者姓名
+    /// </summary>
+    public string AuthorName { get; set; }
+
+    /// <summary>
+    /// 类名
+    /// </summary>
+    public string ClassName { get; set; }
+
+    /// <summary>
+    /// 是否移除表前缀
+    /// </summary>
+    public string TablePrefix { get; set; }
+
+    /// <summary>
+    /// 生成方式
+    /// </summary>
+    public string GenerateType { get; set; }
+
+    /// <summary>
+    /// 数据库表名
+    /// </summary>
+    public string TableName { get; set; }
+
+    /// <summary>
+    /// 包名
+    /// </summary>
+    public string PackageName { get; set; }
+
+    /// <summary>
+    /// 业务名(业务代码包名称)
+    /// </summary>
+    public string BusName { get; set; }
+
+    /// <summary>
+    /// 功能名(数据库表名称)
+    /// </summary>
+    public string TableComment { get; set; }
+
+    /// <summary>
+    /// 菜单应用分类(应用编码)
+    /// </summary>
+    public string MenuApplication { get; set; }
+
+    /// <summary>
+    /// 菜单父级
+    /// </summary>
+    public long MenuPid { get; set; }
 }

+ 54 - 60
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CustomViewEngine.cs

@@ -1,81 +1,75 @@
-using Admin.NET.Core.Util;
-using Furion.ViewEngine;
-using System.Collections.Generic;
-using System.Linq;
+namespace Admin.NET.Core.Service;
 
-namespace Admin.NET.Core.Service
+public class CustomViewEngine : ViewEngineModel
 {
-    public class CustomViewEngine : ViewEngineModel
-    {
-        private readonly SqlSugarRepository<SysCodeGen> _sysCodeGenRep; // 代码生成器仓储
+    private readonly SqlSugarRepository<SysCodeGen> _sysCodeGenRep; // 代码生成器仓储
 
-        public CustomViewEngine()
-        {
-        }
+    public CustomViewEngine()
+    {
+    }
 
-        public CustomViewEngine(SqlSugarRepository<SysCodeGen> sysCodeGenRep)
-        {
-            _sysCodeGenRep = sysCodeGenRep;
-        }
+    public CustomViewEngine(SqlSugarRepository<SysCodeGen> sysCodeGenRep)
+    {
+        _sysCodeGenRep = sysCodeGenRep;
+    }
 
-        /// <summary>
-        /// 库定位器
-        /// </summary>
-        public string DbConfigId { get; set; } = SqlSugarConst.ConfigId;
+    /// <summary>
+    /// 库定位器
+    /// </summary>
+    public string DbConfigId { get; set; } = SqlSugarConst.ConfigId;
 
-        public string AuthorName { get; set; }
+    public string AuthorName { get; set; }
 
-        public string BusName { get; set; }
+    public string BusName { get; set; }
 
-        public string NameSpace { get; set; }
+    public string NameSpace { get; set; }
 
-        public string ClassName { get; set; }
+    public string ClassName { get; set; }
 
-        public string LowerClassName
+    public string LowerClassName
+    {
+        get
         {
-            get
-            {
-                return ClassName[..1].ToLower() + ClassName[1..]; // 首字母小写
-            }
+            return ClassName[..1].ToLower() + ClassName[1..]; // 首字母小写
         }
+    }
 
-        public List<CodeGenConfig> QueryWhetherList { get; set; }
+    public List<CodeGenConfig> QueryWhetherList { get; set; }
 
-        public List<CodeGenConfig> TableField { get; set; }
+    public List<CodeGenConfig> TableField { get; set; }
 
-        public bool IsJoinTable { get; set; }
+    public bool IsJoinTable { get; set; }
 
-        public bool IsUpload { get; set; }
-        private List<TableColumnOuput> ColumnList { get; set; }
+    public bool IsUpload { get; set; }
+    private List<TableColumnOuput> ColumnList { get; set; }
 
-        public string GetColumnNetType(object tbName, object colName)
-        {
-            ColumnList = GetColumnListByTableName(tbName.ToString());
-            var col = ColumnList.Where(c => c.ColumnName == colName.ToString()).FirstOrDefault();
-            //多库代码生成切库调用后切换回原库
-            _sysCodeGenRep.Context.AsTenant().ChangeDatabase(SqlSugarConst.ConfigId);
-            return col.NetType;
-        }
+    public string GetColumnNetType(object tbName, object colName)
+    {
+        ColumnList = GetColumnListByTableName(tbName.ToString());
+        var col = ColumnList.Where(c => c.ColumnName == colName.ToString()).FirstOrDefault();
+        //多库代码生成切库调用后切换回原库
+        _sysCodeGenRep.Context.AsTenant().ChangeDatabase(SqlSugarConst.ConfigId);
+        return col.NetType;
+    }
 
-        public List<TableColumnOuput> GetColumnListByTableName(string tableName)
+    public List<TableColumnOuput> GetColumnListByTableName(string tableName)
+    {
+        //多库代码生成切换库
+        if (DbConfigId != SqlSugarConst.ConfigId)
+            _sysCodeGenRep.Context.AsTenant().ChangeDatabase(DbConfigId);
+
+        // 获取实体类型属性
+        var entityType = _sysCodeGenRep.Context.DbMaintenance.GetTableInfoList().FirstOrDefault(u => u.Name == tableName);
+        if (entityType == null) return null;
+
+        // 按原始类型的顺序获取所有实体类型属性(不包含导航属性,会返回null)
+        return _sysCodeGenRep.Context.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new TableColumnOuput
         {
-            //多库代码生成切换库
-            if (DbConfigId != SqlSugarConst.ConfigId)
-                _sysCodeGenRep.Context.AsTenant().ChangeDatabase(DbConfigId);
-
-            // 获取实体类型属性
-            var entityType = _sysCodeGenRep.Context.DbMaintenance.GetTableInfoList().FirstOrDefault(u => u.Name == tableName);
-            if (entityType == null) return null;
-
-            // 按原始类型的顺序获取所有实体类型属性(不包含导航属性,会返回null)
-            return _sysCodeGenRep.Context.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new TableColumnOuput
-            {
-                ColumnName = u.DbColumnName,
-                ColumnKey = u.IsPrimarykey.ToString(),
-                DataType = u.DataType.ToString(),
-                NetType = CodeGenUtil.ConvertDataType(u.DataType.ToString()),
-                ColumnComment = u.ColumnDescription
-            }).ToList();
-        }
+            ColumnName = u.DbColumnName,
+            ColumnKey = u.IsPrimarykey.ToString(),
+            DataType = u.DataType.ToString(),
+            NetType = CodeGenUtil.ConvertDataType(u.DataType.ToString()),
+            ColumnComment = u.ColumnDescription
+        }).ToList();
     }
 }

+ 16 - 17
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/DatabaseOutput.cs

@@ -1,23 +1,22 @@
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 多库代码生成库列表输出
+/// </summary>
+public class DatabaseOutput
 {
     /// <summary>
-    /// 多库代码生成库列表输出
+    /// 库定位器名
     /// </summary>
-    public class DatabaseOutput
-    {
-        /// <summary>
-        /// 库定位器名
-        /// </summary>
-        public dynamic DbConfigId { get; set; }
+    public dynamic DbConfigId { get; set; }
 
-        /// <summary>
-        /// 数据库类型
-        /// </summary>
-        public string DbType { get; set; }
+    /// <summary>
+    /// 数据库类型
+    /// </summary>
+    public string DbType { get; set; }
 
-        /// <summary>
-        /// 数据库连接字符串
-        /// </summary>
-        public string ConnectionString { get; set; }
-    }
+    /// <summary>
+    /// 数据库连接字符串
+    /// </summary>
+    public string ConnectionString { get; set; }
 }

+ 5 - 6
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/SelectOutput.cs

@@ -1,9 +1,8 @@
-namespace Admin.NET.Core.Service
+namespace Admin.NET.Core.Service;
+
+public class SelectOutput
 {
-    public class SelectOutput
-    {
-        public object Code { get; set; }
+    public object Code { get; set; }
 
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
 }

Some files were not shown because too many files changed in this diff