代码整理优化

Admin.NET/Admin.NET.Application/Const/TestConst.cs

@@ -12,4 +12,4 @@
         /// </summary>
         public const string ConfigId = "Test";
     }
-}
+}

Admin.NET/Admin.NET.Application/Entity/Test.cs

@@ -1,8 +1,7 @@
-using Admin.NET.Application.Const;
-using Admin.NET.Core;
+using Admin.NET.Core;
 using SqlSugar;
-using System.ComponentModel.DataAnnotations;
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Admin.NET.Application.Entity
 {
@@ -26,11 +25,10 @@ namespace Admin.NET.Application.Entity
         [SugarColumn(ColumnDescription = "年龄")]
         public int Age { get; set; }
 
-
         /// <summary>
         /// 出生日期
         /// </summary>
         [SugarColumn(ColumnDescription = "出生日期")]
         public DateTime BirthDate { get; set; }
     }
-}
+}

Admin.NET/Admin.NET.Application/Filter/DataEntityFilter.cs

@@ -30,4 +30,4 @@ namespace Admin.NET.Application.Filter
             };
         }
     }
-}
+}

Admin.NET/Admin.NET.Application/SeedData/TestSeedData.cs

@@ -19,8 +19,8 @@ namespace Admin.NET.Application.SeedData
             return new[]
             {
                 new Test{ Id=252885263003800, Name="123", Age=20, CreateTime=DateTime.Parse("2022-04-12 00:00:00") },
-                new Test{ Id=252885263003801, Name="456", Age=30, CreateTime=DateTime.Parse("2022-04-12 00:00:00") },        
+                new Test{ Id=252885263003801, Name="456", Age=30, CreateTime=DateTime.Parse("2022-04-12 00:00:00") },
             };
         }
     }
-}
+}

Admin.NET/Admin.NET.Application/Service/TestService.cs

@@ -32,4 +32,4 @@ namespace Admin.NET.Application.Serice
             return await _testRep.GetListAsync();
         }
     }
-}
+}

Admin.NET/Admin.NET.Core/Attribute/NotLogAttribute.cs

@@ -9,6 +9,5 @@ namespace Admin.NET.Core
     [SuppressSniffer, AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property)]
     public class NotLogAttribute : Attribute
     {
-
     }
 }

Admin.NET/Admin.NET.Core/Attribute/NotTableAttribute.cs

@@ -9,6 +9,5 @@ namespace Admin.NET.Core
     [SuppressSniffer, AttributeUsage(AttributeTargets.Class)]
     public class NotTableAttribute : Attribute
     {
-
     }
 }

Admin.NET/Admin.NET.Core/Option/ConnectionStringsOptions.cs

@@ -60,4 +60,4 @@ namespace Admin.NET.Core
         /// </summary>
         public bool InitTable { get; set; }
     }
-}
+}

Admin.NET/Admin.NET.Core/SeedData/SysRoleSeedData.cs

@@ -19,7 +19,7 @@ namespace Admin.NET.Core
                 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 },

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

@@ -203,7 +203,6 @@ namespace Admin.NET.Core.Service.CodeGen
                 var joinTableList = tableFieldList.Where(u => u.EffectType == "Upload" || u.EffectType == "fk").ToList();//需要连表查询的字段
                 (string joinTableNames, string lowerJoinTableNames) = GetJoinTableStr(joinTableList);//获取连表的实体名和别名
 
