diff --git a/framework/src/Bing.AspNetCore/Bing/AspNetCore/Logs/AspNetCoreLogContext.cs b/framework/src/Bing.AspNetCore/Bing/AspNetCore/Logs/AspNetCoreLogContext.cs
index 3141ebe05..165542262 100644
--- a/framework/src/Bing.AspNetCore/Bing/AspNetCore/Logs/AspNetCoreLogContext.cs
+++ b/framework/src/Bing.AspNetCore/Bing/AspNetCore/Logs/AspNetCoreLogContext.cs
@@ -28,14 +28,11 @@ public class AspNetCoreLogContext : LogContext
         /// <summary>
         /// 初始化一个<see cref="AspNetCoreLogContext"/>类型的实例
         /// </summary>
-        /// <param name="scopedDictionary">作用域字典</param>
         /// <param name="webClientInfoProvider">Web客户端信息提供程序</param>
         /// <param name="httpContextAccessor">Http上下文访问器</param>
         public AspNetCoreLogContext(
-            ScopedDictionary scopedDictionary, 
-            IHttpContextAccessor httpContextAccessor, 
+            IHttpContextAccessor httpContextAccessor,
             IWebClientInfoProvider webClientInfoProvider)
-            : base(scopedDictionary)
         {
             HttpContextAccessor = httpContextAccessor;
             WebClientInfoProvider = webClientInfoProvider;
@@ -50,9 +47,10 @@ protected override LogContextInfo CreateInfo()
 
             logContextInfo.Ip = WebClientInfoProvider.ClientIpAddress;
             logContextInfo.Browser = WebClientInfoProvider.ClientIpAddress;
-
             logContextInfo.Url = HttpContextAccessor.HttpContext?.Request?.GetDisplayUrl();
-
+            logContextInfo.IsWebEnv = HttpContextAccessor.HttpContext?.Request != null;
+            if (logContextInfo.IsWebEnv)
+                logContextInfo.TraceId = TraceId;
             return logContextInfo;
         }
 
@@ -65,7 +63,7 @@ protected override string GetTraceId()
             if (!string.IsNullOrWhiteSpace(correlationId))
                 return correlationId;
             var traceId = HttpContextAccessor.HttpContext?.TraceIdentifier;
-            return string.IsNullOrWhiteSpace(traceId) ? Guid.NewGuid().ToString() : Guid.TryParse(traceId, out _) ? traceId : Guid.NewGuid().ToString();
+            return string.IsNullOrWhiteSpace(traceId) ? Guid.NewGuid().ToString("N") : Guid.TryParse(traceId, out _) ? traceId : Guid.NewGuid().ToString("N");
         }
     }
 }
