😎代码清理与格式化

Admin.NET/Admin.NET.Application/Configuration/CDConfig.json

@@ -15,6 +15,6 @@
       "TargetFramework": "net8.0", // 发布.NET版本
       "RuntimeIdentifier": "linux-x64" // 运行平台
     },
-    "ExcludeFiles": ["Configuration\\*.json"] // 排除文件
+    "ExcludeFiles": [ "Configuration\\*.json" ] // 排除文件
   }
 }

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

@@ -43,7 +43,7 @@
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1143" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1146" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

Admin.NET/Admin.NET.Core/Entity/SysTenant.cs

@@ -4,8 +4,6 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-using Tea.Utils;
-
 namespace Admin.NET.Core;
 
 /// <summary>
@@ -21,7 +19,7 @@ public partial class SysTenant : EntityBase
     [Obsolete("废弃字段, 请勿使用")]
     [SugarColumn(ColumnDescription = "应用Id")]
     public virtual long? AppId { get; set; }
-    
+
     /// <summary>
     /// 租管用户Id
     /// </summary>
@@ -72,13 +70,13 @@ public partial class SysTenant : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "从库连接/读写分离", ColumnDataType = StaticConfig.CodeFirst_BigString)]
     public virtual string? SlaveConnections { get; set; }
-    
+
     /// <summary>
     /// 启用注册功能
     /// </summary>
     [SugarColumn(ColumnDescription = "启用注册功能")]
     public virtual YesNoEnum? EnableReg { get; set; } = YesNoEnum.N;
-    
+
     /// <summary>
     /// 默认注册方案Id
     /// </summary>
@@ -126,7 +124,7 @@ public partial class SysTenant : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "ICP备案号", Length = 32), MaxLength(32)]
     public virtual string? Icp { get; set; }
-    
+
     /// <summary>
     /// ICP地址
     /// </summary>

Admin.NET/Admin.NET.Core/Entity/SysTenantMenu.cs

@@ -11,7 +11,7 @@ namespace Admin.NET.Core;
 /// </summary>
 [SysTable]
 [SugarTable(null, "系统租户菜单表")]
-[SugarIndex("index_{table}_TM", nameof(TenantId), OrderByType.Asc, nameof(MenuId), OrderByType.Asc, IsUnique=true)]
+[SugarIndex("index_{table}_TM", nameof(TenantId), OrderByType.Asc, nameof(MenuId), OrderByType.Asc, IsUnique = true)]
 public class SysTenantMenu : EntityBaseId
 {
     /// <summary>

Admin.NET/Admin.NET.Core/Entity/SysUserRegWay.cs

@@ -19,31 +19,31 @@ public partial class SysUserRegWay : EntityTenant
     [MaxLength(32)]
     [SugarColumn(ColumnDescription = "方案名称", Length = 32)]
     public virtual string Name { get; set; }
-    
+
     /// <summary>
     /// 账号类型
     /// </summary>
     [SugarColumn(ColumnDescription = "账号类型")]
     public virtual AccountTypeEnum AccountType { get; set; } = AccountTypeEnum.NormalUser;
-    
+
     /// <summary>
     /// 注册用户默认角色
     /// </summary>
     [SugarColumn(ColumnDescription = "角色")]
     public virtual long RoleId { get; set; }
-    
+
     /// <summary>
     /// 注册用户默认机构
     /// </summary>
     [SugarColumn(ColumnDescription = "机构")]
     public virtual long OrgId { get; set; }
-    
+
     /// <summary>
     /// 注册用户默认职位
     /// </summary>
     [SugarColumn(ColumnDescription = "职位")]
     public virtual long PosId { get; set; }
-    
+
     /// <summary>
     /// 排序
     /// </summary>

Admin.NET/Admin.NET.Core/Enum/ErrorCodeEnum.cs

@@ -204,37 +204,37 @@ public enum ErrorCodeEnum
     /// </summary>
     [ErrorCodeItemMetadata("手机号已存在")]
     D1032,
-    
+
     /// <summary>
     /// 此角色下存在注册方案禁止删除
     /// </summary>
     [ErrorCodeItemMetadata("此角色下存在注册方案禁止删除")]
     D1033,
-    
+
     /// <summary>
     /// 注册功能未开启禁止注册
     /// </summary>
     [ErrorCodeItemMetadata("注册功能未开启禁止注册")]
     D1034,
-    
+
     /// <summary>
     /// 注册方案不存在
     /// </summary>
     [ErrorCodeItemMetadata("注册方案不存在")]
     D1035,
-    
+
     /// <summary>
     /// 角色不存在
     /// </summary>
     [ErrorCodeItemMetadata("角色不存在")]
     D1036,
-    
+
     /// <summary>
     /// 禁止注册超级管理员和系统管理员
     /// </summary>
     [ErrorCodeItemMetadata("禁止注册超级管理员和系统管理员")]
     D1037,
-    
+
     /// <summary>
     /// 父机构不存在
     /// </summary>
@@ -294,13 +294,13 @@ public enum ErrorCodeEnum
     /// </summary>
     [ErrorCodeItemMetadata("禁止增加根节点机构")]
     D2009,
-    
+
     /// <summary>
     /// 此机构下存在注册方案禁止删除
     /// </summary>
     [ErrorCodeItemMetadata("此机构下存在注册方案禁止删除")]
     D2010,
-    
+
     /// <summary>
     /// 机构不存在
     /// </summary>
@@ -420,7 +420,7 @@ public enum ErrorCodeEnum
     /// </summary>
     [ErrorCodeItemMetadata("父节点不能为按钮类型")]
     D4010,
-    
+
     /// <summary>
     /// 租户不能为空
     /// </summary>
@@ -486,7 +486,7 @@ public enum ErrorCodeEnum
     /// </summary>
     [ErrorCodeItemMetadata("职位不存在")]
     D6003,
-    
+
     /// <summary>
     /// 此职位下存在注册方案禁止删除
     /// </summary>
@@ -600,7 +600,7 @@ public enum ErrorCodeEnum
     /// </summary>
     [ErrorCodeItemMetadata("已存在同名的租户域名")]
     D1303,
-    
+
     /// <summary>
     /// 授权菜单存在重复项
     /// </summary>
@@ -702,7 +702,7 @@ public enum ErrorCodeEnum
     /// </summary>
     [ErrorCodeItemMetadata("已存在同名功能或同名程序及插件")]
     D1900,
-    
+
     /// <summary>
     /// 注册方案名称已存在
     /// </summary>

Admin.NET/Admin.NET.Core/Enum/SysUserEventTypeEnum.cs

@@ -60,7 +60,7 @@ public enum SysUserEventTypeEnum
     /// </summary>
     [Description("解除登录锁定")]
     UnlockLogin = 888,
-    
+
     /// <summary>
     /// 注册用户
     /// </summary>

Admin.NET/Admin.NET.Core/Extension/EnumerableExtension.cs

@@ -1,7 +1,7 @@
 // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-// 
+//
 // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-// 
+//
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
 namespace Admin.NET.Core;
@@ -9,10 +9,10 @@ namespace Admin.NET.Core;
 /// <summary>
 /// 数据集合拓展类
 /// </summary>
-public static class EnumerableExtension 
+public static class EnumerableExtension
 {
     private static readonly ConcurrentDictionary<string, PropertyInfo> PropertyCache = new();
-    
+
     /// <summary>
     /// 查询有父子关系的数据集
     /// </summary>
@@ -103,7 +103,7 @@ public static class EnumerableExtension
 
         // 如果不需要包含顶级节点本身，则移除它们
         topNodes.ForEach(e => result.Remove(e));
-        
+
         return result;
     }
 }