-
                 var data = new CustomViewEngine(_sysCodeGenRep)
                 {
                     AuthorName = input.AuthorName,

Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CustomViewEngine.cs

@@ -11,7 +11,6 @@ namespace Admin.NET.Core.Service
 
         public CustomViewEngine()
         {
-
         }
 
         public CustomViewEngine(SqlSugarRepository<SysCodeGen> sysCodeGenRep)
@@ -30,7 +29,7 @@ namespace Admin.NET.Core.Service
         public string LowerClassName
         {
             get
-            {                
+            {
                 return ClassName[..1].ToLower() + ClassName[1..]; // 首字母小写
             }
         }
@@ -44,7 +43,6 @@ namespace Admin.NET.Core.Service
         public bool IsUpload { get; set; }
         private List<TableColumnOuput> ColumnList { get; set; }
 
-
         public string GetColumnNetType(object tbName, object colName)
         {
             ColumnList = GetColumnListByTableName(tbName.ToString());

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

@@ -158,7 +158,7 @@ namespace Admin.NET.Core.Service
         /// <returns></returns>
         private async Task<SysFile> HandleUploadFile(IFormFile file)
         {
-            if(file == null) throw Oops.Oh(ErrorCodeEnum.D8000);
+            if (file == null) throw Oops.Oh(ErrorCodeEnum.D8000);
 
             string path = _uploadOptions.Path;
 

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

@@ -3,7 +3,6 @@ using Furion.DynamicApiController;
 using Furion.FriendlyException;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

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

@@ -11,41 +11,41 @@ namespace Admin.NET.Core.Service
         /// 公司名称
         /// </summary>
         public virtual string Name { get; set; }
-        
+
         /// <summary>
         /// 管理员名称
         /// </summary>
         public virtual string AdminName { get; set; }
-        
+
         /// <summary>
         /// 主机
         /// </summary>
         public virtual string Host { get; set; }
-        
+
         /// <summary>
         /// 电子邮箱
         /// </summary>
         public virtual string Email { get; set; }
-        
+
         /// <summary>
         /// 电话
         /// </summary>
         public virtual string Phone { get; set; }
-        
+
         /// <summary>
         /// 数据库连接
         /// </summary>
         public virtual string Connection { get; set; }
-        
+
         /// <summary>
         /// 架构
         /// </summary>
         public virtual string Schema { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
-        public virtual string Remark { get; set; }        
+        public virtual string Remark { get; set; }
     }
 
     public class AddTenantInput : TenantInput
@@ -55,12 +55,12 @@ namespace Admin.NET.Core.Service
         /// </summary>
         [Required(ErrorMessage = "公司名称不能为空"), MinLength(2, ErrorMessage = "公司名称不能少于2个字符")]
         public override string Name { get; set; }
-        
+
         /// <summary>
         /// 管理员名称
         /// </summary>
         [Required(ErrorMessage = "管理员名称不能为空"), MinLength(3, ErrorMessage = "管理员名称不能少于3个字符")]
-        public override string AdminName { get; set; }        
+        public override string AdminName { get; set; }
     }
 
     public class DeleteTenantInput
@@ -69,7 +69,7 @@ namespace Admin.NET.Core.Service
         /// Id
         /// </summary>
         [Required(ErrorMessage = "Id不能为空")]
-        public long Id { get; set; }        
+        public long Id { get; set; }
     }
 
     public class UpdateTenantInput : TenantInput
@@ -95,6 +95,5 @@ namespace Admin.NET.Core.Service
 
     public class QueryeTenantInput : DeleteTenantInput
     {
-
     }
-}
+}

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

@@ -26,7 +26,7 @@ namespace Admin.NET.Core.Service
         private readonly SqlSugarRepository<SysRoleMenu> _sysRoleMenuRep;
         private readonly SqlSugarRepository<SysUserRole> _userRoleRep;
         private readonly SysUserRoleService _sysUserRoleService;
-        private readonly SysRoleMenuService _sysRoleMenuService;        
+        private readonly SysRoleMenuService _sysRoleMenuService;
 
         public SysTenantService(SqlSugarRepository<SysTenant> tenantRep,
             SqlSugarRepository<SysOrg> orgRep,
@@ -48,7 +48,7 @@ namespace Admin.NET.Core.Service
             _sysRoleMenuRep = sysRoleMenuRep;
             _userRoleRep = userRoleRep;
             _sysUserRoleService = sysUserRoleService;
-            _sysRoleMenuService = sysRoleMenuService;            
+            _sysRoleMenuService = sysRoleMenuService;
         }
 
         /// <summary>
