重新整理仓储

src/platform/ZhonTai.Admin/Core/Db/FreeSqlCloudExtesions.cs

@@ -9,6 +9,7 @@ using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Core.Consts;
+using ZhonTai.Admin.Core.Db.Transaction;
 
 namespace ZhonTai.Admin.Core.Db;
 
@@ -142,8 +143,8 @@ public static class FreeSqlCloudExtesions
         if (!exists)
         {
             var dbConfig = serviceProvider.GetRequiredService<DbConfig>();
-            var masterDb = cloud.Use(DbKeys.MasterDbKey);
-            var tenant = masterDb.Select<TenantEntity>().DisableGlobalFilter("Tenant").WhereDynamic(tenantId).ToOne<CreateFreeSqlTenantDto>();
+            var uowm = serviceProvider.GetRequiredService<UnitOfWorkManagerCloud>();
+            var tenant = uowm.GetUnitOfWorkManager(DbKeys.MasterDbKey).Orm.Select<TenantEntity>().DisableGlobalFilter("Tenant").WhereDynamic(tenantId).ToOne<CreateFreeSqlTenantDto>();
             //var timeSpan = tenant.IdleTime.HasValue && tenant.IdleTime.Value > 0 ? TimeSpan.FromMinutes(tenant.IdleTime.Value) : TimeSpan.MaxValue;
             cloud.Register(tenantName, () => CreateFreeSql(user, appConfig, dbConfig, tenant));
         }

src/platform/ZhonTai.Admin/Core/Repositories/FreeSqlRepositoryExtensions.cs → src/platform/ZhonTai.Admin/Core/Db/FreeSqlDbContextExtensions.cs

@@ -1,7 +1,8 @@
 using System;
+using ZhonTai.Admin.Core.Repositories;
 using System.Linq.Expressions;
 
-namespace ZhonTai.Admin.Core.Repositories;
+namespace ZhonTai.Admin.Core.Db;
 
 public static class FreeSqlDbContextExtensions
 {
@@ -13,9 +14,9 @@ public static class FreeSqlDbContextExtensions
     /// <param name="that"></param>
     /// <param name="filter">数据过滤 + 验证</param>
     /// <returns></returns>
-    public static IRepositoryBase<TEntity, TKey> GetRepositoryBase<TEntity, TKey>(this IFreeSql that, Expression<Func<TEntity, bool>> filter = null) where TEntity : class, new()
+    public static IRepositoryBase<TEntity, TKey> GetRepositoryBase<TEntity, TKey>(this IFreeSql that, Expression<Func<TEntity, bool>> filter = null) where TEntity : class
     {
-        return new DefaultRepositoryBase<TEntity, TKey>(that, filter);
+        return new RepositoryBase<TEntity, TKey>(that, filter);
     }
 
     /// <summary>
@@ -25,8 +26,8 @@ public static class FreeSqlDbContextExtensions
     /// <param name="that"></param>
     /// <param name="filter">数据过滤 + 验证</param>
     /// <returns></returns>
-    public static IRepositoryBase<TEntity, long> GetRepositoryBase<TEntity>(this IFreeSql that, Expression<Func<TEntity, bool>> filter = null) where TEntity : class, new()
+    public static IRepositoryBase<TEntity, long> GetRepositoryBase<TEntity>(this IFreeSql that, Expression<Func<TEntity, bool>> filter = null) where TEntity : class
     {
-        return new DefaultRepositoryBase<TEntity, long>(that, filter);
+        return new RepositoryBase<TEntity, long>(that, filter);
     }
 }

src/platform/ZhonTai.Admin/Core/Repositories/DefaultRepositoryBase.cs

