😎调整仓储初始化位延迟加载模式

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

@@ -14,11 +14,21 @@ namespace Admin.NET.Core;
 [ApiDescriptionSettings(Order = 496)]
 public class SysLdapService : IDynamicApiController, ITransient
 {
-    private readonly SqlSugarRepository<SysLdap> _sysLdapRep;
+    private readonly ISqlSugarClient _db;
+    private SqlSugarRepository<SysLdap> sysLdapRep = null;
 
-    public SysLdapService(SqlSugarRepository<SysLdap> sysLdapRep)
+    public SysLdapService(ISqlSugarClient db)
     {
-        _sysLdapRep = sysLdapRep;
+        _db = db;
+    }
+
+    public SqlSugarRepository<SysLdap> SysLdapRep
+    {
+        get
+        {
+            sysLdapRep ??= _db.GetRepository<SqlSugarRepository<SysLdap>>();
+            return sysLdapRep;
+        }
     }
 
     /// <summary>
@@ -29,7 +39,7 @@ public class SysLdapService : IDynamicApiController, ITransient
     [DisplayName("获取系统域登录配置分页列表")]
     public async Task<SqlSugarPagedList<SysLdap>> Page(SysLdapInput input)
     {
-        return await _sysLdapRep.AsQueryable()
+        return await SysLdapRep.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Host.Contains(input.SearchKey.Trim()))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Host), u => u.Host.Contains(input.Host.Trim()))
             .OrderBy(u => u.CreateTime, OrderByType.Desc)
@@ -47,7 +57,7 @@ public class SysLdapService : IDynamicApiController, ITransient
     {
         var entity = input.Adapt<SysLdap>();
         entity.BindPass = CryptogramUtil.Encrypt(input.BindPass);
-        await _sysLdapRep.InsertAsync(entity);
+        await SysLdapRep.InsertAsync(entity);
         return entity.Id;
     }
 
@@ -66,7 +76,7 @@ public class SysLdapService : IDynamicApiController, ITransient
             entity.BindPass = CryptogramUtil.Encrypt(input.BindPass); // 加密
         }
 
-        await _sysLdapRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+        await SysLdapRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
     }
 
     /// <summary>
@@ -78,8 +88,8 @@ public class SysLdapService : IDynamicApiController, ITransient
     [DisplayName("删除系统域登录配置")]
     public async Task Delete(DeleteSysLdapInput input)
     {
-        var entity = await _sysLdapRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
-        await _sysLdapRep.FakeDeleteAsync(entity); // 假删除
+        var entity = await SysLdapRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+        await SysLdapRep.FakeDeleteAsync(entity); // 假删除
         //await _rep.DeleteAsync(entity); // 真删除
     }
 
@@ -91,7 +101,7 @@ public class SysLdapService : IDynamicApiController, ITransient
     [DisplayName("获取系统域登录配置详情")]
     public async Task<SysLdap> GetDetail([FromQuery] DetailSysLdapInput input)
     {
-        return await _sysLdapRep.GetFirstAsync(u => u.Id == input.Id);
+        return await SysLdapRep.GetFirstAsync(u => u.Id == input.Id);
     }
 
     /// <summary>
@@ -101,7 +111,7 @@ public class SysLdapService : IDynamicApiController, ITransient
     [DisplayName("获取系统域登录配置列表")]
     public async Task<List<SysLdap>> GetList()
     {
-        return await _sysLdapRep.AsQueryable().Select<SysLdap>().ToListAsync();
+        return await SysLdapRep.AsQueryable().Select<SysLdap>().ToListAsync();
     }
 
     /// <summary>