Admin.NET/Admin.NET.Core/Extension/SqlSugarFilterExtension.cs

@@ -32,7 +32,7 @@ public static class SqlSugarFilterExtension
     {
         var fieldNames = type.GetPropertyNames<T>();
         ParameterExpression parameter = Expression.Parameter(type, "c");
-        
+
         Expression right = Expression.Constant(false);
         ConstantExpression ownersCollection = Expression.Constant(owners);
         foreach (var fieldName in fieldNames)

Admin.NET/Admin.NET.Core/Option/CDConfigOptions.cs

@@ -1,7 +1,7 @@
 // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-// 
+//
 // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-// 
+//
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
 namespace Admin.NET.Core;
@@ -25,12 +25,12 @@ public class CDConfigOptions : IConfigurableOptions
     /// 仓库名
     /// </summary>
     public string Repo { get; set; }
-    
+
     /// <summary>
     /// 分支名
     /// </summary>
     public string Branch { get; set; }
-    
+
     /// <summary>
     /// 用户授权码
     /// </summary>
@@ -40,7 +40,7 @@ public class CDConfigOptions : IConfigurableOptions
     /// 更新间隔限制（分钟）0 不限制
     /// </summary>
     public int UpdateInterval { get; set; }
-    
+
     /// <summary>
     /// 保留备份文件的数量, 0 不限制
     /// </summary>
@@ -71,12 +71,12 @@ public class PublishOptions
     /// 发布环境配置
     /// </summary>
     public string Configuration { get; set; }
-    
+
     /// <summary>
     /// 目标框架
     /// </summary>
     public string TargetFramework { get; set; }
-    
+
     /// <summary>
     /// 运行环境
     /// </summary>

Admin.NET/Admin.NET.Core/SeedData/SysRoleMenuSeedData.cs

@@ -24,7 +24,7 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
         var defaultMenuList = new SysTenantMenuSeedData().HasData().ToList();
 
         // 第一个角色拥有全部默认租户菜单
-        roleMenuList.AddRange(defaultMenuList.Select(u => new SysRoleMenu { Id=u.MenuId+(roleList[0].Id % 1300000000000), RoleId=roleList[0].Id, MenuId=u.MenuId}));
+        roleMenuList.AddRange(defaultMenuList.Select(u => new SysRoleMenu { Id = u.MenuId + (roleList[0].Id % 1300000000000), RoleId = roleList[0].Id, MenuId = u.MenuId }));
 
         // 其他角色权限：工作台、系统管理、个人中心、帮助文档、关于项目
         var otherRoleMenuList = menuList.ToChildList(u => u.Id, u => u.Pid, u => new[] { "工作台", "帮助文档", "关于项目", "个人中心" }.Contains(u.Title)).ToList();

Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginInput.cs

@@ -76,13 +76,13 @@ public class UserRegistrationInput
     /// </summary>
     [Required(ErrorMessage = "真实姓名不能为空"), MinLength(2, ErrorMessage = "真实姓名不能少于2个字符")]
     public string RealName { get; set; }
-    
+
     /// <summary>
     /// 账号
     /// </summary>
     [Required(ErrorMessage = "账号不能为空"), MinLength(6, ErrorMessage = "账号不能少于6个字符")]
     public string Account { get; set; }
-    
+
     /// <summary>
     /// 手机号码
     /// </summary>
@@ -90,30 +90,30 @@ public class UserRegistrationInput
     [Required(ErrorMessage = "手机号码不能为空")]
     [DataValidation(ValidationTypes.PhoneNumber, ErrorMessage = "手机号码不正确")]
     public string Phone { get; set; }
-    
+
     /// <summary>
     /// 验证码
     /// </summary>
     /// <example>123456</example>
     [Required(ErrorMessage = "验证码不能为空")]
     public string Code { get; set; }
-    
+
     /// <summary>
     /// 验证码Id
     /// </summary>
     public long CodeId { get; set; }
-    
+
     /// <summary>
     /// 租户
     /// </summary>
     [Required(ErrorMessage = "租户不能为空")]
     public long TenantId { get; set; }
-    
+
     /// <summary>
     /// 密码
     /// </summary>
     public string Password { get; set; }
-    
+
     /// <summary>
     /// 注册方案
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Auth/Dto/SysLdapInput.cs

@@ -15,7 +15,7 @@ public class SysLdapInput : BasePageInput
     /// 主机
     /// </summary>
     public string? Host { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -110,7 +110,7 @@ public class SysAuthService : IDynamicApiController, ITransient
         // 租户是否存在或已禁用
         var tenant = await _sysUserRep.ChangeRepository<SqlSugarRepository<SysTenant>>().GetFirstAsync(u => u.Id == tenantId);
         if (tenant?.Status != StatusEnum.Enable) throw Oops.Oh(ErrorCodeEnum.Z1003);
-        
+
         // 判断账号是否存在
         var user = await _sysUserRep.AsQueryable().Includes(t => t.SysOrg).ClearFilter()
             .Where(u => u.AccountType == AccountTypeEnum.SuperAdmin || u.TenantId == tenantId)
@@ -359,11 +359,11 @@ public class SysAuthService : IDynamicApiController, ITransient
         // 校验验证码
         if (!_captcha.Validate(input.CodeId.ToString(), input.Code)) throw Oops.Oh(ErrorCodeEnum.D0008);
         _captcha.Generate(input.CodeId.ToString());
-        
+
         // 判断租户是否有效且启用注册功能
         var tenant = await _sysUserRep.Context.Queryable<SysTenant>().FirstAsync(u => u.Id == input.TenantId && u.Status == StatusEnum.Enable);
         if (tenant?.EnableReg != YesNoEnum.Y) throw Oops.Oh(ErrorCodeEnum.D1034);
-        
+
         // 查找注册方案
         var wayId = input.WayId <= 0 ? tenant.RegWayId : input.WayId;
         var regWay = await _sysUserRep.Context.Queryable<SysUserRegWay>().FirstAsync(u => u.Id == wayId) ?? throw Oops.Oh(ErrorCodeEnum.D1035);

Admin.NET/Admin.NET.Core/Service/Config/Dto/InfoInput.cs

@@ -61,7 +61,7 @@ public class InfoSaveInput
     /// </summary>
     [Required(ErrorMessage = "ICP地址不能为空")]
     public string IcpUrl { get; set; }
-    
+
     /// <summary>
     /// 启用注册功能
     /// </summary>
@@ -76,7 +76,7 @@ public class InfoSaveInput
     /// 图形验证码
     /// </summary>
     public YesNoEnum Captcha { get; set; }
-    
+
     /// <summary>
     /// 默认注册方案Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Dict/Dto/DictDataInput.cs

@@ -21,7 +21,7 @@ public class PageDictDataInput : BasePageInput
     /// 字典文本
     /// </summary>
     public string Label { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Dict/Dto/DictTypeInput.cs

@@ -21,7 +21,7 @@ public class PageDictTypeInput : BasePageInput
     /// 编码
     /// </summary>
     public string Code { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -38,7 +38,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
             .Where(u => u.DictTypeId == input.DictTypeId)
             .WhereIF(!_userManager.SuperAdmin, u => ids.Contains(u.TenantId.Value))
             .WhereIF(!string.IsNullOrEmpty(input.Label?.Trim()), u => u.Value.Contains(input.Label))
-            .WhereIF(_userManager.SuperAdmin && input.TenantId > 0, u => u.TenantId ==  input.TenantId)
+            .WhereIF(_userManager.SuperAdmin && input.TenantId > 0, u => u.TenantId == input.TenantId)
             .OrderBy(u => new { u.OrderNo, Code = u.Value })
             .ToPagedListAsync(input.Page, input.PageSize);
     }
@@ -148,7 +148,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     [NonAction]
     public async Task<List<SysDictData>> GetDictDataListByDictTypeId(long dictTypeId)
     {
-        var dictType = await App.GetService<SysDictTypeService>().GetDetail(new DictTypeInput { Id= dictTypeId });
+        var dictType = await App.GetService<SysDictTypeService>().GetDetail(new DictTypeInput { Id = dictTypeId });
         var dictDataList = _sysCacheService.Get<List<SysDictData>>($"{CacheConst.KeyDict}{dictTypeId}");
 
         if (dictDataList == null)
@@ -199,7 +199,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
             .OrderBy((u, a) => new { a.OrderNo, Code = a.Value })
             .Select((u, a) => a).ToListAsync();
     }
-    
+
     /// <summary>
     /// 获取租户Id列表
     /// </summary>
@@ -214,7 +214,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     [NonAction]
     public ISugarQueryable<SysDictData> GetSysDictDataQueryable()
     {
-        var ids = GetTenantIdList(); 
+        var ids = GetTenantIdList();
         return _sysDictDataRep.AsQueryable().ClearFilter().WhereIF(!_userManager.SuperAdmin, u => ids.Contains(u.TenantId.Value));
     }
 

Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -37,7 +37,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
     {
         return await _sysDictTypeRep.AsQueryable()
             .WhereIF(!_userManager.SuperAdmin, u => !SqlFunc.EndsWith(SqlFunc.ToLower(u.Code), nameof(Enum).ToLower()))
-            .WhereIF(_userManager.SuperAdmin && input.TenantId > 0, u => u.TenantId ==  input.TenantId)
+            .WhereIF(_userManager.SuperAdmin && input.TenantId > 0, u => u.TenantId == input.TenantId)
             .WhereIF(!string.IsNullOrEmpty(input.Code?.Trim()), u => u.Code.Contains(input.Code))
             .WhereIF(!string.IsNullOrEmpty(input.Name?.Trim()), u => u.Name.Contains(input.Name))
             .OrderBy(u => new { u.OrderNo, u.Code })
@@ -164,7 +164,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
             .ToListAsync();
         return ds.OrderBy(u => u.OrderNo).GroupBy(u => u.TypeCode).ToDictionary(u => u.Key, u => u);
     }
-    
+
     /// <summary>
     /// 获取SysDictData表查询实例
     /// </summary>
@@ -175,7 +175,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
         var ids = GetTenantIdList();
         return _sysDictTypeRep.AsQueryable().ClearFilter().WhereIF(!_userManager.SuperAdmin, u => ids.Contains(u.TenantId.Value));
     }
-    
+
     /// <summary>
     /// 获取租户Id列表
     /// </summary>

Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs

@@ -30,7 +30,7 @@ public class PageFileInput : BasePageInput
     /// 结束时间
     /// </summary>
     public DateTime? EndTime { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Log/Dto/LogInput.cs

@@ -57,7 +57,7 @@ public class PageLogInput : BasePageInput
     /// IP地址
     /// </summary>
     public string? RemoteIp { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuInput.cs

@@ -17,7 +17,7 @@ public class MenuInput
     /// 菜单类型（1目录 2菜单 3按钮）
     /// </summary>
     public MenuTypeEnum? Type { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>
@@ -31,7 +31,7 @@ public class AddMenuInput : SysMenu
     /// </summary>
     [Required(ErrorMessage = "菜单名称不能为空")]
     public override string Title { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -69,7 +69,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     {
         var menuIdList = _userManager.SuperAdmin || _userManager.SysAdmin ? new List<long>() : await GetMenuIdList();
         var (query, _) = GetSugarQueryableAndTenantId(input.TenantId);
-        
+
         // 有筛选条件时返回list列表（防止构造不出树）
         if (!string.IsNullOrWhiteSpace(input.Title) || input.Type is > 0)
         {
@@ -94,7 +94,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     public async Task<long> AddMenu(AddMenuInput input)
     {
         var (query, tenantId) = GetSugarQueryableAndTenantId(input.TenantId);
-        
+
         var isExist = input.Type != MenuTypeEnum.Btn
             ? await query.AnyAsync(u => u.Title == input.Title && u.Pid == input.Pid)
             : await query.AnyAsync(u => u.Permission == input.Permission);
@@ -167,7 +167,7 @@ public class SysMenuService : IDynamicApiController, ITransient
         var menuIdList = menuTreeList.Select(u => u.Id).ToList();
 
         await _sysMenuRep.DeleteAsync(u => menuIdList.Contains(u.Id));
-        
+
         // 级联删除租户菜单数据
         await _sysTenantMenuRep.AsDeleteable().Where(u => menuIdList.Contains(u.MenuId)).ExecuteCommandAsync();
 
@@ -220,14 +220,14 @@ public class SysMenuService : IDynamicApiController, ITransient
         var userId = _userManager.UserId;
         var permissions = _sysCacheService.Get<List<string>>(CacheConst.KeyUserButton + userId);
         if (permissions != null) return permissions;
-        
+
         var menuIdList = _userManager.SuperAdmin || _userManager.SysAdmin ? new() : await GetMenuIdList();
-        
+
         permissions = await _sysMenuRep.AsQueryable().Where(u => u.Type == MenuTypeEnum.Btn)
             .WhereIF(menuIdList.Count > 0, u => menuIdList.Contains(u.Id))
             .InnerJoinIF<SysTenantMenu>(!_userManager.SuperAdmin, (u, t) => t.TenantId == _userManager.TenantId && u.Id == t.MenuId)
             .Select(u => u.Permission).ToListAsync();
-        
+
         _sysCacheService.Set(CacheConst.KeyUserButton + userId, permissions, TimeSpan.FromDays(7));
 
         return permissions;
@@ -250,7 +250,7 @@ public class SysMenuService : IDynamicApiController, ITransient
 
         return permissions;
     }
-    
+
     /// <summary>
     /// 根据租户id获取构建菜单联表查询实例
     /// </summary>

Admin.NET/Admin.NET.Core/Service/OnlineUser/Dto/OnlineUserInput.cs

@@ -17,7 +17,7 @@ public class PageOnlineUserInput : BasePageInput
     /// 真实姓名
     /// </summary>
     public string RealName { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Org/Dto/OrgInput.cs

@@ -22,7 +22,7 @@ public class OrgInput : BaseIdInput
     /// 机构类型
     /// </summary>
     public string Type { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -239,7 +239,7 @@ public class SysOrgService : IDynamicApiController, ITransient
         var cOrgHasEmp = await _sysOrgRep.ChangeRepository<SqlSugarRepository<SysUser>>()
             .IsAnyAsync(u => childOrgIdList.Contains(u.OrgId));
         if (cOrgHasEmp) throw Oops.Oh(ErrorCodeEnum.D2007);
-        
+
         // 若有绑定注册方案则禁止删除
         var hasUserRegWay = await _sysOrgRep.Context.Queryable<SysUserRegWay>().AnyAsync(u => u.OrgId == input.Id);
         if (hasUserRegWay) throw Oops.Oh(ErrorCodeEnum.D2010);

Admin.NET/Admin.NET.Core/Service/Plugin/Dto/PluginInput.cs

@@ -17,7 +17,7 @@ public class PagePluginInput : BasePageInput
     /// 编码
     /// </summary>
     public string Code { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Pos/Dto/PosInput.cs

@@ -17,7 +17,7 @@ public class PosInput
     /// 编码
     /// </summary>
     public string Code { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Pos/SysPosService.cs

@@ -100,7 +100,7 @@ public class SysPosService : IDynamicApiController, ITransient
         // 若附属职位有用户则禁止删除
         var hasExtPosEmp = await _sysUserExtOrgService.HasUserPos(input.Id);
         if (hasExtPosEmp) throw Oops.Oh(ErrorCodeEnum.D6001);
-        
+
         // 若有绑定注册方案则禁止删除
         var hasUserRegWay = await _sysPosRep.Context.Queryable<SysUserRegWay>().AnyAsync(u => u.PosId == input.Id);
         if (hasUserRegWay) throw Oops.Oh(ErrorCodeEnum.D6004);

Admin.NET/Admin.NET.Core/Service/Print/Dto/PrintInput.cs

@@ -17,7 +17,7 @@ public class PagePrintInput : BasePageInput
     /// 编码
     /// </summary>
     public string Code { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Role/Dto/RoleInput.cs

@@ -20,7 +20,7 @@ public class PageRoleInput : BasePageInput
     /// 租户Id
     /// </summary>
     public long TenantId { get; set; }
-    
+
     /// <summary>
     /// 名称
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs

@@ -134,7 +134,7 @@ public class SysRoleService : IDynamicApiController, ITransient
         // 若角色有用户则禁止删除
         var userIds = await _sysUserRoleService.GetUserIdList(input.Id);
         if (userIds != null && userIds.Count > 0) throw Oops.Oh(ErrorCodeEnum.D1025);
-        
+
         // 若有绑定注册方案则禁止删除
         var hasUserRegWay = await _sysRoleRep.Context.Queryable<SysUserRegWay>().AnyAsync(u => u.RoleId == input.Id);
         if (hasUserRegWay) throw Oops.Oh(ErrorCodeEnum.D1033);

Admin.NET/Admin.NET.Core/Service/Schedule/Dto/ScheduleInput.cs

@@ -19,7 +19,7 @@ public class ListScheduleInput
     public DateTime? StartTime { get; set; }
 
     public DateTime? EndTime { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Tenant/Dto/TenantInput.cs

@@ -40,7 +40,7 @@ public class AddTenantInput : TenantOutput
     /// </summary>
     [Required(ErrorMessage = "租管账号不能为空"), MinLength(3, ErrorMessage = "租管账号不能少于3个字符")]
     public override string AdminAccount { get; set; }
-    
+
     /// <summary>
     /// 系统主标题
     /// </summary>
@@ -76,7 +76,7 @@ public class AddTenantInput : TenantOutput
     /// </summary>
     [Required(ErrorMessage = "ICP地址不能为空")]
     public override string IcpUrl { get; set; }
-    
+
     /// <summary>
     /// Logo图片Base64码
     /// </summary>
@@ -84,7 +84,7 @@ public class AddTenantInput : TenantOutput
         "string.IsNullOrWhiteSpace(Logo) && string.IsNullOrWhiteSpace(LogoBase64)", "图标不能为空"
     )]
     public virtual string LogoBase64 { get; set; }
-    
+
     /// <summary>
     /// Logo文件名
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -90,7 +90,7 @@ public class SysTenantService : IDynamicApiController, ITransient
             }, true)
             .ToPagedListAsync(input.Page, input.PageSize);
     }
-    
+
     /// <summary>
     /// 获取租户列表
     /// </summary>
@@ -104,12 +104,12 @@ public class SysTenantService : IDynamicApiController, ITransient
            .Where(u => u.Status == StatusEnum.Enable && u.IsDelete == false)
            .Select((u, a) => new
            {
-                Label = $"{u.Title}-{a.Name}",
-                Host = u.Host.ToLower(),
-                Value = u.Id,
+               Label = $"{u.Title}-{a.Name}",
+               Host = u.Host.ToLower(),
+               Value = u.Id,
            }).ToListAsync();
     }
-    
+
     /// <summary>
     /// 获取当前租户
     /// </summary>
@@ -177,10 +177,10 @@ public class SysTenantService : IDynamicApiController, ITransient
         }
         if (input.EnableReg == YesNoEnum.N) input.RegWayId = null;
         var tenant = input.Adapt<TenantOutput>();
-        
+
         // 设置logo
         SetLogoUrl(tenant, input.LogoBase64, input.LogoFileName);
-        
+
         await _sysTenantRep.InsertAsync(tenant);
         await InitNewTenant(tenant);
 
@@ -201,14 +201,14 @@ public class SysTenantService : IDynamicApiController, ITransient
         var oldSysLogoAbsoluteFilePath = Path.Combine(App.WebHostEnvironment.WebRootPath, oldSysLogoRelativeFilePath.TrimStart('/'));
 
         var groups = Regex.Match(logoBase64, @"data:image/(?<type>.+?);base64,(?<data>.+)").Groups;
-        
+
         //var type = groups["type"].Value;
         var base64Data = groups["data"].Value;
         var binData = Convert.FromBase64String(base64Data);
-        
+
         // 根据文件名取扩展名
         var ext = string.IsNullOrWhiteSpace(logoFileName) ? ".png" : Path.GetExtension(logoFileName);
-        
+
         // 本地图标保存路径
         var fileName = $"{tenant.ViceTitle}-logo{ext}".ToLower();
         var path = _uploadOptions.Path.Replace("/{yyyy}/{MM}/{dd}", "");
@@ -307,17 +307,17 @@ public class SysTenantService : IDynamicApiController, ITransient
 
         var systemMenu = allMenuList.First(u => u.Type == MenuTypeEnum.Dir && u.Title == "系统管理");
         menuList.Add(systemMenu);
-        menuList.AddRange(allMenuList.ToChildList(u => u.Id, u => u.Pid, u => u.Pid == systemMenu.Id && new[]{ "账号管理", "角色管理", "机构管理", "职位管理", "个人中心", "通知公告" }.Contains(u.Title)));
+        menuList.AddRange(allMenuList.ToChildList(u => u.Id, u => u.Pid, u => u.Pid == systemMenu.Id && new[] { "账号管理", "角色管理", "机构管理", "职位管理", "个人中心", "通知公告" }.Contains(u.Title)));
 
         var platformMenu = allMenuList.First(u => u.Type == MenuTypeEnum.Dir && u.Title == "平台管理");
         menuList.Add(platformMenu);
-        menuList.AddRange(allMenuList.ToChildList(u => u.Id, u => u.Pid, u => u.Pid == platformMenu.Id && new[]{ "菜单管理", "字典管理", "系统配置"}.Contains(u.Title)));
+        menuList.AddRange(allMenuList.ToChildList(u => u.Id, u => u.Pid, u => u.Pid == platformMenu.Id && new[] { "菜单管理", "字典管理", "系统配置" }.Contains(u.Title)));
         var dictMenu = menuList.First(u => u.Type == MenuTypeEnum.Menu && u.Title == "字典管理");
-        menuList = menuList.Where(u => u.Pid != dictMenu.Id || !new[]{"编辑", "删除"}.Contains(u.Title)).ToList();
+        menuList = menuList.Where(u => u.Pid != dictMenu.Id || !new[] { "编辑", "删除" }.Contains(u.Title)).ToList();
 
         var logMenu = allMenuList.First(u => u.Type == MenuTypeEnum.Dir && u.Title == "日志管理");
         menuList.Add(logMenu);
-        menuList.AddRange(allMenuList.ToChildList(u => u.Id, u => u.Pid, u => u.Pid == logMenu.Id && new[]{ "访问日志", "操作日志" }.Contains(u.Title)));
+        menuList.AddRange(allMenuList.ToChildList(u => u.Id, u => u.Pid, u => u.Pid == logMenu.Id && new[] { "访问日志", "操作日志" }.Contains(u.Title)));
 
         var flow = _sysTenantRep.Context.Queryable<SysMenu>().First(u => u.Type == MenuTypeEnum.Menu && u.Title == "审批流程");
         menuList.Add(allMenuList.First(u => u.Type == MenuTypeEnum.Dir && u.Title == "帮助文档"));
@@ -359,7 +359,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         await _sysTenantRep.Context.Deleteable<SysRoleMenu>().Where(u => menuIds.Contains(u.Id)).ExecuteCommandAsync();
         await _sysTenantRep.Context.Deleteable<SysUserMenu>().Where(u => menuIds.Contains(u.Id)).ExecuteCommandAsync();
         await _sysTenantRep.Context.Deleteable<SysMenu>().Where(u => menuIds.Contains(u.Id)).ExecuteCommandAsync();
-        
+
         var users = await _sysUserRep.AsQueryable().ClearFilter().Where(u => u.TenantId == input.Id).ToListAsync();
         var userIds = users.Select(u => u.Id).ToList();
         await _sysUserRep.AsDeleteable().Where(u => userIds.Contains(u.Id)).ExecuteCommandAsync();
@@ -454,9 +454,9 @@ public class SysTenantService : IDynamicApiController, ITransient
         if (menuList.Where(u => u.Type != MenuTypeEnum.Btn).GroupBy(u => new { u.Pid, u.Title }).Any(u => u.Count() > 1) ||
             menuList.Where(u => u.Type == MenuTypeEnum.Btn).GroupBy(u => u.Permission).Any(u => u.Count() > 1))
             throw Oops.Oh(ErrorCodeEnum.D1304);
-        
+
         // 检查路由是否重复
-        if (menuList.Where(u => !string.IsNullOrWhiteSpace(u.Name)).GroupBy(u => u.Name).Any(u => u.Count() > 1)) 
+        if (menuList.Where(u => !string.IsNullOrWhiteSpace(u.Name)).GroupBy(u => u.Name).Any(u => u.Count() > 1))
             throw Oops.Oh(ErrorCodeEnum.D4009);
 
         // 删除旧记录
@@ -464,7 +464,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         var sysTenantMenuList = input.MenuIdList.Select(menuId => new SysTenantMenu { TenantId = input.Id, MenuId = menuId }).ToList();
 
         await _sysTenantMenuRep.InsertRangeAsync(sysTenantMenuList);
-        
+
         // 清除菜单权限缓存
         App.GetService<SysMenuService>().DeleteMenuCache();
     }
@@ -494,7 +494,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         await _sysUserRep.UpdateAsync(u => new SysUser { Password = encryptPassword }, u => u.Id == input.UserId);
         return password;
     }
-    
+
     /// <summary>
     /// 切换租户 🔖
     /// </summary>
@@ -512,7 +512,7 @@ public class SysTenantService : IDynamicApiController, ITransient
 
         return await GetAccessTokenInNotSingleLogin(user);
     }
-    
+
     /// <summary>
     /// 进入租管端 🔖
     /// </summary>
@@ -525,7 +525,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         var user = await _sysUserRep.GetFirstAsync(u => u.Id == tenant.UserId) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
         return await GetAccessTokenInNotSingleLogin(user);
     }
-    
+
     /// <summary>
     /// 同步授权菜单(用于版本更新后，同步授权数据) 🔖
     /// </summary>
@@ -538,7 +538,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         var menuIdList = input.Id == SqlSugarConst.DefaultTenantId
             ? new SysMenuSeedData().HasData().Select(u => u.Id).ToList()
             : await _sysRoleRep.AsQueryable().ClearFilter()
-              .InnerJoin<SysTenant>((u , t) => t.Id == input.Id && u.TenantId == t.Id)
+              .InnerJoin<SysTenant>((u, t) => t.Id == input.Id && u.TenantId == t.Id)
               .InnerJoin<SysRoleMenu>((u, t, rm) => u.Id == rm.RoleId)
               .Select((u, t, rm) => rm.MenuId)
               .Distinct()
@@ -551,7 +551,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         }
         await GrantMenu(new TenantMenuInput { Id = input.Id, MenuIdList = menuIdList });
     }
-    
+
     /// <summary>
     /// 在非单用户登录模式下获取登录令牌
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Update/Dto/UpdateInput.cs

@@ -1,7 +1,7 @@
 // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-// 
+//
 // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-// 
+//
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
 namespace Admin.NET.Core.Service;

Admin.NET/Admin.NET.Core/Service/Update/Dto/UpdateOutput.cs

@@ -1,7 +1,7 @@
 // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-// 
+//
 // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-// 
+//
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
 namespace Admin.NET.Core.Service;

Admin.NET/Admin.NET.Core/Service/Update/SysUpdateService.cs

@@ -152,7 +152,7 @@ public class SysUpdateService : IDynamicApiController, ITransient
             }
 
             PrintfLog("备份原项目文件...");