@@ -1,27 +0,0 @@
-using FreeSql;
-using System;
-using System.Linq.Expressions;
-using ZhonTai.Admin.Core.Consts;
-using ZhonTai.Admin.Core.Db.Transaction;
-
-namespace ZhonTai.Admin.Core.Repositories;
-
-public class DefaultRepositoryBase<TEntity, TKey> : RepositoryBase<TEntity, TKey> where TEntity : class
-{
-    public DefaultRepositoryBase(IFreeSql fsql) : base(fsql, null, null) { }
-    public DefaultRepositoryBase(IFreeSql fsql, Expression<Func<TEntity, bool>> filter) : base(fsql, filter, null) { }
-    public DefaultRepositoryBase(IFreeSql fsql, UnitOfWorkManager uowManger) : base(uowManger?.Orm ?? fsql, null, null)
-    {
-        uowManger?.Binding(this);
-    }
-}
-
-public class RepositoryCloud<T> : DefaultRepositoryBase<T, long> where T : class
-{
-    public RepositoryCloud(UnitOfWorkManagerCloud uowm) : this(DbKeys.MasterDbKey, uowm) { }
-    public RepositoryCloud(string db, UnitOfWorkManagerCloud uowm) : this(uowm.GetUnitOfWorkManager(db)) { }
-    RepositoryCloud(UnitOfWorkManager uowm) : base(uowm.Orm, uowm)
-    {
-        uowm.Binding(this);
-    }
-}

src/platform/ZhonTai.Admin/Core/Repositories/RepositoryBase.cs

