feat: ✨ 请求日志增加TraceId (#154)

Co-authored-by: tk <fiyne1a@dingtalk.com>

assets/res/Fields.ln

@@ -123,6 +123,7 @@
 请求日志导出
 调试
 跟踪
+跟踪编号
 身份证
 运行
 通知

build/code.quality.props

@@ -15,7 +15,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.19-preview">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/backend/NetAdmin.Domain/Attributes/IndicatorAttribute.cs

@@ -10,5 +10,5 @@ public sealed class IndicatorAttribute(string indicate) : Attribute
     /// <summary>
     ///     状态指示
     /// </summary>
-    public string Indicate { get; init; } = indicate;
+    public string Indicate { get; } = indicate;
 }

src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs

@@ -61,7 +61,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary
     [Column]
     [Ignore]
     [JsonIgnore]
-    public virtual HttpStatusCode? LastStatusCode { get; init; }
+    public HttpStatusCode? LastStatusCode { get; init; }
 
     /// <summary>
     ///     下次执行时间

src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs

@@ -172,6 +172,14 @@ public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldCreatedCli
     [JsonIgnore]
     public virtual int? ServerIp { get; init; }
 
+    /// <summary>
+    ///     请求跟踪标识
+    /// </summary>
+    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)]
+    [Ignore]
+    [JsonIgnore]
+    public virtual string TraceId { get; init; }
+
     /// <summary>
     ///     用户
     /// </summary>

src/backend/NetAdmin.Domain/Dto/Dependency/PagedQueryRsp.cs

@@ -6,17 +6,17 @@ namespace NetAdmin.Domain.Dto.Dependency;
 public sealed record PagedQueryRsp<T>(int Page, int PageSize, long Total, IEnumerable<T> Rows) : IPagedInfo
     where T : DataAbstraction
 {
+    /// <summary>
+    ///     数据行
+    /// </summary>
+    public IEnumerable<T> Rows { get; } = Rows;
+
     /// <inheritdoc cref="IPagedInfo.Page" />
     public int Page { get; init; } = Page;
 
     /// <inheritdoc cref="IPagedInfo.PageSize" />
     public int PageSize { get; init; } = PageSize;
 
-    /// <summary>
-    ///     数据行
-    /// </summary>
-    public IEnumerable<T> Rows { get; init; } = Rows;
-
     /// <summary>
     ///     数据总条
     /// </summary>

src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesRsp.cs

@@ -34,6 +34,7 @@ public sealed record GetAllEntriesRsp : DataAbstraction
     /// <summary>
     ///     绝对过期时间
     /// </summary>
+    [JsonInclude]
     public long AbsExp { get; init; }
 
     /// <summary>
@@ -49,5 +50,6 @@ public sealed record GetAllEntriesRsp : DataAbstraction
     /// <summary>
     ///     滑动过期时间
     /// </summary>
+    [JsonInclude]
     public long SldExp { get; init; }
 }

src/backend/NetAdmin.Domain/Dto/Sys/Dev/IconExportJsInfo.cs

@@ -29,6 +29,7 @@ public sealed record IconExportJsInfo : DataAbstraction
         /// <summary>
         ///     Icons
         /// </summary>
+        [JsonInclude]
         public ICollection<string> Icons { get; init; }
 
         /// <summary>

src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs

@@ -10,6 +10,7 @@ namespace NetAdmin.Domain.Dto.Sys.Job;
 public record QueryJobRsp : Sys_Job
 {
     /// <inheritdoc cref="Sys_Job.LastStatusCode" />
+    [JsonInclude]
     public new virtual string LastStatusCode =>
         #pragma warning disable IDE0072
         base.LastStatusCode switch {

src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs

@@ -9,6 +9,7 @@ namespace NetAdmin.Domain.Dto.Sys.JobRecord;
 public record QueryJobRecordRsp : Sys_JobRecord
 {
     /// <inheritdoc cref="Sys_JobRecord.HttpStatusCode" />
+    [JsonInclude]
     public new virtual string HttpStatusCode =>
         base.HttpStatusCode == Numbers.HTTP_STATUS_BIZ_FAIL
             ? nameof(ErrorCodes.Unhandled).ToLowerCamelCase()

src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs

@@ -31,36 +31,43 @@ public sealed record MetaInfo : DataAbstraction
     /// <summary>
     ///     背景颜色
     /// </summary>
+    [JsonInclude]
     public string Color { get; init; }
 
     /// <summary>
     ///     是否整页路由
     /// </summary>
+    [JsonInclude]
     public bool FullPage { get; init; }
 
     /// <summary>
     ///     是否隐藏
     /// </summary>
+    [JsonInclude]
     public bool Hidden { get; init; }
 
     /// <summary>
     ///     是否隐藏面包屑
     /// </summary>
+    [JsonInclude]
     public bool HiddenBreadCrumb { get; init; }
 
     /// <summary>
     ///     图标
     /// </summary>
+    [JsonInclude]
     public string Icon { get; init; }
 
     /// <summary>
     ///     标签
     /// </summary>
+    [JsonInclude]
     public string Tag { get; init; }
 
     /// <summary>
     ///     标题
     /// </summary>
+    [JsonInclude]
     public string Title { get; init; }
 
     /// <summary>
@@ -68,5 +75,6 @@ public sealed record MetaInfo : DataAbstraction
     /// </summary>
     [EnumDataType(typeof(MenuTypes), ErrorMessageResourceType = typeof(Ln)
                 , ErrorMessageResourceName = nameof(Ln.菜单类型不正确))]
+    [JsonInclude]
     public MenuTypes Type { get; init; }
 }

src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs

@@ -59,6 +59,12 @@ public record ExportRequestLogRsp : QueryRequestLogRsp
     [Name(nameof(Ln.请求方式))]
     public override string Method { get; init; }
 
+    /// <inheritdoc />
+    [CsvIndex(9)]
+    [Ignore(false)]
+    [Name(nameof(Ln.跟踪编号))]
+    public override string TraceId { get; init; }
+
     /// <inheritdoc />
     [Ignore]
     public override QueryUserRsp User { get; init; }

src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs

@@ -10,16 +10,19 @@ public record QueryRequestLogRsp : Sys_RequestLog, IRegister
     /// <summary>
     ///     创建者客户端IP
     /// </summary>
+    [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" />
@@ -91,6 +94,10 @@ public record QueryRequestLogRsp : Sys_RequestLog, IRegister
     [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; }
 

src/backend/NetAdmin.Host/Extensions/IMvcBuilderExtensions.cs

@@ -68,7 +68,7 @@ public static class IMvcBuilderExtensions
     /// <summary>
     ///     设置Json选项
     /// </summary>
-    public static void SetJsonOptions(bool enumToString, JsonOptions options)
+    private static void SetJsonOptions(bool enumToString, JsonOptions options)
     {
         ////////////////////////////// json -> object
 

src/backend/NetAdmin.Host/Startup.cs

@@ -26,7 +26,7 @@ public abstract class Startup : AppStartup
     /// <summary>
     ///     打印Banner
     /// </summary>
-    protected static void ShowBanner()
+    private static void ShowBanner()
     {
         AnsiConsole.WriteLine();
         var gridInfo = new Grid().AddColumn(new GridColumn().NoWrap().Width(50).PadRight(10))

src/backend/NetAdmin.Host/Utils/RequestLogger.cs

@@ -19,7 +19,6 @@ public sealed class RequestLogger(ILogger<RequestLogger> logger, IEventPublisher
     {
         // 从请求头中读取用户信息
         var associatedUser = GetAssociatedUser(context);
-
         var auditData = new CreateRequestLogReq {
                                                     Duration           = duration
                                                   , Method             = context.Request.Method
@@ -48,6 +47,7 @@ public sealed class RequestLogger(ILogger<RequestLogger> logger, IEventPublisher
                                                                              ?.MapToIPv4()
                                                                              .ToString()
                                                                              .IpV4ToInt32()
+                                                  , TraceId = context.TraceIdentifier
                                                 };
 
         // 打印日志

src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs

@@ -19,5 +19,5 @@ public abstract class NetAdminException(string message, Exception innerException
     /// <summary>
     ///     错误码
     /// </summary>
-    public ErrorCodes Code { get; init; }
+    public ErrorCodes Code { get; }
 }

src/backend/NetAdmin.Infrastructure/Extensions/HttpRequestMessageExtensions.cs

@@ -5,22 +5,22 @@ namespace NetAdmin.Infrastructure.Extensions;
 /// </summary>
 public static class HttpRequestMessageExtensions
 {
-    /// <summary>
-    ///     将Http请求的Uri、Header、Body打包成Json字符串
-    /// </summary>
-    public static async Task<string> BuildJsonAsync(this HttpRequestMessage me)
-    {
-        var body = me?.Content == null ? null : await me.Content!.ReadAsStringAsync().ConfigureAwait(false);
-        return new { Uri = me?.RequestUri, Header = me?.ToString(), Body = body }.ToJson();
-    }
-
     /// <summary>
     ///     记录日志
     /// </summary>
     public static async Task<HttpRequestMessage> LogAsync<T>(this HttpRequestMessage me, ILogger<T> logger)
     {
         logger.Info(
-            $"HTTP Request: {(await me.BuildJsonAsync().ConfigureAwait(false))?.Sub(0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT)}");
+            $"HTTP Request {(await me.BuildJsonAsync().ConfigureAwait(false))?.Sub(0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT)}");
         return me;
     }
+
+    /// <summary>
+    ///     将Http请求的Uri、Header、Body打包成Json字符串
+    /// </summary>
+    private static async Task<string> BuildJsonAsync(this HttpRequestMessage me)
+    {
+        var body = me?.Content == null ? null : await me.Content!.ReadAsStringAsync().ConfigureAwait(false);
+        return new { Uri = me?.RequestUri, Header = me?.ToString(), Body = body }.ToJson();
+    }
 }

src/backend/NetAdmin.Infrastructure/Extensions/HttpResponseMessageExtensions.cs

@@ -11,9 +11,8 @@ public static class HttpResponseMessageExtensions
     public static async Task LogAsync<T>(this HttpResponseMessage me, ILogger<T> logger
                                        , Func<string, string>     bodyPreHandle = null)
     {
-        logger.Info(
+        logger.Info($"HTTP Response {(await me.BuildJsonAsync(bodyPreHandle).ConfigureAwait(false))?.Sub(
-            (await me.BuildJsonAsync(bodyPreHandle).ConfigureAwait(false))?.Sub(
+            0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT)}");
-                0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT));
     }
 
     /// <summary>

src/backend/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs

@@ -13,4 +13,9 @@ public interface IDicContentService : IService, IDicContentModule
     ///     编辑字典内容
     /// </summary>
     Task<QueryDicContentRsp> EditAsync(EditDicContentReq req);
+
+    /// <summary>
+    ///     通过分类键查询字典内容
+    /// </summary>
+    Task<List<QueryDicContentRsp>> QueryByCatalogCodeAsync(string catalogCode);
 }

src/backend/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs

@@ -141,6 +141,17 @@ public sealed class DicContentService(BasicRepository<Sys_DicContent, long> rpo)
         return ret.Adapt<IEnumerable<QueryDicContentRsp>>();
     }
 
+    /// <inheritdoc />
+    public async Task<List<QueryDicContentRsp>> QueryByCatalogCodeAsync(string catalogCode)
+    {
+        var ret = await Rpo.Orm.Select<Sys_DicContent>()
+                           .Include(a => a.Catalog)
+                           .Where(a => a.Catalog.Code == catalogCode)
+                           .ToListAsync()
+                           .ConfigureAwait(false);
+        return ret.Adapt<List<QueryDicContentRsp>>();
+    }
+
     private ISelect<Sys_DicContent> QueryInternal(QueryReq<QueryDicContentReq> req)
     {
         var ret = Rpo.Select.WhereDynamicFilter(req.DynamicFilter).WhereDynamic(req.Filter);

src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs

@@ -279,19 +279,18 @@ public sealed class UserService(
     public async Task<int> ResetPasswordAsync(ResetPasswordReq req)
     {
         req.ThrowIfInvalid();
-        if (await verifyCodeService.VerifyAsync(req.VerifySmsCodeReq).ConfigureAwait(false)) {
+        if (!await verifyCodeService.VerifyAsync(req.VerifySmsCodeReq).ConfigureAwait(false)) {
+            throw new NetAdminInvalidOperationException(Ln.验证码不正确);
+        }
+
         var dto = (await Rpo.Where(a => a.Mobile == req.VerifySmsCodeReq.DestDevice)
                             .ToOneAsync(a => new { a.Version, a.Id })
                             .ConfigureAwait(false)).Adapt<Sys_User>() with {
-                                                                                   Password = req.PasswordText.Pwd()
+                                                                               Password = req.PasswordText.Pwd().Guid()
-                                                                                       .Guid()
                                                                            };
         return await UpdateAsync(dto, [nameof(Sys_User.Password)]).ConfigureAwait(false);
     }
 
-        throw new NetAdminInvalidOperationException(Ln.验证码不正确);
-    }
-
     /// <inheritdoc />
     public async Task<UserInfoRsp> SetAvatarAsync(SetAvatarReq req)
     {

src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs

@@ -1,4 +1,5 @@
 using NetAdmin.Cache;
+using NetAdmin.Domain.Dto.Sys.Dic.Content;
 using NetAdmin.SysComponent.Application.Modules.Sys;
 using NetAdmin.SysComponent.Application.Services.Sys.Dependency;
 
@@ -7,4 +8,10 @@ namespace NetAdmin.SysComponent.Cache.Sys.Dependency;
 /// <summary>
 ///     字典内容缓存
 /// </summary>
-public interface IDicContentCache : ICache<IDistributedCache, IDicContentService>, IDicContentModule;
+public interface IDicContentCache : ICache<IDistributedCache, IDicContentService>, IDicContentModule
+{
+    /// <summary>
+    ///     通过分类键查询字典内容
+    /// </summary>
+    Task<List<QueryDicContentRsp>> QueryByCatalogCodeAsync(string catalogCode);
+}

src/backend/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs

@@ -1,7 +1,4 @@
 using NetAdmin.Cache;
-using NetAdmin.Domain.Dto.Dependency;
-using NetAdmin.Domain.Dto.Sys.User;
-using NetAdmin.Domain.Dto.Sys.UserProfile;
 using NetAdmin.SysComponent.Application.Modules.Sys;
 using NetAdmin.SysComponent.Application.Services.Sys.Dependency;
 
@@ -12,41 +9,6 @@ namespace NetAdmin.SysComponent.Cache.Sys.Dependency;
 /// </summary>
 public interface IUserCache : ICache<IDistributedCache, IUserService>, IUserModule
 {
-    /// <summary>
-    ///     删除缓存 CheckMobileAvailableAsync
-    /// </summary>
-    Task RemoveCheckMobileAvailableAsync(CheckMobileAvailableReq req);
-
-    /// <summary>
-    ///     删除缓存 CheckUserNameAvailableAsync
-    /// </summary>
-    Task RemoveCheckUserNameAvailableAsync(CheckUserNameAvailableReq req);
-
-    /// <summary>
-    ///     删除缓存 LoginByPwdAsync
-    /// </summary>
-    Task RemoveLoginByPwdAsync(LoginByPwdReq req);
-
-    /// <summary>
-    ///     删除缓存 LoginBySmsAsync
-    /// </summary>
-    Task RemoveLoginBySmsAsync(LoginBySmsReq req);
-
-    /// <summary>
-    ///     删除缓存 QueryProfileAsync
-    /// </summary>
-    Task RemoveQueryProfileAsync(QueryReq<QueryUserProfileReq> req);
-
-    /// <summary>
-    ///     删除缓存 RegisterAsync
-    /// </summary>
-    Task RemoveRegisterAsync(RegisterUserReq req);
-
-    /// <summary>
-    ///     删除缓存 ResetPasswordAsync
-    /// </summary>
-    Task RemoveResetPasswordAsync(ResetPasswordReq req);
-
     /// <summary>
     ///     删除缓存 UserInfoAsync
     /// </summary>

src/backend/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs

@@ -63,4 +63,16 @@ public sealed class DicContentCache(IDistributedCache cache, IDicContentService
     {
         return Service.QueryAsync(req);
     }
+
+    /// <inheritdoc />
+    public Task<List<QueryDicContentRsp>> QueryByCatalogCodeAsync(string catalogCode)
+    {
+        #if !DEBUG
+        return GetOrCreateAsync( //
+            GetCacheKey(catalogCode), () => Service.QueryByCatalogCodeAsync(catalogCode)
+,                                     TimeSpan.FromSeconds(Numbers.SECS_CACHE_DIC_CATALOG_CODE));
+        #else
+        return Service.QueryByCatalogCodeAsync(catalogCode);
+        #endif
+    }
 }

src/backend/NetAdmin.SysComponent.Cache/Sys/UserCache.cs

@@ -119,48 +119,6 @@ public sealed class UserCache(IDistributedCache cache, IUserService service, IVe
         return Service.RegisterAsync(req);
     }
 
-    /// <inheritdoc />
-    public Task RemoveCheckMobileAvailableAsync(CheckMobileAvailableReq req)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <inheritdoc />
-    public Task RemoveCheckUserNameAvailableAsync(CheckUserNameAvailableReq req)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <inheritdoc />
-    public Task RemoveLoginByPwdAsync(LoginByPwdReq req)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <inheritdoc />
-    public Task RemoveLoginBySmsAsync(LoginBySmsReq req)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <inheritdoc />
-    public Task RemoveQueryProfileAsync(QueryReq<QueryUserProfileReq> req)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <inheritdoc />
-    public Task RemoveRegisterAsync(RegisterUserReq req)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <inheritdoc />
-    public Task RemoveResetPasswordAsync(ResetPasswordReq req)
-    {
-        throw new NotImplementedException();
-    }
-
     /// <inheritdoc />
     public Task RemoveUserInfoAsync()
     {

src/frontend/admin/src/components/naDicCatalog/index.vue

@@ -1,5 +1,6 @@
 <template>
     <el-cascader
+        v-bind="$attrs"
         v-model="data"
         :options="options"
         :placeholder="placeholder"

src/frontend/admin/src/components/naInfo/index.vue

@@ -1,7 +1,7 @@
 <template>
     <el-drawer v-model="visible" :size="size" :title="title" @closed="$emit('closed')" destroy-on-close>
         <el-main>
-            <el-descriptions :column="1" border size="small">
+            <el-descriptions :column="1" border class="font-monospace" size="small">
                 <el-descriptions-item v-for="(item, i) in data" :key="i" :label="i" label-class-name="w15">
                     {{ item }}
                 </el-descriptions-item>

src/frontend/admin/src/style/app.scss

@@ -497,6 +497,10 @@ textarea {
     margin-top: 2rem;
 }
 
+.mb-8 {
+    margin-bottom: 2rem;
+}
+
 .w100p {
     width: 100%;
 }

src/frontend/admin/src/style/media.scss

@@ -121,13 +121,13 @@
         margin-top: 1rem;
         border-bottom: 1px solid var(--el-border-color-light);
     }
-    .adminui-main > .el-container > .el-container > .el-header {
+    .adminui-main > .el-container .el-header {
         @extend .headerPublic;
     }
-    .adminui-main > .el-container > .el-container > .el-header .left-panel {
+    .adminui-main > .el-container .el-header .left-panel {
         display: block;
     }
-    .adminui-main > .el-container > .el-container > .el-header .right-panel {
+    .adminui-main > .el-container .el-header .right-panel {
         display: block;
         margin-top: 1rem;
     }

src/frontend/admin/src/utils/tool.js

@@ -247,6 +247,10 @@ tool.groupSeparator = function (num) {
         })
         .replace(/\.$/, '')
 }
+// unicode解码
+tool.unicodeDecode = function (str) {
+    return str.replace(/\\u([0-9a-fA-F]{4})/g, (match, grp) => String.fromCharCode(parseInt(grp, 16)))
+}
 // 属性排序
 tool.sortProperties = function (obj) {
     const sortedKeys = Object.keys(obj).sort()

src/frontend/admin/src/views/sys/dic/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container>
-        <el-aside v-loading="loading" width="30rem">
+        <el-aside v-loading="loading" width="40rem">
             <el-container>
                 <el-header>
                     <el-input v-model="filterText" :placeholder="$t('输入关键字进行过滤')" clearable></el-input>
@@ -23,6 +23,7 @@
                                 <span>{{ data.name }} {{ data.code }}</span>
                                 <span class="btn">
                                     <el-button-group size="small">
+                                        <el-button @click.stop="add(data.id, data.code)" icon="el-icon-plus"></el-button>
                                         <el-button @click.stop="edit(data)" icon="el-icon-edit"></el-button>
                                         <el-popconfirm :title="$t('确定删除 {item} 吗？', { item: data.name })" @confirm="del(data)" width="20rem">
                                             <template #reference>
@@ -36,7 +37,9 @@
                     </el-tree>
                 </el-main>
                 <el-footer>
-                    <el-button @click="add" icon="el-icon-plus" size="small" style="width: 100%" type="primary">{{ $t('字典分类') }}</el-button>
+                    <el-button @click="add(form.catalogId)" icon="el-icon-plus" size="small" style="width: 100%" type="primary">{{
+                        $t('字典分类')
+                    }}</el-button>
                 </el-footer>
             </el-container>
         </el-aside>
@@ -105,8 +108,8 @@ export default {
             return targetText.indexOf(value) !== -1
         },
         //字典目录增加
-        async add() {
+        async add(id, code) {
-            this.dialog.save = { mode: 'add' }
+            this.dialog.save = { mode: 'add', data: { catalogId: id, code: code + '>' } }
         },
         //字典目录编辑
         async edit(data) {

src/frontend/admin/src/views/sys/dic/list/index.vue

@@ -16,7 +16,10 @@
                     ref="search" />
             </div>
             <div class="right-panel">
-                <el-button @click="this.dialog.save = { mode: 'add' }" icon="el-icon-plus" type="primary"></el-button>
+                <el-button
+                    @click="this.dialog.save = { mode: 'add', data: { catalogId: this.catalogId } }"
+                    icon="el-icon-plus"
+                    type="primary"></el-button>
                 <na-button-bulk-del :api="$API.sys_dic.bulkDeleteContent" :vue="this" />
             </div>
         </el-header>

src/frontend/admin/src/views/sys/dic/list/save.vue

@@ -5,7 +5,7 @@
                 <el-tab-pane :label="$t('基本信息')">
                     <el-form :disabled="mode === 'view'" :model="form" :rules="rules" label-width="10rem" ref="dialogForm">
                         <el-form-item :label="$t('所属字典')" prop="catalogId">
-                            <na-dic-catalog v-model="form.catalogId" />
+                            <na-dic-catalog v-model="form.catalogId" class="w100p" />
                         </el-form-item>
                         <el-form-item :label="$t('项名')" prop="key">
                             <el-input v-model="form.key" clearable></el-input>
@@ -63,6 +63,7 @@ export default {
             this.visible = true
             this.loading = true
             this.mode = data.mode
+            this.form.catalogId = data.data?.catalogId
             if (data.row?.id) {
                 const res = await this.$API.sys_dic.getContent.post({ id: data.row.id })
                 Object.assign(this.form, res.data)

src/frontend/admin/src/views/sys/dic/save.vue

@@ -8,7 +8,7 @@
                 <el-input v-model="form.code" :placeholder="$t('字典编码')" clearable></el-input>
             </el-form-item>
             <el-form-item :label="$t('父路径')" prop="parentId">
-                <na-dic-catalog v-model="form.parentId" />
+                <na-dic-catalog v-model="form.parentId" class="w100p" />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -45,6 +45,8 @@ export default {
             this.visible = true
             this.loading = true
             this.mode = data.mode
+            this.form.parentId = data.data?.catalogId
+            this.form.code = data.data?.code
             if (data.row?.id) {
                 const res = await this.$API.sys_dic.getCatalog.post({ id: data.row.id })
                 Object.assign(this.form, res.data)

src/frontend/admin/src/views/sys/job/index.vue

@@ -1,9 +1,15 @@
 <template>
-    <el-tabs v-model="tabId" class="w100p" style="background: var(--el-bg-color-overlay); padding-left: 1rem">
+    <el-container>
+        <el-header style="border: none">
+            <el-tabs v-model="tabId" class="w100p">
                 <el-tab-pane :label="$t('所有作业')" name="all"></el-tab-pane>
                 <el-tab-pane :label="$t('异常作业')" name="fail"></el-tab-pane>
             </el-tabs>
+        </el-header>
+        <el-main class="nopadding">
             <component :is="tabId" :status-codes="['300,399', '400,499', '500,599', '900,999']" />
+        </el-main>
+    </el-container>
 </template>
 
 <script>

src/frontend/admin/src/views/sys/log/login/index.vue

@@ -159,10 +159,10 @@ export default {
         async rowClick(row) {
             this.dialog.info = true
             await this.$nextTick()
-            const res = await this.$API.sys_log.query.post({
+            const res = await this.$API.sys_log.get.post({
-                filter: { id: row.id },
+                id: row.id,
             })
-            this.$refs.info.open(this.$TOOL.sortProperties(res.data[0]), this.$t('日志详情：{id}', { id: row.id }))
+            this.$refs.info.open(this.$TOOL.sortProperties(res.data), this.$t('日志详情：{id}', { id: row.id }))
         },
     },
     mounted() {

src/frontend/admin/src/views/sys/log/operation/index.vue

@@ -205,7 +205,7 @@ export default {
                 })
             }
 
-            if (typeof form.dy.userId) {
+            if (typeof form.dy.userId === 'number' && form.dy.userId !== 0) {
                 this.query.dynamicFilter.filters.push({
                     field: 'userId',
                     operator: 'eq',
@@ -234,10 +234,10 @@ export default {
         async rowClick(row) {
             this.dialog.info = true
             await this.$nextTick()
-            const res = await this.$API.sys_log.query.post({
+            const res = await this.$API.sys_log.get.post({
-                filter: { id: row.id },
+                id: row.id,
             })
-            this.$refs.info.open(this.$TOOL.sortProperties(res.data[0]), this.$t('日志详情：{id}', { id: row.id }))
+            this.$refs.info.open(this.$TOOL.sortProperties(res.data), this.$t('日志详情：{id}', { id: row.id }))
         },
     },
     mounted() {