diff --git a/framework/src/Bing.Data/Bing/Data/Queries/Conditions/DateSegmentCondition.cs b/framework/src/Bing.Data/Bing/Data/Queries/Conditions/DateSegmentCondition.cs
index 22a2a2fcd..075bc797c 100644
--- a/framework/src/Bing.Data/Bing/Data/Queries/Conditions/DateSegmentCondition.cs
+++ b/framework/src/Bing.Data/Bing/Data/Queries/Conditions/DateSegmentCondition.cs
@@ -26,13 +26,6 @@ public DateSegmentCondition(Expression<Func<TEntity, TProperty>> propertyExpress
         {
         }
 
-        /// <summary>
-        /// 最小值是否大于最大值
-        /// </summary>
-        /// <param name="min">最小值</param>
-        /// <param name="max">最大值</param>
-        protected override bool IsMinGreaterMax(DateTime? min, DateTime? max) => min > max;
-
         /// <summary>
         /// 获取最小值表达式
         /// </summary>
diff --git a/framework/src/Bing.Datas.Dapper/Bing/Data/Sql/Queries/SqlQuery.cs b/framework/src/Bing.Datas.Dapper/Bing/Data/Sql/Queries/SqlQuery.cs
index 4349cdf30..c482fd280 100644
--- a/framework/src/Bing.Datas.Dapper/Bing/Data/Sql/Queries/SqlQuery.cs
+++ b/framework/src/Bing.Datas.Dapper/Bing/Data/Sql/Queries/SqlQuery.cs
@@ -6,6 +6,7 @@
 using Bing.Data.Sql.Diagnostics;
 using Bing.Helpers;
 using Bing.Logs;
+using Bing.Logs.Internal;
 using Dapper;
 
 namespace Bing.Data.Sql.Queries
@@ -264,7 +265,7 @@ protected override void WriteTraceLog(string sql, IReadOnlyDictionary<string, ob
             if (IsEnabled(log) == false)
                 return;
             log.Class(GetType().FullName)
-                .Caption("SqlQuery查询调试:")
+                .Caption($"SqlQuery查询调试: {sql}")
                 .Sql("原始Sql:")
                 .Sql($"{sql}{Common.Line}")
                 .Sql("调试Sql:")
diff --git a/framework/src/Bing.Datas.EntityFramework/Core/UnitOfWorkBase.cs b/framework/src/Bing.Datas.EntityFramework/Core/UnitOfWorkBase.cs
index f2b47306d..3d6be04da 100644
--- a/framework/src/Bing.Datas.EntityFramework/Core/UnitOfWorkBase.cs
+++ b/framework/src/Bing.Datas.EntityFramework/Core/UnitOfWorkBase.cs
@@ -20,6 +20,7 @@
 using Bing.Exceptions;
 using Bing.Extensions;
 using Bing.Logs;
+using Bing.Logs.Core;
 using Bing.Uow;
 using Bing.Users;
 using Microsoft.EntityFrameworkCore;
@@ -68,6 +69,11 @@ public abstract class UnitOfWorkBase : DbContext, IUnitOfWork, IDatabase, IEntit
         [Autowired]
         public virtual ILazyServiceProvider LazyServiceProvider { get; set; }
 
+        /// <summary>
+        /// 日志
+        /// </summary>
+        public ILog Log => LazyServiceProvider.LazyGetService<ILog>() ?? NullLog.Instance;
+
         /// <summary>
         /// 当前用户
         /// </summary>
@@ -158,7 +164,7 @@ protected virtual string GetUserName()
         protected void EnableLog(DbContextOptionsBuilder builder)
         {
             ConfiguringIgnoreEvent(builder);
-            var log = GetLog();
+            var log = Log;
             if (IsEnabled(log) == false)
                 return;
             builder.EnableSensitiveDataLogging();
@@ -170,6 +176,7 @@ protected void EnableLog(DbContextOptionsBuilder builder)
         /// 配置忽略事件
         /// </summary>
         /// <param name="builder">配置事件</param>
+        /// <remarks>参考：https://docs.microsoft.com/zh-cn/ef/core/logging-events-diagnostics </remarks>
         protected virtual void ConfiguringIgnoreEvent(DbContextOptionsBuilder builder)
         {
             builder.ConfigureWarnings(x => x.Ignore(
@@ -196,21 +203,6 @@ protected virtual void ConfiguringIgnoreEvent(DbContextOptionsBuilder builder)
             ));
         }
 
-        /// <summary>
-        /// 获取日志操作
-        /// </summary>
-        protected virtual ILog GetLog()
-        {
-            try
-            {
-                return Log.GetLog(EfLog.TraceLogName);
-            }
-            catch
-            {
-                return Log.Null;
-            }
-        }
-
         /// <summary>
         /// 是否启用EF日志
         /// </summary>
diff --git a/framework/src/Bing.Datas.EntityFramework/Logs/EfLog.cs b/framework/src/Bing.Datas.EntityFramework/Logs/EfLog.cs
index 256b80ba5..4ae24bfab 100644
--- a/framework/src/Bing.Datas.EntityFramework/Logs/EfLog.cs
+++ b/framework/src/Bing.Datas.EntityFramework/Logs/EfLog.cs
@@ -38,13 +38,16 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             Func<TState, Exception, string> formatter)
         {
             var config = GetConfig();
-            var log = Bing.Logs.Log.GetLog(TraceLogName);
+            var log = GetUnitOfWork()?.Log;
+            if (log == null)
+                return;
             if (IsEnabled(eventId, config, exception) == false)
                 return;
             if (!string.IsNullOrWhiteSpace(GetUnitOfWork().TraceId))
                 log.Tag(GetUnitOfWork()?.TraceId);
+            log.Tag(TraceLogName);
             log
-                .Caption("执行EF操作：")
+                .Caption($"执行EF操作：{formatter(state, exception)}")
                 .Content($"工作单元跟踪号：{GetUnitOfWork()?.TraceId}")
                 .Content($"事件ID：{eventId.Id}")
                 .Content($"事件名称：{eventId.Name}");
diff --git a/framework/src/Bing.Events/Cap/MessageEventBus.cs b/framework/src/Bing.Events/Cap/MessageEventBus.cs
index 663722851..b7de9a40f 100644
--- a/framework/src/Bing.Events/Cap/MessageEventBus.cs
+++ b/framework/src/Bing.Events/Cap/MessageEventBus.cs
@@ -25,15 +25,24 @@ public class MessageEventBus : IMessageEventBus
         /// </summary>
         public ITransactionActionManager TransactionActionManager { get; set; }
 
+        /// <summary>
+        /// 日志操作
+        /// </summary>
+        protected ILog Log { get; set; }
+
         /// <summary>
         /// 初始化一个<see cref="MessageEventBus"/>类型的实例
         /// </summary>
         /// <param name="publisher">事件发布器</param>
         /// <param name="transactionActionManager">事务操作管理器</param>
-        public MessageEventBus(ICapPublisher publisher, ITransactionActionManager transactionActionManager)
+        /// <param name="log">日志操作</param>
+        public MessageEventBus(ICapPublisher publisher, 
+            ITransactionActionManager transactionActionManager,
+            ILog log)
         {
             Publisher = publisher ?? throw new ArgumentNullException(nameof(publisher));
             TransactionActionManager = transactionActionManager ?? throw new ArgumentNullException(nameof(transactionActionManager));
+            Log = log;
         }
 
         /// <summary>
@@ -86,7 +95,7 @@ private async Task InternalPublishAsync(string name, object data, IDictionary<st
         /// <param name="callback">回调名称</param>
         private void WriteLog(string name, object data, string callback)
         {
-            var log = Log.GetLog(this);
+            var log = Log;
             if (log.IsDebugEnabled == false)
                 return;
             log.Tag(name)
diff --git a/framework/src/Bing.Logs.Exceptionless/Bing/Logs/Exceptionless/ExceptionlessProvider.cs b/framework/src/Bing.Logs.Exceptionless/Bing/Logs/Exceptionless/ExceptionlessProvider.cs
index 11848b21d..d2174d5b9 100644
--- a/framework/src/Bing.Logs.Exceptionless/Bing/Logs/Exceptionless/ExceptionlessProvider.cs
+++ b/framework/src/Bing.Logs.Exceptionless/Bing/Logs/Exceptionless/ExceptionlessProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System.Diagnostics;
 using System.Linq;
 using Bing.Configuration;
 using Bing.Extensions;
@@ -72,6 +72,7 @@ public void WriteLog(LogLevel level, ILogContent content)
             // 致命错误
             if (level == LogLevel.Fatal || level == LogLevel.Error)
                 builder.MarkAsCritical();
+            Debug.WriteLine($"【Exceptionless】Thread: {content.ThreadId}, LogId: {content.LogId}, TraceId: {content.TraceId}, Message: {GetMessage(content)}, Tags: [{content.Tags.ExpandAndToString()}]");
             SetUser(content);
             SetSource(builder, content);
             SetReferenceId(builder, content);
diff --git a/framework/src/Bing.Logs/Bing/Logs/Aspects/LogAttributeBase.cs b/framework/src/Bing.Logs/Bing/Logs/Aspects/LogAttributeBase.cs
index 5252037dc..130cdc619 100644
--- a/framework/src/Bing.Logs/Bing/Logs/Aspects/LogAttributeBase.cs
+++ b/framework/src/Bing.Logs/Bing/Logs/Aspects/LogAttributeBase.cs
@@ -3,6 +3,7 @@
 using AspectCore.DynamicProxy.Parameters;
 using Bing.Aspects.Base;
 using Bing.Extensions;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Bing.Logs.Aspects
 {
@@ -17,7 +18,7 @@ public abstract class LogAttributeBase : InterceptorBase
         public override async Task Invoke(AspectContext context, AspectDelegate next)
         {
             var methodName = GetMethodName(context);
-            var log = Log.GetLog(methodName);
+            var log = context.ServiceProvider.GetService<ILog>();
             if (!Enabled(log))
                 return;
             ExecuteBefore(log, context, methodName);
diff --git a/framework/src/Bing.Logs/Bing/Logs/Extensions/LogExtensions.cs b/framework/src/Bing.Logs/Bing/Logs/Extensions/LogExtensions.cs
index 853a580be..e5b4d0e4e 100644
--- a/framework/src/Bing.Logs/Bing/Logs/Extensions/LogExtensions.cs
+++ b/framework/src/Bing.Logs/Bing/Logs/Extensions/LogExtensions.cs
@@ -25,7 +25,7 @@ public static ILog BusinessId(this ILog log, string businessId)
         {
             return log.Set<LogContent>(content =>
             {
-                if (string.IsNullOrWhiteSpace(content.BusinessId) == false) 
+                if (string.IsNullOrWhiteSpace(content.BusinessId) == false)
                     content.BusinessId += ",";
                 content.BusinessId += businessId;
             });
@@ -90,7 +90,7 @@ public static ILog Params(this ILog log, IDictionary<string, object> dictionary)
         {
             if (dictionary == null || dictionary.Count == 0)
                 return log;
-            foreach (var item in dictionary) 
+            foreach (var item in dictionary)
                 Params(log, item.Key, item.Value.SafeString());
             return log;
         }
diff --git a/framework/src/Bing.Logs/Bing/Logs/LogBase.cs b/framework/src/Bing.Logs/Bing/Logs/LogBase.cs
index cee54770b..cf1ef6d55 100644
--- a/framework/src/Bing.Logs/Bing/Logs/LogBase.cs
+++ b/framework/src/Bing.Logs/Bing/Logs/LogBase.cs
@@ -245,10 +245,10 @@ public void Fatal(string message)
         /// <param name="content">日志内容</param>
         protected virtual void Init(TContent content)
         {
-            Context.InitLogId();
             content.LogName = Provider.LogName;
             content.TraceId = Context.TraceId;
-            content.LogId = Context.LogId;
+            if (string.IsNullOrWhiteSpace(content.LogId))
+                content.LogId = Context.LogId;
             content.OperationTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
             content.Duration = Context.Stopwatch.Elapsed.Description();
             content.Ip = Context.Ip;
diff --git a/framework/src/Bing/Bing/Logging/LoggerExtensions.cs b/framework/src/Bing/Bing/Logging/LoggerExtensions.cs
new file mode 100644
index 000000000..420cca8ec
--- /dev/null
+++ b/framework/src/Bing/Bing/Logging/LoggerExtensions.cs
@@ -0,0 +1,81 @@
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Bing.Logging
+{
+    /// <summary>
+    /// 日志(<see cref="ILogger"/>) 扩展
+    /// </summary>
+    public static class LoggerExtensions
+    {
+        /// <summary>
+        /// 基于日志级别输出日志
+        /// </summary>
+        /// <param name="logger">日志</param>
+        /// <param name="logLevel">日志级别</param>
+        /// <param name="message">消息</param>
+        /// <param name="args">参数</param>
+        public static void LogWithLevel(this ILogger logger, LogLevel logLevel, string message, params object[] args)
+        {
+            switch (logLevel)
+            {
+                case LogLevel.Trace:
+                    logger.LogTrace(message, args);
+                    break;
+                case LogLevel.Debug:
+                    logger.LogDebug(message, args);
+                    break;
+                case LogLevel.Information:
+                    logger.LogInformation(message, args);
+                    break;
+                case LogLevel.Warning:
+                    logger.LogWarning(message, args);
+                    break;
+                case LogLevel.Error:
+                    logger.LogError(message, args);
+                    break;
+                case LogLevel.Critical:
+                    logger.LogCritical(message, args);
+                    break;
+                default:
+                    logger.LogDebug(message, args);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// 基于日志级别输出日志
+        /// </summary>
+        /// <param name="logger">日志</param>
+        /// <param name="logLevel">日志级别</param>
+        /// <param name="message">消息</param>
+        /// <param name="exception">异常</param>
+        public static void LogWithLevel(this ILogger logger, LogLevel logLevel, string message, Exception exception)
+        {
+            switch (logLevel)
+            {
+                case LogLevel.Trace:
+                    logger.LogTrace(exception, message);
+                    break;
+                case LogLevel.Debug:
+                    logger.LogDebug(exception, message);
+                    break;
+                case LogLevel.Information:
+                    logger.LogInformation(exception, message);
+                    break;
+                case LogLevel.Warning:
+                    logger.LogWarning(exception, message);
+                    break;
+                case LogLevel.Error:
+                    logger.LogError(exception, message);
+                    break;
+                case LogLevel.Critical:
+                    logger.LogCritical(exception, message);
+                    break;
+                default:
+                    logger.LogDebug(exception, message);
+                    break;
+            }
+        }
+    }
+}
diff --git a/framework/src/Bing/Logs/Abstractions/ILogContext.cs b/framework/src/Bing/Logs/Abstractions/ILogContext.cs
index 229e79fc9..2b11cdfe4 100644
--- a/framework/src/Bing/Logs/Abstractions/ILogContext.cs
+++ b/framework/src/Bing/Logs/Abstractions/ILogContext.cs
@@ -44,9 +44,9 @@ public interface ILogContext
         /// </summary>
         string Url { get; }
 
-        /// <summary>
-        /// 初始化日志标识
-        /// </summary>
-        void InitLogId();
+        ///// <summary>
+        ///// 初始化日志标识
+        ///// </summary>
+        //void InitLogId();
     }
 }
diff --git a/framework/src/Bing/Logs/Core/LogContext.cs b/framework/src/Bing/Logs/Core/LogContext.cs
index b58059780..bc7211a56 100644
--- a/framework/src/Bing/Logs/Core/LogContext.cs
+++ b/framework/src/Bing/Logs/Core/LogContext.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Net;
-using Bing.Collections;
-using Bing.DependencyInjection;
 using Bing.Logs.Abstractions;
 using Bing.Logs.Internal;
 using Bing.Tracing;
@@ -16,42 +14,23 @@ public class LogContext : ILogContext
     {
         #region 属性
 
-        /// <summary>
-        /// 日志上下文信息
-        /// </summary>
-        private LogContextInfo _info;
-
-        /// <summary>
-        /// 序号
-        /// </summary>
-        private int _orderId;
-
-        /// <summary>
-        /// 作用域字典
-        /// </summary>
-        private readonly ScopedDictionary _scopedDictionary;
+        private int _orderId = 0;
 
         /// <summary>
         /// 日志标识
         /// </summary>
-        public string LogId => $"{TraceId}-{GetInfo().GetOrderId()}";
+        public string LogId => GetInfo().IsWebEnv ? $"{GetInfo().TraceId}-{_orderId++}" : GetInfo().GetLogId();
 
         /// <summary>
         /// 跟踪号
         /// </summary>
-        public string TraceId => $"{TraceIdContext.Current?.TraceId ?? GetInfo().TraceId}";
-
-        ///// <summary>
-        ///// 跟踪号
-        ///// </summary>
-        //public string TraceId
-        //{
-        //    get
-        //    {
-        //        TraceIdContext.Current ??= new TraceIdContext(string.Empty);
-        //        return TraceIdContext.Current.TraceId;
-        //    }
-        //}
+        public string TraceId
+        {
+            get
+            {
+                return (TraceIdContext.Current ??= new TraceIdContext(string.Empty)).TraceId;
+            }
+        }
 
         /// <summary>
         /// 计时器
@@ -80,53 +59,12 @@ public class LogContext : ILogContext
 
         #endregion
 
-        #region 构造函数
-
-        /// <summary>
-        /// 初始化一个<see cref="LogContext"/>类型的实例
-        /// </summary>
-        /// <param name="scopedDictionary">作用域字典</param>
-        public LogContext(ScopedDictionary scopedDictionary)
-        {
-            _orderId = 0;
-            _scopedDictionary = scopedDictionary;
-        }
-
-        #endregion
-
-        /// <summary>
-        /// 初始化日志标识
-        /// </summary>
-        public void InitLogId()
-        {
-            var key = "Bing.Logs.LogContext_orderId";
-            _scopedDictionary[key] = _scopedDictionary.ContainsKey(key) ? ++_orderId : _orderId;
-        }
-
-        ///// <summary>
-        ///// 获取日志上下文信息
-        ///// </summary>
-        //private LogContextInfo GetInfo()
-        //{
-        //    if (_info != null)
-        //        return _info;
-        //    var key = "Bing.Logs.LogContext";
-        //    _info = _scopedDictionary.ContainsKey(key) ? _scopedDictionary[key] as LogContextInfo : null;
-        //    if (_info != null)
-        //        return _info;
-        //    _info = CreateInfo();
-        //    _scopedDictionary[key] = _info;
-        //    return _info;
-        //}
-
         /// <summary>
         /// 获取日志上下文信息
         /// </summary>
         private LogContextInfo GetInfo()
         {
-            if (LogContextInfo.Current == null)
-                LogContextInfo.Current = CreateInfo();
-            return LogContextInfo.Current;
+            return LogContextInfo.Current ?? (LogContextInfo.Current = CreateInfo());
         }
 
         /// <summary>
@@ -143,7 +81,7 @@ protected virtual LogContextInfo CreateInfo() =>
         /// <summary>
         /// 获取跟踪号
         /// </summary>
-        protected virtual string GetTraceId() => Guid.NewGuid().ToString();
+        protected virtual string GetTraceId() => Guid.NewGuid().ToString("N");
 
         /// <summary>
         /// 获取计时器
diff --git a/framework/src/Bing/Logs/Internal/LogContextInfo.cs b/framework/src/Bing/Logs/Internal/LogContextInfo.cs
index 457091329..42b0a739d 100644
--- a/framework/src/Bing/Logs/Internal/LogContextInfo.cs
+++ b/framework/src/Bing/Logs/Internal/LogContextInfo.cs
@@ -45,6 +45,11 @@ public class LogContextInfo
         /// </summary>
         public string Url { get; set; }
 
+        /// <summary>
+        /// 是否Web环境
+        /// </summary>
+        public bool IsWebEnv { get; set; }
+
         /// <summary>
         /// 当前日志上下文信息
         /// </summary>
@@ -71,5 +76,15 @@ public static LogContextInfo Current
         /// 获取序号
         /// </summary>
         public int GetOrderId() => _orderId++;
+
+        /// <summary>
+        /// 获取日志标识
+        /// </summary>
+        public string GetLogId()
+        {
+            var logId= $"{TraceId}-{GetOrderId()}";
+            Debug.WriteLine($"【LogContextInfo】LogId: {logId}");
+            return logId;
+        }
     }
 }
diff --git a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/WhereClauseTest.cs b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/WhereClauseTest.cs
index 446326da5..ce8f84d61 100644
--- a/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/WhereClauseTest.cs
+++ b/framework/tests/Bing.Datas.Test.Integration/Sql/Builders/SqlServer/Clauses/WhereClauseTest.cs
@@ -564,7 +564,7 @@ public void Test_WhereIfNotEmpty_7()
             Expression<Func<Sample, bool>> condition = t => t.Email.Contains("a") && t.IntValue == 1;
             AssertHelper.Throws<InvalidOperationException>(() => {
                 _clause.WhereIfNotEmpty(condition);
-            }, string.Format("仅允许添加一个条件,条件：{0}", condition));
+            }, $"仅允许添加一个条件，条件：{condition}");
         }
 
         #endregion
diff --git a/framework/tests/Bing.EventBus.Tests/Startup.cs b/framework/tests/Bing.EventBus.Tests/Startup.cs
index a7692bfe8..ee4462751 100644
--- a/framework/tests/Bing.EventBus.Tests/Startup.cs
+++ b/framework/tests/Bing.EventBus.Tests/Startup.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Logging;
 using Xunit.DependencyInjection;
 using Xunit.DependencyInjection.Logging;
+
 namespace Bing.EventBus.Tests
 {
     /// <summary>
diff --git a/framework/tests/Bing.MailKit.Tests/MailKitEmailSenderTest.cs b/framework/tests/Bing.MailKit.Tests/MailKitEmailSenderTest.cs
index 3e50d1d95..b66dba99f 100644
--- a/framework/tests/Bing.MailKit.Tests/MailKitEmailSenderTest.cs
+++ b/framework/tests/Bing.MailKit.Tests/MailKitEmailSenderTest.cs
@@ -59,14 +59,14 @@ public MailKitEmailSenderTest(ITestOutputHelper output) : base(output)
         [Fact]
         public void Test_SendEmail()
         {
-            var box = new EmailBox
-            {
-                Subject = "MailKit 测试发送邮件",
-                To = _to,
-                Body = "<p style='color:red'>测试一下红色字体的邮件</p>",
-                IsBodyHtml = true,
-            };
-            this._mailKitEmailSender.Send(box);
+            //var box = new EmailBox
+            //{
+            //    Subject = "MailKit 测试发送邮件",
+            //    To = _to,
+            //    Body = "<p style='color:red'>测试一下红色字体的邮件</p>",
+            //    IsBodyHtml = true,
+            //};
+            //this._mailKitEmailSender.Send(box);
         }
 
         /// <summary>
diff --git a/framework/tests/Bing.Tests/Applications/CrudServiceTest.Save.cs b/framework/tests/Bing.Tests/Applications/CrudServiceTest.Save.cs
index c153f854f..b8b320c11 100644
--- a/framework/tests/Bing.Tests/Applications/CrudServiceTest.Save.cs
+++ b/framework/tests/Bing.Tests/Applications/CrudServiceTest.Save.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using Bing.AutoMapper;
+using Bing.DependencyInjection;
 using Bing.Tests.Samples;
 using NSubstitute;
 using Xunit;
@@ -79,6 +80,7 @@ public CrudServiceTest()
             _unitOfWork = Substitute.For<IUnitOfWork>();
             _repository = Substitute.For<IRepositorySample>();
             _service = new CrudServiceSample(_unitOfWork, _repository);
+            _service.LazyServiceProvider = Substitute.For<ILazyServiceProvider>();
             var allAssemblyFinder = new AppDomainAllAssemblyFinder();
             var mapperProfileTypeFinder = new MapperProfileTypeFinder(allAssemblyFinder);
             var instances = mapperProfileTypeFinder
diff --git a/framework/tests/Bing.Tests/Applications/QueryServiceTest.cs b/framework/tests/Bing.Tests/Applications/QueryServiceTest.cs
index 70f45f76a..67a077cd0 100644
--- a/framework/tests/Bing.Tests/Applications/QueryServiceTest.cs
+++ b/framework/tests/Bing.Tests/Applications/QueryServiceTest.cs
@@ -1,7 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using AutoMapper;
+using Bing.AutoMapper;
+using Bing.DependencyInjection;
+using Bing.ObjectMapping;
+using Bing.Reflection;
 using Bing.Tests.Samples;
 using NSubstitute;
 using Xunit;
@@ -54,8 +60,26 @@ public QueryServiceTest()
             _entity2 = new EntitySample(_id2) { Name = "B" };
             _repository = Substitute.For<IRepositorySample>();
             _service = new QueryServiceSample(_repository);
-            //var mapper = new AutoMapperMapper();
-            //MapperExtensions.SetMapper(mapper);
+            _service.LazyServiceProvider = Substitute.For<ILazyServiceProvider>();
+            var allAssemblyFinder = new AppDomainAllAssemblyFinder();
+            var mapperProfileTypeFinder = new MapperProfileTypeFinder(allAssemblyFinder);
+            var instances = mapperProfileTypeFinder
+                .FindAll()
+                .Select(type => Bing.Reflection.Reflections.CreateInstance<IObjectMapperProfile>(type))
+                .ToList();
+            var configuration = new MapperConfiguration(cfg =>
+            {
+                foreach (var instance in instances)
+                {
+
+                    Debug.WriteLine($"初始化AutoMapper配置：{instance.GetType().FullName}");
+                    instance.CreateMap();
+                    // ReSharper disable once SuspiciousTypeConversion.Global
+                    cfg.AddProfile(instance as Profile);
+                }
+            });
+            var mapper = new AutoMapperObjectMapper(configuration, instances);
+            ObjectMapperExtensions.SetMapper(mapper);
         }
 
         /// <summary>
diff --git a/framework/tests/Bing.Tests/Datas/Queries/Criterias/DateSegmentCriteriaTest.cs b/framework/tests/Bing.Tests/Datas/Queries/Criterias/DateSegmentCriteriaTest.cs
index 3906bbb58..f30db9411 100644
--- a/framework/tests/Bing.Tests/Datas/Queries/Criterias/DateSegmentCriteriaTest.cs
+++ b/framework/tests/Bing.Tests/Datas/Queries/Criterias/DateSegmentCriteriaTest.cs
@@ -35,59 +35,127 @@ public DateSegmentCriteriaTest(ITestOutputHelper output)
         {
             _output = output;
             _min = DateTime.Parse("2000-1-1 10:10:10");
-            _max = DateTime.Parse("2000-1-2 10:10:10");
+            _max = DateTime.Parse("2000-1-3 10:10:10");
         }
 
         /// <summary>
-        /// 测试 - 获取查询条件
+        /// 测试 - 获取查询条件 - 不包含边界
         /// </summary>
         [Fact]
-        public void Test_GetPredicate()
+        public void Test_GetCondition_Neither()
+        {
+            var result = new StringBuilder();
+            result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), DateTime))");
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
+
+            var condition= new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Neither);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 不包含边界【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Neither_With_Nullable()
+        {
+            var result = new StringBuilder();
+            result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), Nullable`1))");
+            result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Neither);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含左边
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Left()
         {
             var result = new StringBuilder();
             result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
             result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
-            var criteria = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Both);
-            _output.WriteLine(criteria.GetCondition().ToString());
-            Assert.Equal(result.ToString(), criteria.GetCondition().ToString());
 
-            result = new StringBuilder();
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Left);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含左边【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Left_With_Nullable()
+        {
+            var result = new StringBuilder();
             result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), Nullable`1))");
             result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