@@ -8,14 +8,21 @@ using ZhonTai.Admin.Core.Db.Transaction;
 
 namespace ZhonTai.Admin.Core.Repositories
 {
-    public class RepositoryBase<TEntity, TKey> : BaseRepository<TEntity, TKey>, IRepositoryBase<TEntity, TKey> where TEntity : class
+    public class RepositoryBase<TEntity, TKey> : DefaultRepository<TEntity, TKey>, IRepositoryBase<TEntity, TKey> where TEntity : class
     {
         public IUser User { get; set; }
 
-        public RepositoryBase(IFreeSql freeSql) : base(freeSql, null, null)
+        public RepositoryBase(IFreeSql fsql) : base(fsql) { }
+        public RepositoryBase(IFreeSql fsql, Expression<Func<TEntity, bool>> filter) : base(fsql, filter) { }
+        public RepositoryBase(IFreeSql fsql, UnitOfWorkManager uowManger) : base(uowManger?.Orm ?? fsql)
         {
+            uowManger?.Binding(this);
         }
-        public RepositoryBase(IFreeSql fsql, Expression<Func<TEntity, bool>> filter, Func<string, string> asTable = null) : base(fsql, filter, asTable) { }
+
+        //public RepositoryBase(IFreeSql freeSql) : base(freeSql, null, null)
+        //{
+        //}
+        //public RepositoryBase(IFreeSql fsql, Expression<Func<TEntity, bool>> filter, Func<string, string> asTable = null) : base(fsql, filter, asTable) { }
 
         public virtual Task<TDto> GetAsync<TDto>(TKey id)
         {

src/platform/ZhonTai.Admin/Domain/Org/OrgEntity.cs

@@ -2,6 +2,7 @@
 using FreeSql.DataAnnotations;
 using System.Collections.Generic;
 using ZhonTai.Admin.Domain.Staff;
+using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Domain.Org;
 
@@ -65,6 +66,9 @@ public partial class OrgEntity : EntityFull, ITenant
     [Navigate(ManyToMany = typeof(UserOrgEntity))]
     public ICollection<StaffEntity> Staffs { get; set; }
 
+    [Navigate(ManyToMany = typeof(UserOrgEntity))]
+    public ICollection<UserEntity> Users { get; set; }
+
     [Navigate(nameof(ParentId))]
     public List<OrgEntity> Childs { get; set; }
 }

src/platform/ZhonTai.Admin/Repositories/Api/ApiRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Api;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class ApiRepository : RepositoryCloud<ApiEntity>, IApiRepository
+public class ApiRepository : RepositoryBase<ApiEntity>, IApiRepository
 {
     public ApiRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/Dictionary/DictionaryRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Dictionary;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class DictionaryRepository : RepositoryCloud<DictionaryEntity>, IDictionaryRepository
+public class DictionaryRepository : RepositoryBase<DictionaryEntity>, IDictionaryRepository
 {
     public DictionaryRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/DictionaryType/DictionaryTypeRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.DictionaryType;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class DictionaryTypeRepository : RepositoryCloud<DictionaryTypeEntity>, IDictionaryTypeRepository
+public class DictionaryTypeRepository : RepositoryBase<DictionaryTypeEntity>, IDictionaryTypeRepository
 {
     public DictionaryTypeRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/Document/DocumentRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Document;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class DocumentRepository : RepositoryCloud<DocumentEntity>, IDocumentRepository
+public class DocumentRepository : RepositoryBase<DocumentEntity>, IDocumentRepository
 {
     public DocumentRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/DocumentImage/DocumentImageRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.DocumentImage;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class DocumentImageRepository : RepositoryCloud<DocumentImageEntity>, IDocumentImageRepository
+public class DocumentImageRepository : RepositoryBase<DocumentImageEntity>, IDocumentImageRepository
 {
     public DocumentImageRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/LoginLog/LoginLogRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.LoginLog;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class LoginLogRepository : RepositoryCloud<LoginLogEntity>, ILoginLogRepository
+public class LoginLogRepository : RepositoryBase<LoginLogEntity>, ILoginLogRepository
 {
     public LoginLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/OprationLog/OprationLogRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.OprationLog;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class OprationLogRepository : RepositoryCloud<OprationLogEntity>, IOprationLogRepository
+public class OprationLogRepository : RepositoryBase<OprationLogEntity>, IOprationLogRepository
 {
     public OprationLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/Org/OrgRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Org;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class OrgRepository : RepositoryCloud<OrgEntity>, IOrgRepository
+public class OrgRepository : RepositoryBase<OrgEntity>, IOrgRepository
 {
     public OrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/Permission/PermissionRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Permission;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class PermissionRepository : RepositoryCloud<PermissionEntity>, IPermissionRepository
+public class PermissionRepository : RepositoryBase<PermissionEntity>, IPermissionRepository
 {
     public PermissionRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/Role/RoleRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Role;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class RoleRepository : RepositoryCloud<RoleEntity>, IRoleRepository
+public class RoleRepository : RepositoryBase<RoleEntity>, IRoleRepository
 {
     public RoleRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/Staff/StaffRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Staff;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class StaffRepository : RepositoryCloud<StaffEntity>, IStaffRepository
+public class StaffRepository : RepositoryBase<StaffEntity>, IStaffRepository
 {
     public StaffRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {

src/platform/ZhonTai.Admin/Repositories/Tenant/TenantRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.Tenant;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class TenantRepository : RepositoryCloud<TenantEntity>, ITenantRepository
+public class TenantRepository : RepositoryBase<TenantEntity>, ITenantRepository
 {
     public TenantRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     {

src/platform/ZhonTai.Admin/Repositories/User/UserRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class UserRepository : RepositoryCloud<UserEntity>, IUserRepository
+public class UserRepository : RepositoryBase<UserEntity>, IUserRepository
 {
     public UserRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     {

src/platform/ZhonTai.Admin/Repositories/View/ViewRepositoryRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.View;
 
 namespace ZhonTai.Admin.Repositories;
 
-public class ViewRepository : RepositoryCloud<ViewEntity>, IViewRepository
+public class ViewRepository : RepositoryBase<ViewEntity>, IViewRepository
 {
     public ViewRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     {

src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs

@@ -445,8 +445,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
         if (_appConfig.Tenant && User.TenantType == TenantType.Tenant)
         {
             var cloud = ServiceProvider.GetRequiredService<FreeSqlCloud>();
-            var tenantPermissionIds = await cloud.Use(DbKeys.MasterDbKey).GetRepositoryBase<TenantPermissionEntity>()
-                .Select.Where(d => d.TenantId == User.TenantId).ToListAsync(m => m.PermissionId);
+            var tenantPermissionIds = await cloud.Use(DbKeys.MasterDbKey).Select<TenantPermissionEntity>().Where(d => d.TenantId == User.TenantId).ToListAsync(m => m.PermissionId);
             insertPermissionIds = insertPermissionIds.Where(d => tenantPermissionIds.Contains(d));
         }
 

src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs

@@ -19,6 +19,10 @@ using ZhonTai.Admin.Core.Configs;
 using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Domain.Staff;
 using ZhonTai.Admin.Domain;
+using FreeSql;
+using Microsoft.Extensions.DependencyInjection;
+using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db.Transaction;
 
 namespace ZhonTai.Admin.Services.Tenant;
 
@@ -36,7 +40,6 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     private IOrgRepository _orgRepository => LazyGetRequiredService<IOrgRepository>();
     private IStaffRepository _staffRepository => LazyGetRequiredService<IStaffRepository>();
     private IRepositoryBase<UserOrgEntity> _userOrgRepository => LazyGetRequiredService<IRepositoryBase<UserOrgEntity>>();
-
     private AppConfig _appConfig => LazyGetRequiredService<AppConfig>();
 
     public TenantService(
@@ -111,9 +114,13 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         }
 
         //添加租户
-        var entity = Mapper.Map<TenantEntity>(input);
-        var tenant = await _tenantRepository.InsertAsync(entity);
-        var tenantId = tenant.Id;
+        TenantEntity entity = Mapper.Map<TenantEntity>(input);
+        TenantEntity tenant = await _tenantRepository.InsertAsync(entity);
+        long tenantId = tenant.Id;
+
+        var freeSqlCloud = LazyGetRequiredService<FreeSqlCloud>();
+        freeSqlCloud.GetTenantDb(ServiceProvider, tenantId);
+        freeSqlCloud.Change(DbKeys.TenantDbKey + tenantId);
 
         //添加部门
         var org = new OrgEntity
@@ -127,7 +134,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         await _orgRepository.InsertAsync(org);
 
         //添加主管理员
-        var pwd = MD5Encrypt.Encrypt32(_appConfig.DefaultPassword);
+        string pwd = MD5Encrypt.Encrypt32(_appConfig.DefaultPassword);
         var user = new UserEntity
         {
             TenantId = tenantId,
@@ -140,7 +147,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         };
         await _userRepository.InsertAsync(user);
 
-        var userId = user.Id;
+        long userId = user.Id;
 
         //添加员工
         var emp = new StaffEntity

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -794,6 +794,25 @@
             <param name="tenantId"></param>
             <returns></returns>
         </member>
+        <member name="M:ZhonTai.Admin.Core.Db.FreeSqlDbContextExtensions.GetRepositoryBase``2(IFreeSql,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
+            <summary>
+            返回默认仓库类
+            </summary>
+            <typeparam name="TEntity"></typeparam>
+            <typeparam name="TKey"></typeparam>
+            <param name="that"></param>
+            <param name="filter">数据过滤 + 验证</param>
+            <returns></returns>
+        </member>
+        <member name="M:ZhonTai.Admin.Core.Db.FreeSqlDbContextExtensions.GetRepositoryBase``1(IFreeSql,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
+            <summary>
+            返回默认仓库类，适用联合主键的仓储类
+            </summary>
+            <typeparam name="TEntity"></typeparam>
+            <param name="that"></param>
+            <param name="filter">数据过滤 + 验证</param>
+            <returns></returns>
+        </member>
         <member name="M:ZhonTai.Admin.Core.Db.Transaction.TransactionAsyncInterceptor.InterceptSynchronous(Castle.DynamicProxy.IInvocation)">
             <summary>
             拦截同步执行的方法
@@ -1340,25 +1359,6 @@
             </summary>
             <param name="appConfig">AppConfig</param>
         </member>
-        <member name="M:ZhonTai.Admin.Core.Repositories.FreeSqlDbContextExtensions.GetRepositoryBase``2(IFreeSql,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
-            <summary>
-            返回默认仓库类
-            </summary>
-            <typeparam name="TEntity"></typeparam>
-            <typeparam name="TKey"></typeparam>
-            <param name="that"></param>
-            <param name="filter">数据过滤 + 验证</param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Core.Repositories.FreeSqlDbContextExtensions.GetRepositoryBase``1(IFreeSql,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
-            <summary>
-            返回默认仓库类，适用联合主键的仓储类
-            </summary>
-            <typeparam name="TEntity"></typeparam>
-            <param name="that"></param>
-            <param name="filter">数据过滤 + 验证</param>
-            <returns></returns>
-        </member>
         <member name="M:ZhonTai.Admin.Core.Repositories.IRepositoryBase`2.GetAsync``1(`1)">
             <summary>
             获得Dto
@@ -2384,11 +2384,6 @@
             授权用户
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Tenant.TenantEntity.RoleId">
-            <summary>
-            授权角色
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.Tenant.TenantEntity.TenantType">
             <summary>
             租户类型
@@ -4965,14 +4960,14 @@
             添加
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Tenant.Dto.TenantAddInput.Code">
+        <member name="P:ZhonTai.Admin.Services.Tenant.Dto.TenantAddInput.Name">
             <summary>
-            编码
+            企业名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Tenant.Dto.TenantAddInput.Name">
+        <member name="P:ZhonTai.Admin.Services.Tenant.Dto.TenantAddInput.Code">
             <summary>
-            企业名称
+            编码
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.Tenant.Dto.TenantAddInput.RealName">