feat(logger): ILogger 支持

PCL.Core/Logging/LogWrapper.cs

@@ -39,4 +39,10 @@ public static class LogWrapper
     public static void Trace(string msg) => Trace(null, msg);
 
     public static Logger CurrentLogger => LogService.Logger;
+
+    private static readonly Lazy<LoggerFactoryAdapter> _LoggerFactory = new(static () =>
+    {
+        return new LoggerFactoryAdapter(CurrentLogger);
+    });
+    public static LoggerFactoryAdapter LoggerFactory => _LoggerFactory.Value;
 }

PCL.Core/Logging/LoggerAdapter.cs

@@ -0,0 +1,137 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace PCL.Core.Logging;
+
+/// <summary>
+/// Microsoft.Extensions.Logging.ILogger 适配器
+/// 将现有的 Logger 包装为标准的 ILogger 接口实现
+/// </summary>
+public class LoggerAdapter(Logger logger, string categoryName) : ILogger
+{
+    private readonly Logger _innerLogger = logger ?? throw new ArgumentNullException(nameof(logger));
+    private readonly string _categoryName = categoryName ?? throw new ArgumentNullException(nameof(categoryName));
+
+    private static readonly AsyncLocal<Stack<object>> _ScopeStack = new();
+
+    IDisposable ILogger.BeginScope<TState>(TState state)
+    {
+        _ScopeStack.Value ??= new Stack<object>();
+        _ScopeStack.Value.Push(state);
+        return new ScopeDisposable(state);
+    }
+
+#pragma warning disable CS9113 // 参数未读。
+    private class ScopeDisposable(object state) : IDisposable
+    {
+        private bool _disposed;
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+
+            if (_ScopeStack.Value is { Count: > 0 })
+            {
+#if DEBUG
+                var popped = _ScopeStack.Value.Pop();
+                if (!ReferenceEquals(popped, state))
+                {
+                    throw new InvalidOperationException("Scope disposal order mismatch.");
+                }
+#else
+                _ = _ScopeStack.Value.Pop();
+#endif
+            }
+
+            _disposed = true;
+        }
+    }
+
+    public bool IsEnabled(Microsoft.Extensions.Logging.LogLevel level) => true;
+
+    public void Log<TState>(Microsoft.Extensions.Logging.LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+    {
+        if (!IsEnabled(logLevel))
+            return;
+
+        ArgumentNullException.ThrowIfNull(formatter);
+
+        var originalMessage = formatter(state, exception);
+        var sb = new StringBuilder();
+
+        // 类别名称
+        if (!string.IsNullOrEmpty(_categoryName))
+        {
+            sb.Append('[').Append(_categoryName).Append("] ");
+        }
+
+        // 事件 ID
+        if (eventId.Id != 0 || !string.IsNullOrEmpty(eventId.Name))
+        {
+            sb.Append("[EventId:");
+            if (!string.IsNullOrEmpty(eventId.Name))
+            {
+                sb.Append(eventId.Id).Append(':').Append(eventId.Name);
+            }
+            else
+            {
+                sb.Append(eventId.Id);
+            }
+            sb.Append("] ");
+        }
+
+        // 上下文信息
+        var scopeContext = _BuildScopeContext();
+        if (!string.IsNullOrEmpty(scopeContext))
+        {
+            sb.Append('[').Append(_categoryName).Append("] ");
+        }
+
+        sb.Append(originalMessage);
+        var finalMessage = sb.ToString();
+
+        // 日志级别
+        switch (logLevel)
+        {
+            case Microsoft.Extensions.Logging.LogLevel.Trace:
+                _innerLogger.Trace(finalMessage);
+                break;
+            case Microsoft.Extensions.Logging.LogLevel.Debug:
+                _innerLogger.Debug(finalMessage);
+                break;
+            case Microsoft.Extensions.Logging.LogLevel.Information:
+                _innerLogger.Info(finalMessage);
+                break;
+            case Microsoft.Extensions.Logging.LogLevel.Warning:
+                _innerLogger.Warn(finalMessage);
+                break;
+            case Microsoft.Extensions.Logging.LogLevel.Error:
+                _innerLogger.Error(finalMessage);
+                break;
+            case Microsoft.Extensions.Logging.LogLevel.Critical:
+                _innerLogger.Fatal(finalMessage);
+                break;
+        }
+
+        if (exception != null)
+        {
+            var exceptionMessage = $"Exception: {exception}";
+            _innerLogger.Log($"[{_categoryName}] {exceptionMessage}");
+        }
+    }
+
+    private string _BuildScopeContext()
+    {
+        var stack = _ScopeStack.Value;
+        if (stack == null || stack.Count == 0)
+            return string.Empty;
+
+        var scopes = stack.AsEnumerable().Reverse();
+        return string.Join(" => ", scopes.Select(s => s.ToString()));
+    }
+}