-            string backupPath = Path.Combine(rootPath, $"{_cdConfigOptions.Repo}_{DateTime.Now:yyyy_MM_dd}.zip") ;
+            string backupPath = Path.Combine(rootPath, $"{_cdConfigOptions.Repo}_{DateTime.Now:yyyy_MM_dd}.zip");
             if (File.Exists(backupPath)) File.Delete(backupPath);
             ZipFile.CreateFromDirectory(_cdConfigOptions.BackendOutput, backupPath);
 
@@ -234,54 +234,54 @@ public class SysUpdateService : IDynamicApiController, ITransient
             {
                 // 提交修改
                 case "push_hooks":
-                {
-                    var commitList = input.GetValueOrDefault("commits")?.Adapt<List<Dictionary<string, object>>>() ?? new();
-                    foreach (var commit in commitList)
                     {
-                        var author = commit.GetValueOrDefault("author")?.Adapt<Dictionary<string, object>>();
-                        PrintfLog("Commit-Message：" + commit.GetValueOrDefault("message"));
-                        PrintfLog("Commit-Time：" + commit.GetValueOrDefault("timestamp"));
-                        PrintfLog("Commit-Author：" + author?.GetValueOrDefault("username"));
-                        PrintfLog("Modified-List：" + author?.GetValueOrDefault("modified")?.Adapt<List<string>>().Join());
-                        PrintfLog("----------------------------------------------------------");
+                        var commitList = input.GetValueOrDefault("commits")?.Adapt<List<Dictionary<string, object>>>() ?? new();
+                        foreach (var commit in commitList)
+                        {
+                            var author = commit.GetValueOrDefault("author")?.Adapt<Dictionary<string, object>>();
+                            PrintfLog("Commit-Message：" + commit.GetValueOrDefault("message"));
+                            PrintfLog("Commit-Time：" + commit.GetValueOrDefault("timestamp"));
+                            PrintfLog("Commit-Author：" + author?.GetValueOrDefault("username"));
+                            PrintfLog("Modified-List：" + author?.GetValueOrDefault("modified")?.Adapt<List<string>>().Join());
+                            PrintfLog("----------------------------------------------------------");
+                        }
+
+                        break;
                     }
-
-                    break;
-                }
                 // 合并 Pull Request
                 case "merge_request_hooks":
-                {
-                    var pull = input.GetValueOrDefault("pull_request")?.Adapt<Dictionary<string, object>>();
-                    var user = pull?.GetValueOrDefault("user")?.Adapt<Dictionary<string, object>>();
-                    PrintfLog("Pull-Request-Title：" + pull?.GetValueOrDefault("message"));
-                    PrintfLog("Pull-Request-Time：" + pull?.GetValueOrDefault("created_at"));
-                    PrintfLog("Pull-Request-Author：" + user?.GetValueOrDefault("username"));
-                    PrintfLog("Pull-Request-Body：" + pull?.GetValueOrDefault("body"));
-                    break;
-                }
+                    {
+                        var pull = input.GetValueOrDefault("pull_request")?.Adapt<Dictionary<string, object>>();
+                        var user = pull?.GetValueOrDefault("user")?.Adapt<Dictionary<string, object>>();
+                        PrintfLog("Pull-Request-Title：" + pull?.GetValueOrDefault("message"));
+                        PrintfLog("Pull-Request-Time：" + pull?.GetValueOrDefault("created_at"));
+                        PrintfLog("Pull-Request-Author：" + user?.GetValueOrDefault("username"));
+                        PrintfLog("Pull-Request-Body：" + pull?.GetValueOrDefault("body"));
+                        break;
+                    }
                 // 新的issue
                 case "issue_hooks":
-                {
-                    var issue = input.GetValueOrDefault("issue")?.Adapt<Dictionary<string, object>>();
-                    var user = issue?.GetValueOrDefault("user")?.Adapt<Dictionary<string, object>>();
-                    var labelList = issue?.GetValueOrDefault("labels")?.Adapt<List<Dictionary<string, object>>>();
-                    PrintfLog("Issue-UserName：" + user?.GetValueOrDefault("username"));
-                    PrintfLog("Issue-Labels：" + labelList?.Select(u => u.GetValueOrDefault("name")).Join());
-                    PrintfLog("Issue-Title：" + issue?.GetValueOrDefault("title"));
-                    PrintfLog("Issue-Time：" + issue?.GetValueOrDefault("created_at"));
-                    PrintfLog("Issue-Body：" + issue?.GetValueOrDefault("body"));
-                    return;
-                }
+                    {
+                        var issue = input.GetValueOrDefault("issue")?.Adapt<Dictionary<string, object>>();
+                        var user = issue?.GetValueOrDefault("user")?.Adapt<Dictionary<string, object>>();
+                        var labelList = issue?.GetValueOrDefault("labels")?.Adapt<List<Dictionary<string, object>>>();
+                        PrintfLog("Issue-UserName：" + user?.GetValueOrDefault("username"));
+                        PrintfLog("Issue-Labels：" + labelList?.Select(u => u.GetValueOrDefault("name")).Join());
+                        PrintfLog("Issue-Title：" + issue?.GetValueOrDefault("title"));
+                        PrintfLog("Issue-Time：" + issue?.GetValueOrDefault("created_at"));
+                        PrintfLog("Issue-Body：" + issue?.GetValueOrDefault("body"));
+                        return;
+                    }
                 // 评论
                 case "note_hooks":
-                {
-                    var comment = input.GetValueOrDefault("comment")?.Adapt<Dictionary<string, object>>();
-                    var user = input.GetValueOrDefault("user")?.Adapt<Dictionary<string, object>>();
-                    PrintfLog("comment-UserName：" + user?.GetValueOrDefault("username"));
-                    PrintfLog("comment-Time：" + comment?.GetValueOrDefault("created_at"));
-                    PrintfLog("comment-Content：" + comment?.GetValueOrDefault("body"));
-                    return;
-                }
+                    {
+                        var comment = input.GetValueOrDefault("comment")?.Adapt<Dictionary<string, object>>();
+                        var user = input.GetValueOrDefault("user")?.Adapt<Dictionary<string, object>>();
+                        PrintfLog("comment-UserName：" + user?.GetValueOrDefault("username"));
+                        PrintfLog("comment-Time：" + comment?.GetValueOrDefault("created_at"));
+                        PrintfLog("comment-Content：" + comment?.GetValueOrDefault("body"));
+                        return;
+                    }
                 default:
                     return;
             }