-            var criteria2 = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Both);
-            _output.WriteLine(criteria2.GetCondition().ToString());
-            Assert.Equal(result.ToString(), criteria2.GetCondition().ToString());
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Left);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
         }
 
         /// <summary>
-        /// 测试 - 获取查询条件 - 设置边界
+        /// 测试 - 获取查询条件 - 包含右边
         /// </summary>
         [Fact]
-        public void Test_GetPredicate_Boundary()
+        public void Test_GetCondition_Right()
         {
             var result = new StringBuilder();
-            result.Append("t => ((t.DateValue > Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
-            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
-            var criteria = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Neither);
-            Assert.Equal(result.ToString(), criteria.GetCondition().ToString());
+            result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), DateTime))");
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/4 0:00:00\"), DateTime)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Right);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
 
-            result = new StringBuilder();
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含右边【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Right_With_Nullable()
+        {
+            var result = new StringBuilder();
+            result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/2 0:00:00\"), Nullable`1))");
+            result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/4 0:00:00\"), Nullable`1)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Right);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
+
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含两边
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Both()
+        {
+            var result = new StringBuilder();
             result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
-            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
-            criteria = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Left);
-            Assert.Equal(result.ToString(), criteria.GetCondition().ToString());
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/4 0:00:00\"), DateTime)))");
 