@@ -94,9 +94,9 @@ namespace Admin.NET.Core.Service
             var newOrg = new SysOrg
             {
                 TenantId = tenantId,
-                Pid = 0,                
+                Pid = 0,
                 Name = companyName,
-                Code = companyName                
+                Code = companyName
             };
             await _orgRep.InsertAsync(newOrg);
 
@@ -106,7 +106,7 @@ namespace Admin.NET.Core.Service
                 TenantId = tenantId,
                 Code = "sys_manager_role",
                 Name = "系统管理员",
-                DataScope = DataScopeEnum.All                
+                DataScope = DataScopeEnum.All
             };
             await _roleRep.InsertAsync(newRole);
 
@@ -162,23 +162,22 @@ namespace Admin.NET.Core.Service
         {
             var entity = await _tenantRep.GetFirstAsync(u => u.Id == input.Id);
             await _tenantRep.DeleteAsync(entity);
-            var users = await _userRep.AsQueryable().Filter(null,true).Where(u => u.TenantId == input.Id).ToListAsync();
+            var users = await _userRep.AsQueryable().Filter(null, true).Where(u => u.TenantId == input.Id).ToListAsync();
             // 超级管理员所在租户为默认租户
             if (users.Any(u => u.UserType == UserTypeEnum.SuperAdmin))
                 throw Oops.Oh(ErrorCodeEnum.D1023);
 
             // 删除与租户相关的表数据
             var userIds = users.Select(u => u.Id).ToList();
-            await _userRep.AsDeleteable().Where(u=> userIds.Contains(u.Id)).ExecuteCommandAsync();
-            
-            await _userRoleRep.AsDeleteable().Where(u=> userIds.Contains(u.UserId)).ExecuteCommandAsync();
+            await _userRep.AsDeleteable().Where(u => userIds.Contains(u.Id)).ExecuteCommandAsync();
 
-            await _roleRep.AsDeleteable().Where(u => u.TenantId==input.Id).ExecuteCommandAsync();
+            await _userRoleRep.AsDeleteable().Where(u => userIds.Contains(u.UserId)).ExecuteCommandAsync();
 
-            await _sysUserExtOrgPosRep.AsDeleteable().Where(u => userIds.Contains(u.UserId)).ExecuteCommandAsync();
+            await _roleRep.AsDeleteable().Where(u => u.TenantId == input.Id).ExecuteCommandAsync();
 
+            await _sysUserExtOrgPosRep.AsDeleteable().Where(u => userIds.Contains(u.UserId)).ExecuteCommandAsync();
 
-            var roles = await _roleRep.AsQueryable().Filter(null,true).Where(u => u.TenantId==input.Id).ToListAsync();
+            var roles = await _roleRep.AsQueryable().Filter(null, true).Where(u => u.TenantId == input.Id).ToListAsync();
             await _roleRep.AsDeleteable().Where(u => u.TenantId == input.Id).ExecuteCommandAsync();
 
             var roleIds = roles.Select(u => u.Id).ToList();
@@ -278,7 +277,7 @@ namespace Admin.NET.Core.Service
         /// <returns></returns>
         private async Task<SysUser> GetTenantAdminUser(long tenantId)
         {
-            return await _userRep.AsQueryable().Filter(null, true).Where(u => u.TenantId == tenantId && u.UserType == UserTypeEnum.Admin).FirstAsync();                                   
+            return await _userRep.AsQueryable().Filter(null, true).Where(u => u.TenantId == tenantId && u.UserType == UserTypeEnum.Admin).FirstAsync();
         }
     }
-}
+}

Admin.NET/Admin.NET.Core/Service/WeChat/WechatPayService.cs