Admin.NET/Admin.NET.Core/Service/User/Dto/UserInput.cs

@@ -22,7 +22,7 @@ public class PageUserInput : BasePageInput
     /// 租户Id
     /// </summary>
     public long TenantId { get; set; }
-    
+
     /// <summary>
     /// 账号
     /// </summary>

Admin.NET/Admin.NET.Core/Service/User/Dto/UserRegWayInput.cs

@@ -15,7 +15,7 @@ public class PageUserRegWayInput : BasePageInput
     /// 方案名称
     /// </summary>
     public string? Name { get; set; }
-    
+
     /// <summary>
     /// 租户Id
     /// </summary>
@@ -33,26 +33,26 @@ public class AddUserRegWayInput : SysUserRegWay
     [Required(ErrorMessage = "方案名称不能为空")]
     [MaxLength(32, ErrorMessage = "方案名称字符长度不能超过32")]
     public override string Name { get; set; }
-    
+
     /// <summary>
     /// 账号类型
     /// </summary>
-    [Dict(nameof(AccountTypeEnum), AllowNullValue=true)]
+    [Dict(nameof(AccountTypeEnum), AllowNullValue = true)]
     [Required(ErrorMessage = "账号类型不能为空")]
     public override AccountTypeEnum AccountType { get; set; }
