🎨 refactor(Logging): 重构 Serilog 中间件并优化日志 enriched

- 重构 BingSerilogMiddleware 类，移除直接依赖 ICurrentUser、ICurrentClient 和 ICorrelationIdProvider
- 使用 HttpContext 请求服务动态获取这些依赖，提高灵活性和可测试性
- 新增 AddUserEnrichers、AddClientEnrichers 和 AddCorrelationIdEnrichers 方法，使代码更清晰可维护
- 优化日志 enriched 添加逻辑，仅在存在相关数据时才添加
- 调整 UseBingSerilogEnrichers 中间件的使用位置，提高模块初始化清晰度

Author: jianxuanbing

framework/src/Bing.AspNetCore.Serilog/Bing/AspNetCore/Serilog/BingSerilogMiddleware.cs

@@ -3,6 +3,7 @@
 using Bing.Tracing;
 using Bing.Users;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Serilog.Context;
 using Serilog.Core;
@@ -15,74 +16,95 @@ namespace Bing.AspNetCore.Serilog;
 /// </summary>
 public class BingSerilogMiddleware : IMiddleware, ITransientDependency
 {
-    /// <summary>
-    /// 当前客户端
-    /// </summary>
-    private readonly ICurrentClient _currentClient;
-
-    /// <summary>
-    /// 当前用户
-    /// </summary>
-    private readonly ICurrentUser _currentUser;
-
-    /// <summary>
-    /// 跟踪标识提供程序
-    /// </summary>
-    private readonly ICorrelationIdProvider _correlationIdProvider;
-
     /// <summary>
     /// Serilog 选项配置
     /// </summary>
     private readonly BingAspNetCoreSerilogOptions _options;
 
     /// <summary>
-    /// 方法
+    /// 下一个中间件
     /// </summary>
     private readonly RequestDelegate _next;
 
     /// <summary>
     /// 初始化一个<see cref="BingSerilogMiddleware"/>类型的实例
     /// </summary>
     /// <param name="next">方法</param>
-    /// <param name="currentUser">当前用户</param>
-    /// <param name="currentClient">当前客户端</param>
-    /// <param name="correlationIdProvider">跟踪标识提供程序</param>
     /// <param name="options">Serilog 选项配置</param>
     public BingSerilogMiddleware(
         RequestDelegate next,
-        ICurrentUser currentUser,
-        ICurrentClient currentClient,
-        ICorrelationIdProvider correlationIdProvider,
         IOptions<BingAspNetCoreSerilogOptions> options)
     {
         _next = next;
-        _currentUser = currentUser;
-        _currentClient = currentClient;
-        _correlationIdProvider = correlationIdProvider;
         _options = options.Value;
     }
 
     /// <summary>
     /// 执行中间件拦截逻辑
     /// </summary>
-    /// <param name="context">Http上下文</param>
+    /// <param name="context">当前 HTTP 请求上下文</param>
     public async Task InvokeAsync(HttpContext context)
     {
         var enrichers = new List<ILogEventEnricher>();
-        if (_currentUser?.TenantId != null)
-            enrichers.Add(new PropertyEnricher(_options.EnricherPropertyNames.TenantId, _currentUser.TenantId));
 
-        if (_currentUser?.UserId != null)
-            enrichers.Add(new PropertyEnricher(_options.EnricherPropertyNames.UserId, _currentUser.UserId));
+        AddUserEnrichers(context, enrichers);
+        AddClientEnrichers(context, enrichers);
+        AddCorrelationIdEnrichers(context, enrichers);
 
-        if (_currentClient?.Id != null)
-            enrichers.Add(new PropertyEnricher(_options.EnricherPropertyNames.ClientId, _currentClient.Id));
+        if (enrichers.Count > 0)
+        {
+            using (LogContext.Push(enrichers.ToArray()))
+                await _next(context);
+        }
+        else
+        {
+            await _next(context);
+        }
+    }
 
-        var correlationId = _correlationIdProvider.Get();
+    /// <summary>
+    /// 添加当前用户相关的日志事件增强器
+    /// </summary>
+    /// <param name="context">当前 HTTP 请求上下文</param>
+    /// <param name="enrichers">日志事件增强器集合</param>
+    private void AddUserEnrichers(HttpContext context, ICollection<ILogEventEnricher> enrichers)
+    {
+        var currentUser = context?.RequestServices?.GetRequiredService<ICurrentUser>();
+        if (currentUser == null)
+            return;
+        if (!string.IsNullOrWhiteSpace(currentUser.TenantId))
+            enrichers.Add(new PropertyEnricher(_options.EnricherPropertyNames.TenantId, currentUser.TenantId));
+
+        if (!string.IsNullOrWhiteSpace(currentUser.UserId))
+            enrichers.Add(new PropertyEnricher(_options.EnricherPropertyNames.UserId, currentUser.UserId));
+    }
+
+    /// <summary>
+    /// 添加当前客户端相关的日志事件增强器
+    /// </summary>
+    /// <param name="context">当前 HTTP 请求上下文</param>
+    /// <param name="enrichers">日志事件增强器集合</param>
+    private void AddClientEnrichers(HttpContext context, ICollection<ILogEventEnricher> enrichers)
+    {
+        var currentClient = context?.RequestServices?.GetRequiredService<ICurrentClient>();
+        if (currentClient == null)
+            return;
+        if (!string.IsNullOrWhiteSpace(currentClient.Id))
+            enrichers.Add(new PropertyEnricher(_options.EnricherPropertyNames.ClientId, currentClient.Id));
+    }
+
+    /// <summary>
+    /// 添加关联ID相关的日志事件增强器
+    /// </summary>
+    /// <param name="context">当前 HTTP 请求上下文</param>
+    /// <param name="enrichers">日志事件增强器集合</param>
+    private void AddCorrelationIdEnrichers(HttpContext context, ICollection<ILogEventEnricher> enrichers)
+    {
+        var correlationIdProvider = context?.RequestServices?.GetRequiredService<ICorrelationIdProvider>();
+        if (correlationIdProvider == null)
+            return;
+        var correlationId = correlationIdProvider.Get();
         if (!string.IsNullOrEmpty(correlationId))
             enrichers.Add(new PropertyEnricher(_options.EnricherPropertyNames.CorrelationId, correlationId));
-
-        using (LogContext.Push(enrichers.ToArray()))
-            await _next(context);
     }
-}
+}