@@ -114,7 +124,7 @@ public class SysLdapService : IDynamicApiController, ITransient
     [NonAction]
     public async Task<bool> AuthAccount(long tenantId, string account, string password)
     {
-        var sysLdap = await _sysLdapRep.GetFirstAsync(u => u.TenantId == tenantId) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+        var sysLdap = await SysLdapRep.GetFirstAsync(u => u.TenantId == tenantId) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
         var ldapConn = new LdapConnection();
         try
         {
@@ -162,7 +172,7 @@ public class SysLdapService : IDynamicApiController, ITransient
     [DisplayName("同步域用户")]
     public async Task SyncUser(SyncSysLdapInput input)
     {
-        var sysLdap = await _sysLdapRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+        var sysLdap = await SysLdapRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
         var ldapConn = new LdapConnection();
         try
         {
@@ -294,7 +304,7 @@ public class SysLdapService : IDynamicApiController, ITransient
     [DisplayName("同步域组织")]
     public async Task SyncDept(SyncSysLdapInput input)
     {
-        var sysLdap = await _sysLdapRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+        var sysLdap = await SysLdapRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
         var ldapConn = new LdapConnection();
         try
         {

Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -14,7 +14,7 @@ public class SysConfigService : IDynamicApiController, ITransient
 {
     private readonly ISqlSugarClient _db;
     private readonly SysCacheService _sysCacheService;
-    private SimpleClient<SysConfig> sysConfigRep = null;
+    private SqlSugarRepository<SysConfig> sysConfigRep = null;
 
     public SysConfigService(ISqlSugarClient db,
         SysCacheService sysCacheService)
@@ -23,11 +23,11 @@ public class SysConfigService : IDynamicApiController, ITransient
         _sysCacheService = sysCacheService;
     }
 
-    public SimpleClient<SysConfig> SysConfigRep
+    public SqlSugarRepository<SysConfig> SysConfigRep
     {
         get
         {
-            sysConfigRep ??= _db.GetSimpleClient<SysConfig>();
+            sysConfigRep ??= _db.GetRepository<SqlSugarRepository<SysConfig>>();
             return sysConfigRep;
         }
     }

Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs

@@ -17,7 +17,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
     private readonly ISqlSugarClient _db;
     private readonly SysConfigService _sysConfigService;
     private readonly IHubContext<OnlineUserHub, IOnlineUserHub> _onlineUserHubContext;
-    private SimpleClient<SysOnlineUser> sysOnlineUerRep = null;
+    private SqlSugarRepository<SysOnlineUser> sysOnlineUerRep = null;
 
     public SysOnlineUserService(ISqlSugarClient db,
         SysConfigService sysConfigService,
@@ -28,11 +28,11 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
         _onlineUserHubContext = onlineUserHubContext;
     }
 
-    public SimpleClient<SysOnlineUser> SysOnlineUerRep
+    public SqlSugarRepository<SysOnlineUser> SysOnlineUerRep
     {
         get
         {
-            sysOnlineUerRep ??= _db.GetSimpleClient<SysOnlineUser>();
+            sysOnlineUerRep ??= _db.GetRepository<SqlSugarRepository<SysOnlineUser>>();
             return sysOnlineUerRep;
         }
     }

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

@@ -18,7 +18,7 @@ public class SysOrgService : IDynamicApiController, ITransient
     private readonly SysUserExtOrgService _sysUserExtOrgService;
     private readonly SysUserRoleService _sysUserRoleService;
     private readonly SysRoleOrgService _sysRoleOrgService;
-    private SimpleClient<SysOrg> sysOrgRep = null;
+    private SqlSugarRepository<SysOrg> sysOrgRep = null;
 
     public SysOrgService(UserManager userManager,
         ISqlSugarClient db,
@@ -35,11 +35,11 @@ public class SysOrgService : IDynamicApiController, ITransient
         _sysRoleOrgService = sysRoleOrgService;
     }
 
-    public SimpleClient<SysOrg> SysOrgRep
+    public SqlSugarRepository<SysOrg> SysOrgRep
     {
         get
         {
-            sysOrgRep ??= _db.GetSimpleClient<SysOrg>();
+            sysOrgRep ??= _db.GetRepository<SqlSugarRepository<SysOrg>>();
             return sysOrgRep;
         }
     }

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

@@ -12,18 +12,18 @@ namespace Admin.NET.Core.Service;
 public class SysRoleOrgService : ITransient
 {
     private readonly ISqlSugarClient _db;
-    private SimpleClient<SysRoleOrg> sysRoleOrgRep = null;
+    private SqlSugarRepository<SysRoleOrg> sysRoleOrgRep = null;
 
     public SysRoleOrgService(ISqlSugarClient db)
     {
         _db = db;
     }
 
-    public SimpleClient<SysRoleOrg> SysRoleOrgRep
+    public SqlSugarRepository<SysRoleOrg> SysRoleOrgRep
     {
         get
         {
-            sysRoleOrgRep ??= _db.GetSimpleClient<SysRoleOrg>();
+            sysRoleOrgRep ??= _db.GetRepository<SqlSugarRepository<SysRoleOrg>>();
             return sysRoleOrgRep;
         }
     }

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

@@ -12,18 +12,18 @@ namespace Admin.NET.Core.Service;
 public class SysUserExtOrgService : ITransient
 {
     private readonly ISqlSugarClient _db;
-    private SimpleClient<SysUserExtOrg> sysUserExtOrgRep = null;
+    private SqlSugarRepository<SysUserExtOrg> sysUserExtOrgRep = null;
 
     public SysUserExtOrgService(ISqlSugarClient db)
     {
         _db = db;
     }
 
-    public SimpleClient<SysUserExtOrg> SysUserExtOrgRep
+    public SqlSugarRepository<SysUserExtOrg> SysUserExtOrgRep
     {
         get
         {
-            sysUserExtOrgRep ??= _db.GetSimpleClient<SysUserExtOrg>();
+            sysUserExtOrgRep ??= _db.GetRepository<SqlSugarRepository<SysUserExtOrg>>();
             return sysUserExtOrgRep;
         }
     }

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

@@ -12,18 +12,18 @@ namespace Admin.NET.Core.Service;
 public class SysUserLdapService : ITransient
 {
     private readonly ISqlSugarClient _db;
-    private SimpleClient<SysUserLdap> sysUserLdapRep = null;
+    private SqlSugarRepository<SysUserLdap> sysUserLdapRep = null;
 
     public SysUserLdapService(ISqlSugarClient db)
     {
         _db = db;
     }
 
-    public SimpleClient<SysUserLdap> SysUserLdapRep
+    public SqlSugarRepository<SysUserLdap> SysUserLdapRep
     {
         get
         {
-            sysUserLdapRep ??= _db.GetSimpleClient<SysUserLdap>();
+            sysUserLdapRep ??= _db.GetRepository<SqlSugarRepository<SysUserLdap>>();
             return sysUserLdapRep;
         }
     }

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

@@ -13,7 +13,7 @@ public class SysUserRoleService : ITransient
 {
     private readonly ISqlSugarClient _db;
     private readonly SysCacheService _sysCacheService;
-    private SimpleClient<SysUserRole> sysUserRoleRep = null;
+    private SqlSugarRepository<SysUserRole> sysUserRoleRep = null;
 
     public SysUserRoleService(ISqlSugarClient db,
         SysCacheService sysCacheService)
@@ -22,11 +22,11 @@ public class SysUserRoleService : ITransient
         _sysCacheService = sysCacheService;
     }
 
-    public SimpleClient<SysUserRole> SysUserRoleRep
+    public SqlSugarRepository<SysUserRole> SysUserRoleRep
     {
         get
         {
-            sysUserRoleRep ??= _db.GetSimpleClient<SysUserRole>();
+            sysUserRoleRep ??= _db.GetRepository<SqlSugarRepository<SysUserRole>>();
             return sysUserRoleRep;
         }
     }

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

@@ -21,7 +21,7 @@ public class SysUserService : IDynamicApiController, ITransient
     private readonly SysOnlineUserService _sysOnlineUserService;
     private readonly SysCacheService _sysCacheService;
     private readonly SysUserLdapService _sysUserLdapService;
-    private SimpleClient<SysUser> sysUserRep = null;
+    private SqlSugarRepository<SysUser> sysUserRep = null;
 
     public SysUserService(UserManager userManager,
         ISqlSugarClient db,
@@ -44,11 +44,11 @@ public class SysUserService : IDynamicApiController, ITransient
         _sysUserLdapService = sysUserLdapService;
     }
 
-    public SimpleClient<SysUser> SysUserRep
+    public SqlSugarRepository<SysUser> SysUserRep
     {
         get
         {
-            sysUserRep ??= _db.GetSimpleClient<SysUser>();
+            sysUserRep ??= _db.GetRepository<SqlSugarRepository<SysUser>>();
             return sysUserRep;
         }
     }