-    
+
     /// <summary>
     /// 角色
     /// </summary>
     [Required(ErrorMessage = "角色不能为空")]
     public override long RoleId { get; set; }
-    
+
     /// <summary>
     /// 机构
     /// </summary>
     [Required(ErrorMessage = "机构不能为空")]
     public override long OrgId { get; set; }
-    
+
     /// <summary>
     /// 职位
     /// </summary>
@@ -67,7 +67,7 @@ public class UpdateUserRegWayInput : AddUserRegWayInput
 {
     /// <summary>
     /// 主键Id
-    /// </summary>    
+    /// </summary>
     [Required(ErrorMessage = "主键Id不能为空")]
     public override long Id { get; set; }
 }

Admin.NET/Admin.NET.Core/Service/User/Dto/UserRegWayOutput.cs

@@ -14,13 +14,13 @@ public class UserRegWayOutput : SysUserRegWay
     /// <summary>
     /// 角色名称
     /// </summary>
-    public string RoleName { get; set; }   
-    
+    public string RoleName { get; set; }
+
     /// <summary>
     /// 机构名称
     /// </summary>
     public string OrgName { get; set; }
-    
+
     /// <summary>
     /// 职位名称
     /// </summary>

Admin.NET/Admin.NET.Core/Service/User/SysUserRegWayService.cs