framework/src/Bing.AspNetCore.Serilog/Microsoft/AspNetCore/Builder/BingAspNetCoreSerilogApplicationBuilderExtensions.cs

@@ -8,8 +8,11 @@ namespace Microsoft.AspNetCore.Builder;
 public static class BingAspNetCoreSerilogApplicationBuilderExtensions
 {
     /// <summary>
-    /// 注册Serilog Enricher的日志信息中间件
+    /// 注册Serilog Enrichers的日志信息中间件
     /// </summary>
+    /// <remarks>
+    /// 【重要】必须在 IApplicationBuilder.UseAuthentication() 之后注册该中间件，否则无法获取到当前用户信息。
+    /// </remarks>
     /// <param name="app">应用程序构建器</param>
     public static IApplicationBuilder UseBingSerilogEnrichers(this IApplicationBuilder app) => app.UseMiddleware<BingSerilogMiddleware>();
 }

modules/admin/src/Bing.Admin/Modules/AppModule.cs

@@ -102,7 +102,6 @@ public override void UseModule(IApplicationBuilder app)
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             app.UseRealIp();
             app.UseCorrelationId();
-            app.UseBingSerilogEnrichers();
             // 内置日志
             app.UseHttpLogging();
             // 自定义日志
@@ -111,6 +110,7 @@ public override void UseModule(IApplicationBuilder app)
             // 初始化Http上下文访问器
             Web.HttpContextAccessor = app.ApplicationServices.GetService<IHttpContextAccessor>();
             app.UseAuthentication();
+            app.UseBingSerilogEnrichers();
             app.UseRouting();
             app.UseEndpoints(endpoints =>
             {