feat: ✨ 框架代码同步 (#158)

[skip ci] Co-authored-by: tk <fiyne1a@dingtalk.com>
2025-12-23 14:35:50 +08:00 · 2024-07-22 12:58:10 +08:00
parent 60ec6ea2c1
commit 1a28e8d5a6
107 changed files with 1256 additions and 664 deletions
--- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs
+++ b/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs
@@ -1,6 +1,12 @@
+using NetAdmin.Domain.Dto.Sys.RequestLogDetail;
+
 namespace NetAdmin.Domain.Dto.Sys.RequestLog;

 /// <summary>
 ///     请求：创建请求日志
 /// </summary>
-public sealed record CreateRequestLogReq : Sys_RequestLog;
+public sealed record CreateRequestLogReq : Sys_RequestLog
+{
+    /// <inheritdoc cref="Sys_RequestLog.Detail" />
+    public new CreateRequestLogDetailReq Detail { get; init; }
+}
--- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs
+++ b/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs
@@ -1,4 +1,7 @@
+using NetAdmin.Domain.Dto.Sys.Api;
+using NetAdmin.Domain.Dto.Sys.RequestLogDetail;
 using NetAdmin.Domain.Dto.Sys.User;
+using HttpMethods = NetAdmin.Domain.Enums.HttpMethods;

 namespace NetAdmin.Domain.Dto.Sys.RequestLog;

@@ -7,39 +10,51 @@ namespace NetAdmin.Domain.Dto.Sys.RequestLog;
 /// </summary>
 public record ExportRequestLogRsp : QueryRequestLogRsp
 {
+    /// <summary>
+    ///     接口路径
+    /// </summary>
+    [CsvIndex(2)]
+    [JsonInclude]
+    [Name(nameof(Ln.接口路径))]
+    public string ApiId => Api.Id;
+
    /// <inheritdoc />
    [CsvIndex(6)]
    [Ignore(false)]
    [Name(nameof(Ln.客户端IP))]
    public override string CreatedClientIp => base.CreatedClientIp;

+    /// <summary>
+    ///     用户名
+    /// </summary>
+    [CsvIndex(5)]
+    [JsonInclude]
+    [Name(nameof(Ln.用户名))]
+    public string UserName => Owner?.UserName;
+
    /// <inheritdoc />
    [Ignore]
-    public override string LoginName => base.LoginName;
+    public override QueryApiRsp Api { get; init; }

    /// <inheritdoc />
-    [CsvIndex(7)]
-    [Ignore(false)]
-    [Name(nameof(Ln.操作系统))]
-    public override string Os => base.Os;
+    [Ignore]
+    public override DateTime CreatedTime { get; init; }

    /// <inheritdoc />
-    [CsvIndex(2)]
-    [Ignore(false)]
-    [Name(nameof(Ln.接口路径))]
-    public override string ApiId { get; init; }
-
-    /// <inheritdoc />
-    [CsvIndex(8)]
-    [Ignore(false)]
-    [Name(nameof(Ln.用户代理))]
-    public override string CreatedUserAgent { get; init; }
+    [Ignore]
+    public override QueryRequestLogDetailRsp Detail { get; init; }

    /// <inheritdoc />
    [CsvIndex(4)]
    [Ignore(false)]
    [Name(nameof(Ln.执行耗时))]
-    public override long Duration { get; init; }
+    public override int Duration { get; init; }
+
+    /// <inheritdoc />
+    [CsvIndex(3)]
+    [Ignore(false)]
+    [Name(nameof(Ln.请求方式))]
+    public override HttpMethods HttpMethod { get; init; }

    /// <inheritdoc />
    [CsvIndex(1)]
@@ -54,32 +69,14 @@ public record ExportRequestLogRsp : QueryRequestLogRsp
    public override long Id { get; init; }

    /// <inheritdoc />
-    [CsvIndex(3)]
-    [Ignore(false)]
-    [Name(nameof(Ln.请求方式))]
-    public override string Method { get; init; }
-
-    /// <inheritdoc />
-    [CsvIndex(9)]
-    [Ignore(false)]
-    [Name(nameof(Ln.跟踪编号))]
-    public override string TraceId { get; init; }
+    [Ignore]
+    public override QueryUserLiteRsp Owner { get; init; }

    /// <inheritdoc />
    [Ignore]
-    public override QueryUserRsp User { get; init; }
-
-    /// <summary>
-    ///     用户名
-    /// </summary>
-    [CsvIndex(5)]
-    [Ignore(false)]
-    [Name(nameof(Ln.用户名))]
-    public string UserName { get; init; }
+    public override long? OwnerDeptId { get; init; }

    /// <inheritdoc />
-    public override void Register(TypeAdapterConfig config)
-    {
-        _ = config.ForType<Sys_RequestLog, ExportRequestLogRsp>().Map(d => d.UserName, s => s.User.UserName);
-    }
+    [Ignore]
+    public override long? OwnerId { get; init; }
 }
--- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs
+++ b/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs
@@ -1,11 +1,14 @@
+using NetAdmin.Domain.Dto.Sys.Api;
+using NetAdmin.Domain.Dto.Sys.RequestLogDetail;
 using NetAdmin.Domain.Dto.Sys.User;
+using HttpMethods = NetAdmin.Domain.Enums.HttpMethods;

 namespace NetAdmin.Domain.Dto.Sys.RequestLog;

 /// <summary>
 ///     响应：查询请求日志
 /// </summary>
-public record QueryRequestLogRsp : Sys_RequestLog, IRegister
+public record QueryRequestLogRsp : Sys_RequestLog
 {
    /// <summary>
    ///     创建者客户端IP
@@ -13,101 +16,39 @@ public record QueryRequestLogRsp : Sys_RequestLog, IRegister
    [JsonInclude]
    public new virtual string CreatedClientIp => base.CreatedClientIp?.ToIpV4();

-    /// <summary>
-    ///     登录名
-    /// </summary>
-    [JsonInclude]
-    public virtual string LoginName => RequestBody?.ToObject<LoginByPwdReq>()?.Account;
-
-    /// <summary>
-    ///     操作系统
-    /// </summary>
-    [JsonInclude]
-    public virtual string Os => UserAgentParser.Create(CreatedUserAgent)?.Platform;
-
-    /// <inheritdoc cref="Sys_RequestLog.ApiId" />
+    /// <inheritdoc cref="Sys_RequestLog.Api" />
    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ApiId { get; init; }
+    public new virtual QueryApiRsp Api { get; init; }

-    /// <summary>
-    ///     接口描述
-    /// </summary>
-    public string ApiSummary { get; init; }
+    /// <inheritdoc cref="Sys_RequestLog.ApiPathCrc32" />
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public override int ApiPathCrc32 { get; init; }

    /// <inheritdoc cref="IFieldCreatedTime.CreatedTime" />
    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
    public override DateTime CreatedTime { get; init; }

-    /// <inheritdoc cref="Sys_RequestLog.CreatedUserAgent" />
+    /// <inheritdoc cref="Sys_RequestLog.Detail" />
    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string CreatedUserAgent { get; init; }
+    public new virtual QueryRequestLogDetailRsp Detail { get; init; }

    /// <inheritdoc cref="Sys_RequestLog.Duration" />
    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override long Duration { get; init; }
+    public override int Duration { get; init; }

-    /// <inheritdoc cref="Sys_RequestLog.ErrorCode" />
+    /// <inheritdoc cref="Sys_RequestLog.HttpMethod" />
    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override ErrorCodes ErrorCode { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.Exception" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string Exception { get; init; }
+    public override HttpMethods HttpMethod { get; init; }

    /// <inheritdoc cref="Sys_RequestLog.HttpStatusCode" />
    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
    public override int HttpStatusCode { get; init; }

-    /// <inheritdoc cref="Sys_RequestLog.Method" />
+    /// <inheritdoc cref="Sys_RequestLog.Owner" />
    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string Method { get; init; }
+    public new virtual QueryUserLiteRsp Owner { get; init; }

-    /// <inheritdoc cref="Sys_RequestLog.RequestBody" />
+    /// <inheritdoc cref="IFieldOwner.OwnerId" />
    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestBody { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.RequestContentType" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestContentType { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.RequestHeaders" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestHeaders { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.RequestUrl" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestUrl { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ResponseBody" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ResponseBody { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ResponseContentType" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ResponseContentType { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ResponseHeaders" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ResponseHeaders { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ServerIp" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override int? ServerIp { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.TraceId" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string TraceId { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.User" />
-    public new virtual QueryUserRsp User { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.UserId" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override long? UserId { get; init; }
-
-    /// <inheritdoc />
-    public virtual void Register(TypeAdapterConfig config)
-    {
-        _ = config.ForType<Sys_RequestLog, QueryRequestLogRsp>().Map(d => d.ApiSummary, s => s.Api.Summary);
-    }
+    public override long? OwnerId { get; init; }
 }