实现多租户功能

samples/web/Liuliu.Demo.Core/Identity/RoleSeedDataInitializer.cs

@@ -44,7 +44,8 @@ protected override Role[] SeedData(IServiceProvider provider)
         {
             return new[]
             {
-                new Role() { Name = "系统管理员", Remark = "系统最高权限管理角色", IsAdmin = true, IsSystem = true }
+                new Role() { Name = "系统管理员", Remark = "系统最高权限管理角色", IsAdmin = true, IsSystem = true },
+                new Role() { Name = "租户管理员", Remark = "租户管理员", IsAdmin = true, IsSystem = true }
             };
         }
 

samples/web/Liuliu.Demo.EntityConfiguration/Authorization/EntityRoleConfiguration.cs

@@ -29,7 +29,7 @@ public partial class EntityRoleConfiguration : EntityTypeConfigurationBase<Entit
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<EntityRole> builder)
         {
-            builder.HasIndex(m => new { m.EntityId, m.RoleId, m.Operation }).HasName("EntityRoleIndex").IsUnique();
+            builder.HasIndex(m => new { m.EntityId, m.RoleId, m.Operation }).HasDatabaseName("EntityRoleIndex").IsUnique();
 
             builder.HasOne<EntityInfo>(er => er.EntityInfo).WithMany().HasForeignKey(m => m.EntityId);
             builder.HasOne<Role>(er => er.Role).WithMany().HasForeignKey(m => m.RoleId);

samples/web/Liuliu.Demo.EntityConfiguration/Authorization/EntityUserConfiguration.cs

@@ -29,7 +29,7 @@ public partial class EntityUserConfiguration : EntityTypeConfigurationBase<Entit
         /// <param name="builder">ʵÌåÀàÐÍ´´½¨Æ÷</param>
         public override void Configure(EntityTypeBuilder<EntityUser> builder)
         {
-            builder.HasIndex(m => new { m.EntityId, m.UserId }).HasName("EntityUserIndex");
+            builder.HasIndex(m => new { m.EntityId, m.UserId }).HasDatabaseName("EntityUserIndex");
 
             builder.HasOne<EntityInfo>(eu => eu.EntityInfo).WithMany().HasForeignKey(m => m.EntityId);
             builder.HasOne<User>(eu => eu.User).WithMany().HasForeignKey(m => m.UserId);

samples/web/Liuliu.Demo.EntityConfiguration/Authorization/ModuleFunctionConfiguration.cs

@@ -31,7 +31,7 @@ public partial class ModuleFunctionConfiguration : EntityTypeConfigurationBase<M
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<ModuleFunction> builder)
         {
-            builder.HasIndex(m => new { m.ModuleId, m.FunctionId }).HasName("ModuleFunctionIndex").IsUnique();
+            builder.HasIndex(m => new { m.ModuleId, m.FunctionId }).HasDatabaseName("ModuleFunctionIndex").IsUnique();
 
             builder.HasOne<Module>(mf => mf.Module).WithMany().HasForeignKey(m => m.ModuleId);
             builder.HasOne<Function>(mf => mf.Function).WithMany().HasForeignKey(m => m.FunctionId);

samples/web/Liuliu.Demo.EntityConfiguration/Authorization/ModuleRoleConfiguration.cs

@@ -31,7 +31,7 @@ public partial class ModuleRoleConfiguration : EntityTypeConfigurationBase<Modul
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<ModuleRole> builder)
         {
-            builder.HasIndex(m => new { m.ModuleId, m.RoleId }).HasName("ModuleRoleIndex").IsUnique();
+            builder.HasIndex(m => new { m.ModuleId, m.RoleId }).HasDatabaseName("ModuleRoleIndex").IsUnique();
 
             builder.HasOne<Module>(mr => mr.Module).WithMany().HasForeignKey(m => m.ModuleId);
             builder.HasOne<Role>(mr => mr.Role).WithMany().HasForeignKey(m => m.RoleId);

samples/web/Liuliu.Demo.EntityConfiguration/Authorization/ModuleUserConfiguration.cs

@@ -31,7 +31,7 @@ public partial class ModuleUserConfiguration : EntityTypeConfigurationBase<Modul
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<ModuleUser> builder)
         {
-            builder.HasIndex(m => new { m.ModuleId, m.UserId }).HasName("ModuleUserIndex").IsUnique();
+            builder.HasIndex(m => new { m.ModuleId, m.UserId }).HasDatabaseName("ModuleUserIndex").IsUnique();
 
             builder.HasOne<Module>(mu => mu.Module).WithMany().HasForeignKey(m => m.ModuleId);
             builder.HasOne<User>(mu => mu.User).WithMany().HasForeignKey(m => m.UserId);

samples/web/Liuliu.Demo.EntityConfiguration/Identity/RoleConfiguration.cs

@@ -25,7 +25,7 @@ public partial class RoleConfiguration : EntityTypeConfigurationBase<Role, int>
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<Role> builder)
         {
-            builder.HasIndex(m => new { m.NormalizedName, m.DeletedTime }).HasName("RoleNameIndex").IsUnique();
+            builder.HasIndex(m => new { m.NormalizedName, m.DeletedTime }).HasDatabaseName("RoleNameIndex").IsUnique();
 
             builder.Property(m => m.ConcurrencyStamp).IsConcurrencyToken();
 

samples/web/Liuliu.Demo.EntityConfiguration/Identity/UserConfiguration.cs

@@ -25,8 +25,8 @@ public partial class UserConfiguration : EntityTypeConfigurationBase<User, int>
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<User> builder)
         {
-            builder.HasIndex(m => new { m.NormalizedUserName, m.DeletedTime }).HasName("UserNameIndex").IsUnique();
-            builder.HasIndex(m => new { m.NormalizeEmail, m.DeletedTime }).HasName("EmailIndex");
+            builder.HasIndex(m => new { m.NormalizedUserName, m.DeletedTime }).HasDatabaseName("UserNameIndex").IsUnique();
+            builder.HasIndex(m => new { m.NormalizeEmail, m.DeletedTime }).HasDatabaseName("EmailIndex");
 
             builder.Property(m => m.ConcurrencyStamp).IsConcurrencyToken();
 

samples/web/Liuliu.Demo.EntityConfiguration/Identity/UserLoginConfiguration.cs

@@ -27,7 +27,7 @@ public partial class UserLoginConfiguration : EntityTypeConfigurationBase<UserLo
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<UserLogin> builder)
         {
-            builder.HasIndex(m => new { m.LoginProvider, m.ProviderKey }).HasName("UserLoginIndex").IsUnique();
+            builder.HasIndex(m => new { m.LoginProvider, m.ProviderKey }).HasDatabaseName("UserLoginIndex").IsUnique();
             builder.HasOne(ul => ul.User).WithMany(u => u.UserLogins).HasForeignKey(ul => ul.UserId).IsRequired();
 
             EntityConfigurationAppend(builder);

samples/web/Liuliu.Demo.EntityConfiguration/Identity/UserRoleConfiguration.cs

@@ -27,7 +27,7 @@ public partial class UserRoleConfiguration : EntityTypeConfigurationBase<UserRol
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<UserRole> builder)
         {
-            builder.HasIndex(m => new { m.UserId, m.RoleId, m.DeletedTime }).HasName("UserRoleIndex").IsUnique();
+            builder.HasIndex(m => new { m.UserId, m.RoleId, m.DeletedTime }).HasDatabaseName("UserRoleIndex").IsUnique();
             builder.HasOne(ur => ur.Role).WithMany(r => r.UserRoles).HasForeignKey(m => m.RoleId);
             builder.HasOne(ur => ur.User).WithMany(u => u.UserRoles).HasForeignKey(m => m.UserId);
 

samples/web/Liuliu.Demo.EntityConfiguration/Identity/UserTokenConfiguration.cs

@@ -27,7 +27,7 @@ public partial class UserTokenConfiguration : EntityTypeConfigurationBase<UserTo
         /// <param name="builder">实体类型创建器</param>
         public override void Configure(EntityTypeBuilder<UserToken> builder)
         {
-            builder.HasIndex(m => new { m.UserId, m.LoginProvider, m.Name }).HasName("UserTokenIndex").IsUnique();
+            builder.HasIndex(m => new { m.UserId, m.LoginProvider, m.Name }).HasDatabaseName("UserTokenIndex").IsUnique();
             builder.HasOne(ut => ut.User).WithMany(u => u.UserTokens).HasForeignKey(ut => ut.UserId).IsRequired();
 
             EntityConfigurationAppend(builder);

samples/web/Liuliu.Demo.EntityConfiguration/TenantEntityConfiguration.cs

@@ -0,0 +1,73 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using OSharp.Entity;
+using OSharp.MultiTenancy;
+using System;
+
+namespace Liuliu.Demo.EntityConfiguration
+{
+    /// <summary>
+    /// 租户实体类型配置
+    /// </summary>
+    public partial class TenantEntityConfiguration : EntityTypeConfigurationBase<TenantEntity, Guid>
+    {
+        public override Type DbContextType { get; } = typeof(TenantDbContext);
+
+        /// <summary>
+        /// 重写以实现实体类型各个属性的数据库配置
+        /// </summary>
+        /// <param name="builder">实体类型构建器</param>
+        public override void Configure(EntityTypeBuilder<TenantEntity> builder)
+        {
+            // 配置表名
+            builder.ToTable("Tenants");
+
+            // 配置属性
+            builder.Property(m => m.TenantId)
+                .IsRequired()
+                .HasMaxLength(50)
+                .HasComment("租户ID");
+
+            builder.Property(m => m.Name)
+                .IsRequired()
+                .HasMaxLength(100)
+                .HasComment("租户名称");
+
+            builder.Property(m => m.Host)
+                .IsRequired()
+                .HasMaxLength(100)
+                .HasComment("租户主机");
+
+            builder.Property(m => m.ConnectionString)
+                .HasMaxLength(1000)
+                .HasComment("连接字符串");
+
+            builder.Property(m => m.IsEnabled)
+                .IsRequired()
+                .HasDefaultValue(true)
+                .HasComment("是否启用");
+
+            builder.Property(m => m.CreatedTime)
+                .IsRequired()
+                .HasComment("创建时间");
+
+            builder.Property(m => m.UpdatedTime)
+                .HasComment("更新时间");
+
+            // 配置索引
+            builder.HasIndex(m => m.TenantId)
+                .IsUnique()
+                .HasDatabaseName("IX_Tenants_TenantId");
+
+            builder.HasIndex(m => m.Host)
+                .HasDatabaseName("IX_Tenants_Host");
+
+            EntityConfigurationAppend(builder);
+        }
+
+        /// <summary>
+        /// 额外的数据映射
+        /// </summary>
+        partial void EntityConfigurationAppend(EntityTypeBuilder<TenantEntity> builder);
+    }
+} 

samples/web/Liuliu.Demo.Web/App_Data/tenants.json

@@ -0,0 +1,23 @@
+[
+  {
+    "tenantId": "tenant0",
+    "name": "租户0",
+    "host": "localhost",
+    "connectionString": "Server=(localdb)\\mssqllocaldb;Database=Tenant0Db;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "isEnabled": true
+  },
+  {
+    "tenantId": "tenant1",
+    "name": "租户1",
+    "host": "tenant1",
+    "connectionString": "Server=(localdb)\\mssqllocaldb;Database=Tenant1Db;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "isEnabled": true
+  },
+  {
+    "tenantId": "tenant2",
+    "name": "租户2",
+    "host": "tenant2",
+    "connectionString": "Server=(localdb)\\mssqllocaldb;Database=Tenant2Db;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "isEnabled": true
+  }
+]

samples/web/Liuliu.Demo.Web/Controllers/TenantController.cs

@@ -0,0 +1,96 @@
+using Microsoft.AspNetCore.Mvc;
+using OSharp.MultiTenancy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Liuliu.Demo.Web.Controllers
+{
+    [ApiController]
+    [Route("api/[controller]")]
+    public class TenantController : ControllerBase
+    {
+        private readonly ITenantAccessor _tenantAccessor;
+        private readonly ITenantStore _tenantStore;
+        private readonly ILogger<TenantController> _logger;
+
+        public TenantController(
+            ITenantAccessor tenantAccessor,
+            ITenantStore tenantStore,
+            ILogger<TenantController> logger)
+        {
+            _tenantAccessor = tenantAccessor;
+            _tenantStore = tenantStore;
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// 获取当前租户信息
+        /// </summary>
+        [HttpGet("current")]
+        public IActionResult GetCurrentTenant()
+        {
+            var tenant = _tenantAccessor.CurrentTenant;
+            if (tenant == null)
+            {
+                return NotFound(new { message = "未找到当前租户信息" });
+            }
+
+            return Ok(new
+            {
+                tenant.TenantId,
+                tenant.Name,
+                tenant.Host,
+                tenant.IsEnabled
+            });
+        }
+
+        /// <summary>
+        /// 获取所有租户信息
+        /// </summary>
+        [HttpGet]
+        public async Task<IActionResult> GetAllTenants()
+        {
+            var tenants = await _tenantStore.GetAllTenantsAsync();
+            return Ok(tenants.Select(t => new
+            {
+                t.TenantId,
+                t.Name,
+                t.Host,
+                t.IsEnabled
+            }));
+        }
+
+        /// <summary>
+        /// 设置Cookie租户
+        /// </summary>
+        [HttpGet("set-cookie/{tenantId}")]
+        public IActionResult SetCookieTenant(string tenantId)
+        {
+            if (string.IsNullOrEmpty(tenantId))
+            {
+                return BadRequest(new { message = "租户ID不能为空" });
+            }
+
+            // 设置租户Cookie
+            Response.Cookies.Append("tenant", tenantId, new CookieOptions
+            {
+                Expires = DateTimeOffset.Now.AddDays(7),
+                Path = "/"
+            });
+
+            return Ok(new { message = $"已设置租户Cookie: {tenantId}" });
+        }
+
+        /// <summary>
+        /// 清除Cookie租户
+        /// </summary>
+        [HttpGet("clear-cookie")]
+        public IActionResult ClearCookieTenant()
+        {
+            Response.Cookies.Delete("tenant");
+            return Ok(new { message = "已清除租户Cookie" });
+        }
+    }
+}