🎨 refactor(multi-tenancy): 重构多租户体系

- 优化了租户解析逻辑，支持更多种类型的租户标识
- 重构了租户配置存储接口，增加了获取所有租户列表的方法
- 改进了租户配置提供程序，支持异步获取租户配置
- 优化了当前租户访问器，支持可空类型
- 重构了租户解析上下文和解析结果访问器，支持可空类型
- 优化了多语言配置，为多租户支持做好准备

Author: jianxuanbing

framework/src/Bing.AspNetCore.MultiTenancy/Bing/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs

@@ -9,13 +9,18 @@ namespace Bing.AspNetCore.MultiTenancy;
 /// </summary>
 public class DomainTenantResolveContributor : HttpTenantResolveContributorBase
 {
+    /// <summary>
+    /// 域名格式字符串
+    /// </summary>
+    private readonly string _domainFormat;
+
     /// <summary>
     /// 初始化一个<see cref="DomainTenantResolveContributor"/>类型的实例
     /// </summary>
     /// <param name="domainFormat">域名格式字符串。范例：{0}.a.com</param>
     public DomainTenantResolveContributor(string domainFormat)
     {
-        DomainFormat = domainFormat;
+        _domainFormat = DomainTenantResolverHelper.RemoveDomainPrefix(domainFormat);
     }
 
     /// <summary>
@@ -31,7 +36,7 @@ public DomainTenantResolveContributor(string domainFormat)
     /// <summary>
     /// 域名格式字符串
     /// </summary>
-    public string DomainFormat { get; }
+    public string DomainFormat => _domainFormat;
 
     /// <summary>
     /// 从 <see cref="HttpContext"/> 中获取租户标识、租户名称、null

framework/src/Bing.AspNetCore.MultiTenancy/Bing/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs

@@ -82,7 +82,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next)
                 {
                     BingMultiTenancyCookieHelper.SetTenantCookie(context, _currentTenant.Id, _options.TenantKey);
                 }
-
+                // TODO: 设置国际化
                 await next(context);
             }
         }

framework/src/Bing.AspNetCore.MultiTenancy/Bing/MultiTenancy/BingTenantResolveOptionsExtensions.cs

@@ -0,0 +1,22 @@
+using Bing.AspNetCore.MultiTenancy;
+using Bing.Collections;
+
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 租户解析选项配置(<see cref="BingTenantResolveOptions" />) 扩展
+/// </summary>
+public static class BingTenantResolveOptionsExtensions
+{
+    /// <summary>
+    /// 添加基于域名的租户解析器，在当前用户租户解析器之后插入。
+    /// </summary>
+    /// <param name="options">用户解析选项</param>
+    /// <param name="domainFormat">用于解析租户的域名格式</param>
+    public static void AddDomainTenantResolver(this BingTenantResolveOptions options, string domainFormat)
+    {
+        options.TenantResolvers.InsertAfter(
+            r => r is CurrentUserTenantResolveContributor,
+            new DomainTenantResolveContributor(domainFormat));
+    }
+}

framework/src/Bing.MultiTenancy.Abstractions/Bing.MultiTenancy.Abstractions.csproj

@@ -7,6 +7,10 @@
 
   <Import Project="..\..\..\framework.props" />
 
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Bing.Core\Bing.Core.csproj" />
     <ProjectReference Include="..\Bing.Data\Bing.Data.csproj" />

framework/src/Bing.MultiTenancy.Abstractions/Bing/MultiTenancy/BasicTenantInfo.cs

@@ -8,19 +8,19 @@ public class BasicTenantInfo
     /// <summary>
     /// 租户标识
     /// </summary>
-    public string TenantId { get; set; }
+    public string? TenantId { get; }
 
     /// <summary>
     /// 租户名称
     /// </summary>
-    public string Name { get; set; }
+    public string? Name { get; }
 
     /// <summary>
     /// 初始化一个<see cref="BasicTenantInfo"/>类型的实例
     /// </summary>
     /// <param name="tenantId">租户ID</param>
     /// <param name="name">租户名称</param>
