refactor: ♻️ 异常请求输出追踪标识

nsnail · Dec 19, 2024 · ce69758 · ce69758
1 parent 93fe9e4
commit ce69758
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/assets/res/NetAdmin.Fields.ln b/assets/res/NetAdmin.Fields.ln
@@ -128,8 +128,8 @@
 请求方式
 请求日志导出
 调试
-跟踪
-跟踪标识
+追踪
+追踪标识
 身份证
 运行
 通知

diff --git a/refs/Gurion b/refs/Gurion
diff --git a/refs/NetAdmin.FreeSql b/refs/NetAdmin.FreeSql
diff --git 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; }
 
     /// <summary>
-    ///     请求跟踪标识
+    ///     请求追踪标识
     /// </summary>
     [Column]
     [CsvIgnore]

diff --git 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<T> : DataAbstraction
     /// </summary>
     /// <example>请求成功</example>
     public object Msg { get; init; }
+
+    /// <summary>
+    ///     追踪标识
+    /// </summary>
+    public Guid? TraceId { get; set; }
 }
diff --git 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
     /// <inheritdoc />
     [CsvIndex(7)]
     [CsvIgnore(false)]
-    [CsvName(nameof(Ln.跟踪标识))]
+    [CsvName(nameof(Ln.追踪标识))]
     public override Guid TraceId { get; init; }
 }
diff --git a/src/backend/NetAdmin/NetAdmin.Host/Filters/ApiResultHandler.cs b/src/backend/NetAdmin/NetAdmin.Host/Filters/ApiResultHandler.cs
@@ -35,7 +35,7 @@ public IActionResult OnException(ExceptionContext context, ExceptionMetadata met
         var result = RestfulResult(errorCode, metadata.Data
                       ,                       naException is NetAdminValidateException vEx
                                        ? vEx.ValidateResults
-                                       : naException?.Message ?? errorCode.ResDesc<ErrorCodes>());
+                                       : naException?.Message ?? errorCode.ResDesc<ErrorCodes>(), context.HttpContext.GetTraceId());
 
         SetErrorCodeToHeader(context.HttpContext, errorCode);
 
@@ -95,9 +95,9 @@ private static object GetValidationResult(object validationResult)
     /// <summary>
     ///     返回 RESTful 风格结果集
     /// </summary>
-    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 };
     }
 
     /// <summary>

diff --git 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
 {
     /// <summary>
-    ///     跟踪
+    ///     追踪
     /// </summary>
     [Display(Name = "[gray]TCE[/]", ShortName = "TCE")]
-    [ResourceDescription<Ln>(nameof(Ln.跟踪))]
+    [ResourceDescription<Ln>(nameof(Ln.追踪))]
     Trace = 0
 
    ,

diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/HttpContextExtensions.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/HttpContextExtensions.cs
@@ -24,7 +24,7 @@ public static IPAddress GetRealIpAddress(this HttpContext me)
     }
 
     /// <summary>
-    ///     获取跟踪标识
+    ///     获取追踪标识
     /// </summary>
     public static Guid GetTraceId(this HttpContext me)
     {