瀏覽代碼

😎调整仓储延迟加载模式

zuohuaijun 1 年之前
父節點
當前提交
4136201df4

+ 2 - 4
Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs

@@ -14,19 +14,17 @@ namespace Admin.NET.Core;
 [ApiDescriptionSettings(Order = 496)]
 public class SysLdapService : IDynamicApiController, ITransient
 {
-    private readonly ISqlSugarClient _db;
     private SqlSugarRepository<SysLdap> sysLdapRep = null;
 
-    public SysLdapService(ISqlSugarClient db)
+    public SysLdapService()
     {
-        _db = db;
     }
 
     public SqlSugarRepository<SysLdap> SysLdapRep
     {
         get
         {
-            sysLdapRep ??= _db.GetRepository<SqlSugarRepository<SysLdap>>();
+            sysLdapRep ??= App.GetRequiredService<SqlSugarRepository<SysLdap>>();
             return sysLdapRep;
         }
     }

+ 2 - 5
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -12,14 +12,11 @@ namespace Admin.NET.Core.Service;
 [ApiDescriptionSettings(Order = 440)]
 public class SysConfigService : IDynamicApiController, ITransient
 {
-    private readonly ISqlSugarClient _db;
     private readonly SysCacheService _sysCacheService;
     private SqlSugarRepository<SysConfig> sysConfigRep = null;
 
-    public SysConfigService(ISqlSugarClient db,
-        SysCacheService sysCacheService)
+    public SysConfigService(SysCacheService sysCacheService)
     {
-        _db = db;
         _sysCacheService = sysCacheService;
     }
 
@@ -27,7 +24,7 @@ public class SysConfigService : IDynamicApiController, ITransient
     {
         get
         {
-            sysConfigRep ??= _db.GetRepository<SqlSugarRepository<SysConfig>>();
+            sysConfigRep ??= App.GetRequiredService<SqlSugarRepository<SysConfig>>();
             return sysConfigRep;
         }
     }

+ 2 - 5
Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs

@@ -14,16 +14,13 @@ namespace Admin.NET.Core.Service;
 [ApiDescriptionSettings(Order = 300)]
 public class SysOnlineUserService : IDynamicApiController, ITransient
 {
-    private readonly ISqlSugarClient _db;
     private readonly SysConfigService _sysConfigService;
     private readonly IHubContext<OnlineUserHub, IOnlineUserHub> _onlineUserHubContext;
     private SqlSugarRepository<SysOnlineUser> sysOnlineUerRep = null;
 
-    public SysOnlineUserService(ISqlSugarClient db,
-        SysConfigService sysConfigService,
+    public SysOnlineUserService(SysConfigService sysConfigService,
         IHubContext<OnlineUserHub, IOnlineUserHub> onlineUserHubContext)
     {
-        _db = db;
         _sysConfigService = sysConfigService;
         _onlineUserHubContext = onlineUserHubContext;
     }
@@ -32,7 +29,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
     {
         get
         {
-            sysOnlineUerRep ??= _db.GetRepository<SqlSugarRepository<SysOnlineUser>>();
+            sysOnlineUerRep ??= App.GetRequiredService<SqlSugarRepository<SysOnlineUser>>();
             return sysOnlineUerRep;
         }
     }

+ 1 - 4
Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -13,7 +13,6 @@ namespace Admin.NET.Core.Service;
 public class SysOrgService : IDynamicApiController, ITransient
 {
     private readonly UserManager _userManager;
-    private readonly ISqlSugarClient _db;
     private readonly SysCacheService _sysCacheService;
     private readonly SysUserExtOrgService _sysUserExtOrgService;
     private readonly SysUserRoleService _sysUserRoleService;
@@ -21,13 +20,11 @@ public class SysOrgService : IDynamicApiController, ITransient
     private SqlSugarRepository<SysOrg> sysOrgRep = null;
 
     public SysOrgService(UserManager userManager,
-        ISqlSugarClient db,
         SysCacheService sysCacheService,
         SysUserExtOrgService sysUserExtOrgService,
         SysUserRoleService sysUserRoleService,
         SysRoleOrgService sysRoleOrgService)
     {
-        _db = db;
         _userManager = userManager;
         _sysCacheService = sysCacheService;
         _sysUserExtOrgService = sysUserExtOrgService;
@@ -39,7 +36,7 @@ public class SysOrgService : IDynamicApiController, ITransient
     {
         get
         {
-            sysOrgRep ??= _db.GetRepository<SqlSugarRepository<SysOrg>>();
+            sysOrgRep ??= App.GetRequiredService<SqlSugarRepository<SysOrg>>();
             return sysOrgRep;
         }
     }

+ 2 - 4
Admin.NET/Admin.NET.Core/Service/Role/SysRoleOrgService.cs

@@ -11,19 +11,17 @@ namespace Admin.NET.Core.Service;
 /// </summary>
 public class SysRoleOrgService : ITransient
 {
-    private readonly ISqlSugarClient _db;
     private SqlSugarRepository<SysRoleOrg> sysRoleOrgRep = null;
 
-    public SysRoleOrgService(ISqlSugarClient db)
+    public SysRoleOrgService()
     {
-        _db = db;
     }
 
     public SqlSugarRepository<SysRoleOrg> SysRoleOrgRep
     {
         get
         {
-            sysRoleOrgRep ??= _db.GetRepository<SqlSugarRepository<SysRoleOrg>>();
+            sysRoleOrgRep ??= App.GetRequiredService<SqlSugarRepository<SysRoleOrg>>();
             return sysRoleOrgRep;
         }
     }

+ 2 - 4
Admin.NET/Admin.NET.Core/Service/User/SysUserExtOrgService.cs

@@ -11,19 +11,17 @@ namespace Admin.NET.Core.Service;
 /// </summary>
 public class SysUserExtOrgService : ITransient
 {
-    private readonly ISqlSugarClient _db;
     private SqlSugarRepository<SysUserExtOrg> sysUserExtOrgRep = null;
 
-    public SysUserExtOrgService(ISqlSugarClient db)
+    public SysUserExtOrgService()
     {
-        _db = db;
     }
 
     public SqlSugarRepository<SysUserExtOrg> SysUserExtOrgRep
     {
         get
         {
-            sysUserExtOrgRep ??= _db.GetRepository<SqlSugarRepository<SysUserExtOrg>>();
+            sysUserExtOrgRep ??= App.GetRequiredService<SqlSugarRepository<SysUserExtOrg>>();
             return sysUserExtOrgRep;
         }
     }

+ 2 - 4
Admin.NET/Admin.NET.Core/Service/User/SysUserLdapService.cs

@@ -11,19 +11,17 @@ namespace Admin.NET.Core.Service;
 /// </summary>
 public class SysUserLdapService : ITransient
 {
-    private readonly ISqlSugarClient _db;
     private SqlSugarRepository<SysUserLdap> sysUserLdapRep = null;
 
-    public SysUserLdapService(ISqlSugarClient db)
+    public SysUserLdapService()
     {
-        _db = db;
     }
 
     public SqlSugarRepository<SysUserLdap> SysUserLdapRep
     {
         get
         {
-            sysUserLdapRep ??= _db.GetRepository<SqlSugarRepository<SysUserLdap>>();
+            sysUserLdapRep ??= App.GetRequiredService<SqlSugarRepository<SysUserLdap>>();
             return sysUserLdapRep;
         }
     }

+ 2 - 5
Admin.NET/Admin.NET.Core/Service/User/SysUserRoleService.cs

@@ -11,14 +11,11 @@ namespace Admin.NET.Core.Service;
 /// </summary>
 public class SysUserRoleService : ITransient
 {
-    private readonly ISqlSugarClient _db;
     private readonly SysCacheService _sysCacheService;
     private SqlSugarRepository<SysUserRole> sysUserRoleRep = null;
 
-    public SysUserRoleService(ISqlSugarClient db,
-        SysCacheService sysCacheService)
+    public SysUserRoleService(SysCacheService sysCacheService)
     {
-        _db = db;
         _sysCacheService = sysCacheService;
     }
 
@@ -26,7 +23,7 @@ public class SysUserRoleService : ITransient
     {
         get
         {
-            sysUserRoleRep ??= _db.GetRepository<SqlSugarRepository<SysUserRole>>();
+            sysUserRoleRep ??= App.GetRequiredService<SqlSugarRepository<SysUserRole>>();
             return sysUserRoleRep;
         }
     }

+ 1 - 4
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -13,7 +13,6 @@ namespace Admin.NET.Core.Service;
 public class SysUserService : IDynamicApiController, ITransient
 {
     private readonly UserManager _userManager;
-    private readonly ISqlSugarClient _db;
     private readonly SysOrgService _sysOrgService;
     private readonly SysUserExtOrgService _sysUserExtOrgService;
     private readonly SysUserRoleService _sysUserRoleService;
@@ -24,7 +23,6 @@ public class SysUserService : IDynamicApiController, ITransient
     private SqlSugarRepository<SysUser> sysUserRep = null;
 
     public SysUserService(UserManager userManager,
-        ISqlSugarClient db,
         SysOrgService sysOrgService,
         SysUserExtOrgService sysUserExtOrgService,
         SysUserRoleService sysUserRoleService,
@@ -34,7 +32,6 @@ public class SysUserService : IDynamicApiController, ITransient
         SysUserLdapService sysUserLdapService)
     {
         _userManager = userManager;
-        _db = db;
         _sysOrgService = sysOrgService;
         _sysUserExtOrgService = sysUserExtOrgService;
         _sysUserRoleService = sysUserRoleService;
@@ -48,7 +45,7 @@ public class SysUserService : IDynamicApiController, ITransient
     {
         get
         {
-            sysUserRep ??= _db.GetRepository<SqlSugarRepository<SysUser>>();
+            sysUserRep ??= App.GetRequiredService<SqlSugarRepository<SysUser>>();
             return sysUserRep;
         }
     }