diff --git a/assets/res/NetAdmin.Fields.ln b/assets/res/NetAdmin.Fields.ln
index 3bcbd345..160b779e 100644
--- a/assets/res/NetAdmin.Fields.ln
+++ b/assets/res/NetAdmin.Fields.ln
@@ -128,8 +128,8 @@
请求方式
请求日志导出
调试
-跟踪
-跟踪标识
+追踪
+追踪标识
身份证
运行
通知
diff --git a/refs/Gurion b/refs/Gurion
index 89586fd0..b7b73bbd 160000
--- a/refs/Gurion
+++ b/refs/Gurion
@@ -1 +1 @@
-Subproject commit 89586fd0c666cb907cb24690498c3211e578483f
+Subproject commit b7b73bbd298a5376eef8e250761760e9b4441eb0
diff --git a/refs/NetAdmin.FreeSql b/refs/NetAdmin.FreeSql
index c851ae3d..433c4ee9 160000
--- a/refs/NetAdmin.FreeSql
+++ b/refs/NetAdmin.FreeSql
@@ -1 +1 @@
-Subproject commit c851ae3da25abd26364b0965d6d6affc76abee9f
+Subproject commit 433c4ee94c0d19ed98d1713885cd60bad3424c5f
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs
index 39201060..ab1cc90e 100644
--- a/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs
+++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs
@@ -100,7 +100,7 @@ public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFi
public virtual long? OwnerId { get; init; }
///
- /// 请求跟踪标识
+ /// 请求追踪标识
///
[Column]
[CsvIgnore]
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/RestfulInfo.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/RestfulInfo.cs
index 3286b5e6..d10f8d55 100644
--- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/RestfulInfo.cs
+++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/RestfulInfo.cs
@@ -22,4 +22,9 @@ public record RestfulInfo : DataAbstraction
///
/// 请求成功
public object Msg { get; init; }
+
+ ///
+ /// 追踪标识
+ ///
+ public Guid? TraceId { get; set; }
}
\ No newline at end of file
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs
index 50ef6e16..d5461957 100644
--- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs
+++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs
@@ -76,6 +76,6 @@ public sealed record ExportRequestLogRsp : QueryRequestLogRsp
///
[CsvIndex(7)]
[CsvIgnore(false)]
- [CsvName(nameof(Ln.跟踪标识))]
+ [CsvName(nameof(Ln.追踪标识))]
public override Guid TraceId { get; init; }
}
\ No newline at end of file
diff --git a/src/backend/NetAdmin/NetAdmin.Host/Filters/ApiResultHandler.cs b/src/backend/NetAdmin/NetAdmin.Host/Filters/ApiResultHandler.cs
index ebad9d0d..b8dc18f0 100644
--- a/src/backend/NetAdmin/NetAdmin.Host/Filters/ApiResultHandler.cs
+++ b/src/backend/NetAdmin/NetAdmin.Host/Filters/ApiResultHandler.cs
@@ -35,7 +35,7 @@ public abstract class ApiResultHandler
var result = RestfulResult(errorCode, metadata.Data
, naException is NetAdminValidateException vEx
? vEx.ValidateResults
- : naException?.Message ?? errorCode.ResDesc());
+ : naException?.Message ?? errorCode.ResDesc(), context.HttpContext.GetTraceId());
SetErrorCodeToHeader(context.HttpContext, errorCode);
@@ -95,9 +95,9 @@ public abstract class ApiResultHandler
///
/// 返回 RESTful 风格结果集
///
- private static T RestfulResult(ErrorCodes errorCode, object data = default, object message = default)
+ private static T RestfulResult(ErrorCodes errorCode, object data = null, object message = null, Guid? traceId = null)
{
- return new T { Code = errorCode, Data = data, Msg = message };
+ return new T { Code = errorCode, Data = data, Msg = message, TraceId = traceId };
}
///
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/LogLevels.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/LogLevels.cs
index c1d221e6..64f8b898 100644
--- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/LogLevels.cs
+++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/LogLevels.cs
@@ -7,10 +7,10 @@ namespace NetAdmin.Infrastructure.Enums;
public enum LogLevels
{
///
- /// 跟踪
+ /// 追踪
///
[Display(Name = "[gray]TCE[/]", ShortName = "TCE")]
- [ResourceDescription(nameof(Ln.跟踪))]
+ [ResourceDescription(nameof(Ln.追踪))]
Trace = 0
,
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/HttpContextExtensions.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/HttpContextExtensions.cs
index a2ec84be..19449485 100644
--- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/HttpContextExtensions.cs
+++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/HttpContextExtensions.cs
@@ -24,7 +24,7 @@ public static class HttpContextExtensions
}
///
- /// 获取跟踪标识
+ /// 获取追踪标识
///
public static Guid GetTraceId(this HttpContext me)
{