@@ -20,7 +20,7 @@ public class SysUserRegWayService : IDynamicApiController, ITransient
         _sysUserRegWayRep = sysUserRegWayRep;
         _userManager = userManager;
     }
-    
+
     /// <summary>
     /// 查询注册方案列表 🔖
     /// </summary>
@@ -58,7 +58,7 @@ public class SysUserRegWayService : IDynamicApiController, ITransient
     {
         var entity = input.Adapt<SysUserRegWay>();
         if (await _sysUserRegWayRep.IsAnyAsync(u => u.Name == input.Name)) throw Oops.Oh(ErrorCodeEnum.D2101);
-        
+
         await CheckData(input);
         return await _sysUserRegWayRep.InsertAsync(entity) ? entity.Id : 0;
     }
@@ -89,7 +89,7 @@ public class SysUserRegWayService : IDynamicApiController, ITransient
         if (!await _sysUserRegWayRep.Context.Queryable<SysRole>().AnyAsync(u => u.Id == input.RoleId)) throw Oops.Oh(ErrorCodeEnum.D1036);
         if (!await _sysUserRegWayRep.Context.Queryable<SysOrg>().AnyAsync(u => u.Id == input.OrgId)) throw Oops.Oh(ErrorCodeEnum.D2011);
         if (!await _sysUserRegWayRep.Context.Queryable<SysPos>().AnyAsync(u => u.Id == input.PosId)) throw Oops.Oh(ErrorCodeEnum.D6003);