-            result = new StringBuilder();
-            result.Append("t => ((t.NullableDateValue > Convert(Parse(\"2000/1/1 0:00:00\"), Nullable`1))");
-            result.Append(" AndAlso (t.NullableDateValue <= Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
-            var criteria2 = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Right);
-            Assert.Equal(result.ToString(), criteria2.GetCondition().ToString());
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime>(t => t.DateValue, _min, _max, Boundary.Both);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
+        }
 
-            result = new StringBuilder();
+        /// <summary>
+        /// 测试 - 获取查询条件 - 包含两边【可空】
+        /// </summary>
+        [Fact]
+        public void Test_GetCondition_Both_With_Nullable()
+        {
+            var result = new StringBuilder();
             result.Append("t => ((t.NullableDateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), Nullable`1))");
-            result.Append(" AndAlso (t.NullableDateValue <= Convert(Parse(\"2000/1/3 0:00:00\"), Nullable`1)))");
-            criteria2 = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Both);
-            Assert.Equal(result.ToString(), criteria2.GetCondition().ToString());
+            result.Append(" AndAlso (t.NullableDateValue < Convert(Parse(\"2000/1/4 0:00:00\"), Nullable`1)))");
+
+            var condition = new DateSegmentCondition<AggregateRootSample, DateTime?>(t => t.NullableDateValue, _min, _max, Boundary.Both);
+            _output.WriteLine(condition.GetCondition().ToString());
+            Assert.Equal(result.ToString(), condition.GetCondition().ToString());
         }
     }
 }