PCL.Core/Logging/LoggerExtensions.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Diagnostics;
+using Microsoft.Extensions.Logging;
+
+namespace PCL.Core.Logging;
+
+public static class LoggerExtensions
+{
+    /// <summary>
+    /// 创建 ILogger 实例
+    /// </summary>
+    /// <param name="logger">现有的 Logger 实例</param>
+    /// <param name="categoryName">日志类别名称</param>
+    /// <returns>ILogger 实例</returns>
+    public static ILogger CreateLogger(this Logger logger, string categoryName)
+    {
+        return new LoggerAdapter(logger, categoryName);
+    }
+
+    /// <summary>
+    /// 创建 ILogger 工厂
+    /// </summary>
+    /// <param name="logger">现有的 Logger 实例</param>
+    /// <returns>ILoggerFactory 实例</returns>
+    public static ILoggerFactory CreateLoggerFactory(this Logger logger)
+    {
+        return new LoggerFactoryAdapter(logger);
+    }
+
+    /// <summary>
+    /// 使用结构化日志记录的扩展方法
+    /// </summary>
+    public static void LogInformation<T0>(this ILogger logger, string message, T0 arg0)
+    {
+        logger.Log(Microsoft.Extensions.Logging.LogLevel.Information, message, arg0);
+    }
+
+    public static void LogInformation<T0, T1>(this ILogger logger, string message, T0 arg0, T1 arg1)
+    {
+        logger.Log(Microsoft.Extensions.Logging.LogLevel.Information, message, arg0, arg1);
+    }
+
+    public static void LogInformation<T0, T1, T2>(this ILogger logger, string message, T0 arg0, T1 arg1, T2 arg2)
+    {
+        logger.Log(Microsoft.Extensions.Logging.LogLevel.Information, message, arg0, arg1, arg2);
+    }
+
+    public static void LogWarning<T0>(this ILogger logger, string message, T0 arg0)
+    {
+        logger.Log(Microsoft.Extensions.Logging.LogLevel.Warning, message, arg0);
+    }
+
+    public static void LogWarning<T0, T1>(this ILogger logger, string message, T0 arg0, T1 arg1)
+    {
+        logger.Log(Microsoft.Extensions.Logging.LogLevel.Warning, message, arg0, arg1);
+    }
+
+    public static void LogError<T0>(this ILogger logger, Exception? exception, string message, T0 arg0)
+    {
+        logger.Log(Microsoft.Extensions.Logging.LogLevel.Error, exception, message, arg0);
+    }
+
+    public static void LogError<T0, T1>(this ILogger logger, Exception? exception, string message, T0 arg0, T1 arg1)
+    {
+        logger.Log(Microsoft.Extensions.Logging.LogLevel.Error, exception, message, arg0, arg1);
+    }
+
+    /// <summary>
+    /// 条件日志记录扩展方法
+    /// </summary>
+    public static void LogIf(this ILogger logger, bool condition, Microsoft.Extensions.Logging.LogLevel level, string message)
+    {
+        if (condition)
+        {
+            logger.Log(level, message);
+        }
+    }
+
+    public static void LogIf(this ILogger logger, bool condition, Microsoft.Extensions.Logging.LogLevel level, Exception? exception, string message)
+    {
+        if (condition)
+        {
+            logger.Log(level, exception, message);
+        }
+    }
+
+    /// <summary>
+    /// 性能计时日志记录
+    /// </summary>
+    public static IDisposable LogPerformance(this ILogger logger, string operationName)
+    {
+        logger.LogInformation("开始执行: {OperationName}", operationName);
+
+        return new PerformanceLoggerDisposable(logger, operationName);
+    }
+
+    private class PerformanceLoggerDisposable(ILogger logger, string operationName) : IDisposable
+    {
+        private readonly long _startTime = Stopwatch.GetTimestamp();
+
+        public void Dispose()
+        {
+            var elapsed = Stopwatch.GetElapsedTime(_startTime);
+            logger.LogInformation("完成执行: {OperationName}, 耗时: {ElapsedMs}ms", operationName, elapsed.TotalMilliseconds);
+        }
+    }
+}

PCL.Core/Logging/LoggerFactoryAdapter.cs

@@ -0,0 +1,34 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+
+namespace PCL.Core.Logging;
+
+/// <summary>
+/// ILoggerFactory 实现，用于创建 LoggerAdapter 实例
+/// </summary>
+public class LoggerFactoryAdapter(Logger logger) : ILoggerFactory
+{
+    private readonly Logger _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+    private readonly List<IDisposable> _disposables = [];
+
+    public void AddProvider(ILoggerProvider provider)
+    {
+        _disposables.Add(provider);
+        // 不需要实现，因为我们只有一个固定的 Logger
+    }
+
+    public ILogger CreateLogger(string categoryName)
+    {
+        return new LoggerAdapter(_logger, categoryName);
+    }
+
+    public void Dispose()
+    {
+        foreach (var disposable in _disposables)
+        {
+            disposable.Dispose();
+        }
+        _disposables.Clear();
+    }
+}

PCL.Core/PCL.Core.csproj

@@ -66,6 +66,9 @@
         <PackageReference Include="Polly" Version="8.6.5" />
         <!-- 本地化 -->
         <PackageReference Include="Humanizer.Core.zh-CN" Version="3.0.1" />
+        <!-- 日志支持 -->
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
     </ItemGroup>
     <!-- 信不过巨硬的智障代码，手动包含需要的文件 -->
     <PropertyGroup>