-        
+
         // 禁止注册超级管理员和系统管理员
         if (input.AccountType is AccountTypeEnum.SysAdmin or AccountTypeEnum.SuperAdmin) throw Oops.Oh(ErrorCodeEnum.D1037);
     }
@@ -105,13 +105,13 @@ public class SysUserRegWayService : IDynamicApiController, ITransient
     public async Task Delete(BaseIdInput input)
     {
         var entity = await _sysUserRegWayRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
-        
+
         // 关闭相关租户注册功能
-        await _sysUserRegWayRep.Context.Updateable(new SysTenant{ EnableReg = YesNoEnum.N, RegWayId = null })
+        await _sysUserRegWayRep.Context.Updateable(new SysTenant { EnableReg = YesNoEnum.N, RegWayId = null })
             .UpdateColumns(u => new { u.EnableReg, u.RegWayId })
             .Where(u => u.RegWayId == input.Id)
             .ExecuteCommandAsync();
-        
+
         // 删除方案
         await _sysUserRegWayRep.DeleteAsync(entity);
     }

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -125,7 +125,7 @@ public class SysUserService : IDynamicApiController, ITransient
 
         return newUser.Id;
     }
-    
+
     /// <summary>
     /// 增加用户 🔖
     /// </summary>

Admin.NET/Admin.NET.Core/Service/User/UserManager.cs

