fix: 调整多租户库

Author: jianxuanbing

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

@@ -4,5 +4,4 @@
   <Import Project="project.dependency.props" />
 
   <Import Project="..\..\..\framework.props" />
-
 </Project>

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/AsyncLocalCurrentTenantAccessor.cs

@@ -1,13 +1,20 @@
-using System.Threading;
-using Bing.DependencyInjection;
-
-namespace Bing.MultiTenancy;
+namespace Bing.MultiTenancy;
 
 /// <summary>
 /// 基于 <see cref="AsyncLocal{T}"/> 实现的当前租户访问器
 /// </summary>
-public class AsyncLocalCurrentTenantAccessor : ICurrentTenantAccessor, ISingletonDependency
+public class AsyncLocalCurrentTenantAccessor : ICurrentTenantAccessor
 {
+    /// <summary>
+    /// 实例
+    /// </summary>
+    public static AsyncLocalCurrentTenantAccessor Instance { get; } = new();
+
+    /// <summary>
+    /// 当前作用域的基本租户信息
+    /// </summary>
+    private readonly AsyncLocal<BasicTenantInfo> _currentScope;
+
     /// <summary>
     /// 当前基本租户信息
     /// </summary>
@@ -17,13 +24,8 @@ public BasicTenantInfo Current
         set => _currentScope.Value = value;
     }
 
-    /// <summary>
-    /// 当前作用域的基本租户信息
-    /// </summary>
-    private readonly AsyncLocal<BasicTenantInfo> _currentScope;
-
     /// <summary>
     /// 初始化一个<see cref="AsyncLocalCurrentTenantAccessor"/>类型的实例
     /// </summary>
     public AsyncLocalCurrentTenantAccessor() => _currentScope = new AsyncLocal<BasicTenantInfo>();
-}
+}

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

@@ -32,4 +32,4 @@ public BasicTenantInfo(string tenantId, string code = null, string name = null)
         Code = code;
         Name = name;
     }
-}
+}

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/CurrentTenant.cs

@@ -8,6 +8,11 @@ namespace Bing.MultiTenancy;
 /// </summary>
 public class CurrentTenant : ICurrentTenant, ITransientDependency
 {
+    /// <summary>
+    /// 当前租户访问器
+    /// </summary>
+    private readonly ICurrentTenantAccessor _currentTenantAccessor;
+
     /// <summary>
     /// 是否可用的
     /// </summary>
@@ -28,11 +33,6 @@ public class CurrentTenant : ICurrentTenant, ITransientDependency
     /// </summary>
     public string Name => _currentTenantAccessor.Current?.Name;
 
-    /// <summary>
-    /// 当前租户访问器
-    /// </summary>
-    private readonly ICurrentTenantAccessor _currentTenantAccessor;
-
     /// <summary>
     /// 初始化一个<see cref="CurrentTenant"/>类型的实例
     /// </summary>
@@ -62,4 +62,4 @@ private IDisposable SetCurrent(string tenantId, string code = null, string name
             _currentTenantAccessor.Current = parentScope;
         });
     }
-}
+}

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/CurrentUserTenantResolveContributor.cs

@@ -0,0 +1,35 @@
+using Bing.Users;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 当前用户租户解析构造器
+/// </summary>
+public class CurrentUserTenantResolveContributor : TenantResolveContributorBase
+{
+    /// <summary>
+    /// 构造器名称
+    /// </summary>
+    public const string ContributorName = "CurrentUser";
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public override string Name => ContributorName;
+
+    /// <summary>
+    /// 解析
+    /// </summary>
+    /// <param name="context">租户解析上下文</param>
+    public override Task ResolveAsync(ITenantResolveContext context)
+    {
+        var currentUser = context.ServiceProvider.GetRequiredService<ICurrentUser>();
+        if (currentUser.IsAuthenticated)
+        {
+            context.Handled = true;
+            context.TenantIdOrName = currentUser.TenantId;
+        }
+        return Task.CompletedTask;
+    }
+}

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/ITenantResolveContext.cs

@@ -0,0 +1,19 @@
+using Bing.DependencyInjection;
+
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 租户解析上下文
+/// </summary>
+public interface ITenantResolveContext : IServiceProviderAccessor
+{
+    /// <summary>
+    /// 租户ID或者租户名称
+    /// </summary>
+    string TenantIdOrName { get; set; }
+
+    /// <summary>
+    /// 是否已处理
+    /// </summary>
+    bool Handled { get; set; }
+}

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/ITenantResolveContributor.cs

@@ -0,0 +1,18 @@
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 租户解析构造器
+/// </summary>
+public interface ITenantResolveContributor
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// 解析
+    /// </summary>
+    /// <param name="context">租户解析上下文</param>
+    Task ResolveAsync(ITenantResolveContext context);
+}

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/ITenantResolveResultAccessor.cs

@@ -0,0 +1,12 @@
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 租户解析结果访问器
+/// </summary>
+public interface ITenantResolveResultAccessor
+{
+    /// <summary>
+    /// 租户解析结果
+    /// </summary>
+    TenantResolveResult Result { get; set; }
+}

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/ITenantResolver.cs

@@ -0,0 +1,15 @@
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 租户解析器
+/// </summary>
+public interface ITenantResolver
+{
+    /// <summary>
+    /// 解析当前租户
+    /// </summary>
+    /// <returns>
+    /// 租户ID，租户名称，null（如果无法解析则返回空）
+    /// </returns>
+    Task<TenantResolveResult> ResolveTenantIdOrNameAsync();
+}

framework/src/Bing.MultiTenancy/Bing/MultiTenancy/NullTenantResolveResultAccessor.cs

@@ -0,0 +1,14 @@
+using Bing.DependencyInjection;
+
+namespace Bing.MultiTenancy;
+
+/// <summary>
+/// 空的租户解析结果访问器
+/// </summary>
+public class NullTenantResolveResultAccessor : ITenantResolveResultAccessor, ISingletonDependency
+{
+    /// <summary>
+    /// 租户解析结果
+    /// </summary>
+    public TenantResolveResult Result { get => null; set { } }
+}