diff --git a/framework/tests/Bing.Tests/Datas/Queries/QueryTest.cs b/framework/tests/Bing.Tests/Datas/Queries/QueryTest.cs
index 3e39a57f1..e186f30d6 100644
--- a/framework/tests/Bing.Tests/Datas/Queries/QueryTest.cs
+++ b/framework/tests/Bing.Tests/Datas/Queries/QueryTest.cs
@@ -168,7 +168,7 @@ public void Test_Between_Date()
             var max = DateTime.Parse("2000-1-2 10:10:10");
             var result = new StringBuilder();
             result.Append("t => ((t.DateValue >= Convert(Parse(\"2000/1/1 0:00:00\"), DateTime))");
-            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/3 0:00:00\"), DateTime)))");
+            result.Append(" AndAlso (t.DateValue < Convert(Parse(\"2000/1/2 0:00:00\"), DateTime)))");
 
             _query.Between(t => t.DateValue, min, max, false);
             Assert.Equal(result.ToString(), _query.GetCondition().ToString());
diff --git a/modules/admin/src/Bing.Admin.EventHandlers/Implements/MessageEventHandlerBase.cs b/modules/admin/src/Bing.Admin.EventHandlers/Implements/MessageEventHandlerBase.cs
index f1ce310c6..9c551d350 100644
--- a/modules/admin/src/Bing.Admin.EventHandlers/Implements/MessageEventHandlerBase.cs
+++ b/modules/admin/src/Bing.Admin.EventHandlers/Implements/MessageEventHandlerBase.cs
@@ -1,4 +1,9 @@
-namespace Bing.Admin.EventHandlers.Implements
+using Bing.Aspects;
+using Bing.DependencyInjection;
+using Bing.Logs;
+using Bing.Logs.Core;
+
+namespace Bing.Admin.EventHandlers.Implements
 {
     /// <summary>
     /// 消息事件处理器基类
@@ -6,13 +11,14 @@
     public abstract class MessageEventHandlerBase : DotNetCore.CAP.ICapSubscribe
     {
         /// <summary>
-        /// 日志
+        /// Lazy延迟加载服务提供程序
         /// </summary>
-        private Bing.Logs.ILog _log;
+        [Autowired]
+        public virtual ILazyServiceProvider LazyServiceProvider { get; set; }
 
         /// <summary>
         /// 日志
         /// </summary>
-        public Bing.Logs.ILog Log => _log ??= Logs.Log.GetLog(this);
+        protected ILog Log => LazyServiceProvider.LazyGetService<ILog>() ?? NullLog.Instance;
     }
 }