@@ -147,7 +147,7 @@ namespace Admin.NET.Core.Service
                 wechatPay.BankType = callbackResource.BankType; // 付款银行类型
                 wechatPay.Total = callbackResource.Amount.Total; // 订单总金额
                 wechatPay.PayerTotal = callbackResource.Amount.PayerTotal; // 用户支付金额
-                wechatPay.SuccessTime = callbackResource.SuccessTime; // 支付完成时间                
+                wechatPay.SuccessTime = callbackResource.SuccessTime; // 支付完成时间
 
                 await _wechatPayUserRep.AsUpdateable(wechatPay).IgnoreColumns(true).ExecuteCommandAsync();
             }

Admin.NET/Admin.NET.UnitTest/Helper/TestUserManager.cs

@@ -12,16 +12,14 @@ namespace Admin.NET.UnitTest
         /// <summary>
         /// 测试用户
         /// </summary>
-        public static string TestUserName { get; set; }= "admin";
+        public static string TestUserName { get; set; } = "admin";
 
         private SysUser user;
 
         private long userId;
 
-
         private readonly SqlSugarRepository<SysUser> _sysUserRep;
 
-
         public TestUserManager(SqlSugarRepository<SysUser> sysUserRep)
         {
             _sysUserRep = sysUserRep;
@@ -74,6 +72,6 @@ namespace Admin.NET.UnitTest
                 }
             }
             return user ?? throw Oops.Oh(ErrorCodeEnum.D1002);
-        }        
+        }
     }
-}
+}

Admin.NET/Admin.NET.UnitTest/SqlSugarTest.cs

@@ -13,19 +13,20 @@ namespace Admin.NET.UnitTest
         {
             testService = App.GetService<TestService>();
         }
+
         [Fact]
         public async void Test1()
         {
-            var page= await testService.GetTestList();
+            var page = await testService.GetTestList();
             Assert.True(page.Count > 0);
         }
 
         [Fact]
         public async void Test2()
         {
-            var userManager= App.GetService<IUserManager>();
+            var userManager = App.GetService<IUserManager>();
             var user = await userManager.CheckUserAsync(0);
-            Assert.NotNull(user );
+            Assert.NotNull(user);
         }
     }
-}
+}

Admin.NET/Admin.NET.UnitTest/Startup.cs

@@ -7,6 +7,7 @@ using Xunit.Sdk;
 
 // 配置启动类类型，第一个参数是 Startup 类完整限定名，第二个参数是当前项目程序集名称
 [assembly: TestFramework("Admin.NET.UnitTest.Startup", "Admin.NET.UnitTest")]
+
 namespace Admin.NET.UnitTest
 {
     /// <summary>
@@ -20,12 +21,12 @@ namespace Admin.NET.UnitTest
             // 初始化 IServiceCollection 对象
             var services = Inject.Create();
 
-            // 在这里可以和 .NET Core 一样注册服务了！！！ 
+            // 在这里可以和 .NET Core 一样注册服务了！！！
 
-            services.AddScoped<IUserManager, TestUserManager>(); 
+            services.AddScoped<IUserManager, TestUserManager>();
 
             // 构建 ServiceProvider 对象
-            services.Build();             
+            services.Build();
         }
     }
 }

Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -17,7 +17,7 @@ namespace Admin.NET.Web.Core
     public class Startup : AppStartup
     {
         public void ConfigureServices(IServiceCollection services)
-        {   
+        {
             services.AddConfigurableOptions<ConnectionStringsOptions>();
             services.AddConfigurableOptions<RefreshTokenOptions>();
             services.AddConfigurableOptions<SnowIdOptions>();
@@ -55,7 +55,7 @@ namespace Admin.NET.Web.Core
                 builder.AddSubscriber<LogEventSubscriber>();
             });
 
-            // 注册OSS对象存储            
+            // 注册OSS对象存储
             services.AddOSSService(option =>
             {
                 var ossOptions = App.GetOptions<OSSProviderOptions>();