@@ -12,7 +12,7 @@ namespace Admin.NET.Core;
 public class UserManager : IScoped
 {
     private readonly IHttpContextAccessor _httpContextAccessor;
-    
+
     /// <summary>
     /// 用户ID
     /// </summary>
@@ -32,7 +32,7 @@ public class UserManager : IScoped
     /// 真实姓名
     /// </summary>
     public string RealName => _httpContextAccessor.HttpContext?.User.FindFirst(ClaimConst.RealName)?.Value;
-    
+
     /// <summary>
     /// 是否超级管理员
     /// </summary>

Admin.NET/Admin.NET.Core/Utils/CommonUtil.cs

@@ -23,7 +23,7 @@ public static class CommonUtil
     /// <param name="str"></param>
     /// <param name="startNumber"></param>
     /// <returns></returns>
-    public static long GetFixedHashCode(string str, long startNumber=0)
+    public static long GetFixedHashCode(string str, long startNumber = 0)
     {
         if (string.IsNullOrWhiteSpace(str)) return 0;
         unchecked

Admin.NET/Admin.NET.Core/Utils/FileHelper.cs

@@ -1,7 +1,7 @@
 // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-// 
+//
 // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-// 
+//
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
 namespace Admin.NET.Core;

Admin.NET/Admin.NET.Core/Utils/GiteeHelper.cs

@@ -37,7 +37,7 @@ public class GiteeHelper
     /// 构建Query参数
     /// </summary>
     /// <returns></returns>
-    private static string BuilderQueryString([NotNull]object obj)
+    private static string BuilderQueryString([NotNull] object obj)
     {
         if (obj == null) return string.Empty;
         var query = HttpUtility.ParseQueryString(string.Empty);

Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/SeedData/SysTenantMenuSeedData.cs

@@ -18,6 +18,6 @@ public class SysTenantMenuSeedData : ISqlSugarEntitySeedData<SysTenantMenu>
     /// <returns></returns>
     public IEnumerable<SysTenantMenu> HasData()
     {
-        return new SysMenuSeedData().HasData().Select(u => new SysTenantMenu { Id=u.Id + (SqlSugarConst.DefaultTenantId % 1300000000000), TenantId=SqlSugarConst.DefaultTenantId, MenuId=u.Id });
+        return new SysMenuSeedData().HasData().Select(u => new SysTenantMenu { Id = u.Id + (SqlSugarConst.DefaultTenantId % 1300000000000), TenantId = SqlSugarConst.DefaultTenantId, MenuId = u.Id });
     }
 }