diff --git a/modules/admin/src/Bing.Admin.EventHandlers/Implements/TestMessageEventHandler.cs b/modules/admin/src/Bing.Admin.EventHandlers/Implements/TestMessageEventHandler.cs
index 261e6a85c..c236f6959 100644
--- a/modules/admin/src/Bing.Admin.EventHandlers/Implements/TestMessageEventHandler.cs
+++ b/modules/admin/src/Bing.Admin.EventHandlers/Implements/TestMessageEventHandler.cs
@@ -48,16 +48,19 @@ public TestMessageEventHandler(IAdminUnitOfWork unitOfWork, IMessageEventBus mes
         /// <summary>
         /// 测试消息
         /// </summary>
-        [CapTrace]
+        //[CapTrace]
         [EventHandler(MessageEventConst.TestMessage1)]
-        public async Task TestMessage1Async(TestMessage message,[FromCap]CapHeader header)
+        public async Task TestMessage1Async(TestMessage message, [FromCap] CapHeader header)
         {
-            if(message.ThrowException)
+            if (message.ThrowException)
                 throw new NotImplementedException("主动触发，暂未生效");
+            Log.Info($"测试一波CAP消息 - 0: {message.Id}");
             Logger.LogDebug($"测试一波CAP消息 - 1: {message.Id}");
+            var log = Bing.Logs.Log.GetLog(nameof(TestMessageEventHandler));
+            log.Debug($"测试一波CAP消息 - 1 - 1: {message.Id}");
             Debug.WriteLine(message.Id);
             await MessageEventBus.PublishAsync(new TestMessageEvent2(message, message.Send));
-            if(message.NeedCommit)
+            if (message.NeedCommit)
                 await UnitOfWork.CommitAsync();
         }
 
@@ -70,6 +73,8 @@ public Task TestMessage2Async(TestMessage message)
         {
             Debug.WriteLine(message.Id);
             Logger.LogDebug($"测试一波CAP消息 - 2: {message.Id}");
+            var log = Bing.Logs.Log.GetLog(nameof(TestMessageEventHandler));
+            log.Debug($"测试一波CAP消息 - 2 - 1: {message.Id}");
             return Task.CompletedTask;
         }
     }