-    public BasicTenantInfo(string tenantId, string name = null)
+    public BasicTenantInfo(string? tenantId, string? name = null)
     {
         TenantId = tenantId;
         Name = name;

framework/src/Bing.MultiTenancy.Abstractions/Bing/MultiTenancy/BingTenantResolveOptions.cs

@@ -1,7 +1,7 @@
 namespace Bing.MultiTenancy;
 
 /// <summary>
-/// 租户解析器选项配置
+/// 租户解析选项
 /// </summary>
 public class BingTenantResolveOptions
 {

framework/src/Bing.MultiTenancy.Abstractions/Bing/MultiTenancy/CurrentTenantExtensions.cs

@@ -0,0 +1,40 @@
+using Bing.Helpers;
+
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 当前租户(<see cref="ICurrentTenant"/>) 扩展
+/// </summary>
+public static class CurrentTenantExtensions
+{
+    /// <summary>
+    /// 获取当前租户的 ID，并转换为 <see cref="Guid"/> 类型。
+    /// </summary>
+    /// <param name="currentTenant">当前租户信息。</param>
+    /// <returns>返回租户的 <see cref="Guid"/> ID。</returns>
+    /// <exception cref="ArgumentNullException">如果 <paramref name="currentTenant"/> 为空，则抛出此异常。</exception>
+    /// <exception cref="ArgumentException">如果租户 ID 为空或无效，则抛出此异常。</exception>
+    public static Guid GetId(this ICurrentTenant currentTenant)
+    {
+        Check.NotNull(currentTenant, nameof(currentTenant));
+        if (string.IsNullOrWhiteSpace(currentTenant.Id))
+            throw new ArgumentException("Current Tenant Id is not available!");
+        return Conv.ToGuid(currentTenant.Id);
+    }
+
+    /// <summary>
+    /// 获取当前租户的 ID，并转换为指定的类型 <typeparamref name="T"/>。
+    /// </summary>
+    /// <typeparam name="T">目标 ID 类型，例如 <see cref="Guid"/> 或 <see cref="int"/>。</typeparam>
+    /// <param name="currentTenant">当前租户信息。</param>
+    /// <returns>返回租户的 ID，转换为类型 <typeparamref name="T"/>。</returns>
+    /// <exception cref="ArgumentNullException">如果 <paramref name="currentTenant"/> 为空，则抛出此异常。</exception>
+    /// <exception cref="ArgumentException">如果租户 ID 为空或无效，则抛出此异常。</exception>
+    public static T GetId<T>(this ICurrentTenant currentTenant)
+    {
+        Check.NotNull(currentTenant, nameof(currentTenant));
+        if (string.IsNullOrWhiteSpace(currentTenant.Id))
+            throw new ArgumentException("Current Tenant Id is not available!");
+        return Conv.To<T>(currentTenant.Id);
+    }
+}

framework/src/Bing.MultiTenancy.Abstractions/Bing/MultiTenancy/ICurrentTenant.cs

@@ -13,17 +13,17 @@ public interface ICurrentTenant
     /// <summary>
     /// 租户标识
     /// </summary>
-    string Id { get; }
+    string? Id { get; }
 
     /// <summary>
     /// 租户名称
     /// </summary>
-    string Name { get; }
+    string? Name { get; }
 
     /// <summary>
     /// 变更
     /// </summary>
     /// <param name="id">租户标识</param>
     /// <param name="name">租户名称</param>
-    IDisposable Change(string id, string name = null);
+    IDisposable Change(string id, string? name = null);
 }

framework/src/Bing.MultiTenancy.Abstractions/Bing/MultiTenancy/ICurrentTenantAccessor.cs

@@ -8,5 +8,5 @@ public interface ICurrentTenantAccessor
     /// <summary>
     /// 当前基本租户信息
     /// </summary>
-    BasicTenantInfo Current { get; set; }
-}
+    BasicTenantInfo? Current { get; set; }
+}