diff --git a/modules/admin/src/Bing.Admin/Modules/CapModule.cs b/modules/admin/src/Bing.Admin/Modules/CapModule.cs
index 27c32081e..1a0fda531 100644
--- a/modules/admin/src/Bing.Admin/Modules/CapModule.cs
+++ b/modules/admin/src/Bing.Admin/Modules/CapModule.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using Bing.Admin.Data;
 using Bing.Admin.Data.UnitOfWorks.MySql;
 using Bing.Admin.EventHandlers.Abstractions;
@@ -8,10 +9,12 @@
 using Bing.AspNetCore;
 using Bing.Core.Modularity;
 using Bing.Events.Cap;
+using Bing.Tracing;
 using DotNetCore.CAP;
 using DotNetCore.CAP.Internal;
-using Microsoft.Extensions.Configuration;
+using DotNetCore.CAP.Serialization;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Bing.Admin.Modules
 {
@@ -39,7 +42,10 @@ public class CapModule : AspNetCoreBingModule
         /// <param name="services">服务集合</param>
         public override IServiceCollection AddServices(IServiceCollection services)
         {
+            // 替换CAP消费者服务选择器
             services.AddSingleton<IConsumerServiceSelector, CapConsumerServiceSelector>();
+            // 替换CAP订阅执行者
+            services.AddSingleton<ISubscribeInvoker, CapSubscribeInvoker>();
             LoadEvent(services);
             // 添加事件总线服务
             services.AddCapEventBus(o =>
@@ -72,4 +78,52 @@ protected void LoadEvent(IServiceCollection services)
             services.AddTransient<ITestMessageEventHandler, TestMessageEventHandler>();
         }
     }
+
+    /// <summary>
+    /// Cap 订阅执行器
+    /// </summary>
+    public class CapSubscribeInvoker : SubscribeInvoker
+    {
+        /// <summary>
+        /// 日志组件
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// 初始化一个<see cref="CapSubscribeInvoker"/>类型的实例
+        /// </summary>
+        public CapSubscribeInvoker(ILoggerFactory loggerFactory, IServiceProvider serviceProvider, ISerializer serializer)
+            : base(loggerFactory, serviceProvider, serializer)
+        {
+            _logger = loggerFactory.CreateLogger<CapSubscribeInvoker>();
+        }
+
+        /// <summary>
+        /// 获取实例
+        /// </summary>
+        /// <param name="provider">服务提供程序</param>
+        /// <param name="context">订阅上下文</param>
+        protected override object GetInstance(IServiceProvider provider, ConsumerContext context)
+        {
+            var capHeader = new CapHeader(context.DeliverMessage.Headers);
+            InitTraceIdContext(capHeader);
+            return base.GetInstance(provider, context);
+        }
+
+        /// <summary>
+        /// 初始化跟踪标识上下文
+        /// </summary>
+        private void InitTraceIdContext(CapHeader capHeader)
+        {
+            if (capHeader == null)
+                return;
+            if (!capHeader.TryGetValue("bing-trace-id", out var traceId))
+                return;
+            _logger.LogDebug("Init TraceId: {0}", traceId);
+            if (TraceIdContext.Current == null)
+                TraceIdContext.Current = new TraceIdContext(traceId);
+            else
+                TraceIdContext.Current.TraceId = traceId;
+        }
+    }
 }
diff --git a/modules/admin/src/Bing.Admin/Modules/LogModule.cs b/modules/admin/src/Bing.Admin/Modules/LogModule.cs
index a9acbeacf..7c1c56455 100644
--- a/modules/admin/src/Bing.Admin/Modules/LogModule.cs
+++ b/modules/admin/src/Bing.Admin/Modules/LogModule.cs
@@ -4,6 +4,7 @@
 using Bing.Core.Modularity;
 using Bing.Logging.Serilog;
 using Bing.Logs.NLog;
+using Bing.Tracing;
 using Exceptionless;
 using Microsoft.Extensions.DependencyInjection;
 using Serilog;
@@ -60,6 +61,7 @@ public override IServiceCollection AddServices(IServiceCollection services)
                         {
                             builder.Target.AddTags(traceId.ToString() ?? string.Empty);
                         }
+                        builder.Target.AddTags((TraceIdContext.Current ??= new TraceIdContext(string.Empty)).TraceId);
                         return builder;
                     })
                     .ReadFrom.Configuration(configuration)
diff --git a/version.props b/version.props
index b55fbcce9..104778dd4 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>2</VersionMajor>
     <VersionMinor>2</VersionMinor>
-    <VersionPatch>1</VersionPatch>
+    <VersionPatch>2</VersionPatch>
     <VersionQuality>20220104-1</VersionQuality>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
     <!--<VersionSuffix>preview-$(VersionQuality)</VersionSuffix>-->