From 33e60a5bd72217938f1ceb3ca4a1e3b5e15080f8 Mon Sep 17 00:00:00 2001 From: nsnail Date: Tue, 23 Jul 2024 09:34:57 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=F0=9F=92=84=20code=20format=20(#159)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tk --- README.md | 3 +- assets/res/Fields.ln | 2 - assets/res/Statements.ln | 2 + src/backend/GlobalUsings.cs | 2 + .../NetAdmin.AdmServer.Host/Startup.cs | 6 +-- .../DbMaps/Dependency/ImmutableEntity.cs | 6 ++- .../DbMaps/Dependency/LiteImmutableEntity.cs | 5 +- .../DbMaps/Dependency/LiteMutableEntity.cs | 4 +- .../DbMaps/Dependency/LiteVersionEntity.cs | 4 +- .../DbMaps/Dependency/MutableEntity.cs | 6 ++- .../DbMaps/Dependency/SimpleEntity.cs | 1 + .../DbMaps/Dependency/VersionEntity.cs | 10 ++-- .../NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs | 18 +++---- .../NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs | 12 ++--- .../NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs | 16 +++--- .../DbMaps/Sys/Sys_DicCatalog.cs | 10 ++-- .../DbMaps/Sys/Sys_DicContent.cs | 8 +-- .../NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs | 36 ++++++------- .../DbMaps/Sys/Sys_JobRecord.cs | 22 ++++---- .../NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs | 34 ++++++------ .../DbMaps/Sys/Sys_RequestLog.cs | 22 ++++---- .../DbMaps/Sys/Sys_RequestLogDetail.cs | 26 +++++----- .../NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs | 26 +++++----- .../NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs | 8 +-- .../DbMaps/Sys/Sys_RoleDept.cs | 8 +-- .../DbMaps/Sys/Sys_RoleMenu.cs | 8 +-- .../NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs | 18 +++---- .../DbMaps/Sys/Sys_SiteMsgDept.cs | 8 +-- .../DbMaps/Sys/Sys_SiteMsgFlag.cs | 6 +-- .../DbMaps/Sys/Sys_SiteMsgRole.cs | 8 +-- .../DbMaps/Sys/Sys_SiteMsgUser.cs | 8 +-- .../NetAdmin.Domain/DbMaps/Sys/Sys_User.cs | 26 +++++----- .../DbMaps/Sys/Sys_UserProfile.cs | 52 +++++++++---------- .../DbMaps/Sys/Sys_UserRole.cs | 8 +-- .../DbMaps/Sys/Sys_VerifyCode.cs | 12 ++--- .../Dto/Sys/Api/ExportApiRsp.cs | 18 +++---- .../Dto/Sys/Config/ExportConfigRsp.cs | 24 ++++----- .../Dto/Sys/Dept/ExportDeptRsp.cs | 26 +++++----- .../Sys/Dic/Content/ExportDicContentRsp.cs | 12 ++--- .../Dto/Sys/Job/ExportJobRsp.cs | 46 ++++++++-------- .../Dto/Sys/JobRecord/ExportJobRecordRsp.cs | 26 +++++----- .../Dto/Sys/RequestLog/ExportRequestLogRsp.cs | 36 ++++++------- .../Dto/Sys/Role/ExportRoleRsp.cs | 32 ++++++------ .../Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs | 30 +++++------ .../Dto/Sys/User/ExportUserRsp.cs | 32 ++++++------ .../Services/Sys/ToolsService.cs | 17 +++--- 46 files changed, 381 insertions(+), 369 deletions(-) diff --git a/README.md b/README.md index 018491d2..9143c6ca 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,13 @@ ## 在线预览 -http://na.yaopy.com （演示站点仅300kbps带宽，访问较慢） +http://47.110.248.163:12000 ## 一键运行 ```shell docker run -p 8080:8080 nsnail/netadmin +# 需翻墙 ``` ## 构建步骤 diff --git a/assets/res/Fields.ln b/assets/res/Fields.ln index 4e342191..b1a1b845 100644 --- a/assets/res/Fields.ln +++ b/assets/res/Fields.ln @@ -134,8 +134,6 @@ 重设密码 链接 错误 -随机延时结束时间不正确 -随机延时起始时间不正确 随机排序 项值 项名 diff --git a/assets/res/Statements.ln b/assets/res/Statements.ln index ca76f9c1..18edb906 100644 --- a/assets/res/Statements.ln +++ b/assets/res/Statements.ln @@ -93,6 +93,8 @@ XML注释文件不存在 配置文件初始化完毕 键值不能为空 键名称不能为空 +随机延时结束时间不正确 +随机延时起始时间不正确 非JSON字符串 验证数据不能为空 验证码不正确 diff --git a/src/backend/GlobalUsings.cs b/src/backend/GlobalUsings.cs index 60c5033f..55c53d63 100644 --- a/src/backend/GlobalUsings.cs +++ b/src/backend/GlobalUsings.cs @@ -71,7 +71,9 @@ global using NetAdmin.Domain.Attributes.DataValidation; global using NetAdmin.Domain.DbMaps.Dependency; global using NetAdmin.Domain.DbMaps.Dependency.Fields; global using NetAdmin.Domain.DbMaps.Sys; +global using CsvIgnore = CsvHelper.Configuration.Attributes.IgnoreAttribute; global using CsvIndex = CsvHelper.Configuration.Attributes.IndexAttribute; +global using CsvName = CsvHelper.Configuration.Attributes.NameAttribute; global using DynamicFilterInfo = NetAdmin.Domain.Dto.Dependency.DynamicFilterInfo; global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators; global using SqlIndex = FreeSql.DataAnnotations.IndexAttribute; diff --git a/src/backend/NetAdmin.AdmServer.Host/Startup.cs b/src/backend/NetAdmin.AdmServer.Host/Startup.cs index 96275b89..67c16c86 100644 --- a/src/backend/NetAdmin.AdmServer.Host/Startup.cs +++ b/src/backend/NetAdmin.AdmServer.Host/Startup.cs @@ -1,4 +1,3 @@ -using Microsoft.IdentityModel.Logging; using NetAdmin.AdmServer.Host; using NetAdmin.AdmServer.Host.Extensions; using NetAdmin.Host.Extensions; @@ -79,9 +78,8 @@ namespace NetAdmin.AdmServer.Host public Task Execute(CommandContext context, CommandLineArgs settings) #pragma warning restore ASA001 { - Args = settings; - IdentityModelEventSource.ShowPII = true; - _ = Serve.Run(RunOptions.Default.WithArgs(context.Remaining.Raw.ToArray())); + Args = settings; + _ = Serve.Run(RunOptions.Default.WithArgs(context.Remaining.Raw.ToArray())); return Task.FromResult(0); } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs index 1ec658dc..805ca178 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs @@ -5,6 +5,7 @@ public abstract record ImmutableEntity : ImmutableEntity { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override long Id { get; init; } } @@ -18,17 +19,18 @@ public abstract record ImmutableEntity : LiteImmutableEntity, IFieldCreate { /// [Column(CanUpdate = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public long? CreatedUserId { get; init; } /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string CreatedUserName { get; init; } /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] public override T Id { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs index 4a7d8fe6..e46d9cb9 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs @@ -5,6 +5,7 @@ public abstract record LiteImmutableEntity : LiteImmutableEntity { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override long Id { get; init; } } @@ -18,13 +19,13 @@ public abstract record LiteImmutableEntity : EntityBase, IFieldCreatedTime { /// [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DateTime CreatedTime { get; init; } /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public override T Id { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs index ee457d37..a343e85a 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs @@ -5,6 +5,7 @@ public abstract record LiteMutableEntity : LiteMutableEntity { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override long Id { get; init; } } @@ -17,11 +18,12 @@ public abstract record LiteMutableEntity : LiteImmutableEntity, IFieldModi { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] public override T Id { get; init; } /// [Column(ServerTime = DateTimeKind.Local, CanInsert = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DateTime? ModifiedTime { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs index ec36d1cc..fa388a64 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs @@ -5,6 +5,7 @@ public abstract record LiteVersionEntity : LiteVersionEntity { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override long Id { get; init; } } @@ -17,12 +18,13 @@ public abstract record LiteVersionEntity : LiteMutableEntity, IFieldVersio { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override T Id { get; init; } /// [Column(IsVersion = true, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long Version { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs index 50ae40b8..d357cc1c 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs @@ -5,6 +5,7 @@ public abstract record MutableEntity : MutableEntity { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override long Id { get; init; } } @@ -17,17 +18,18 @@ public abstract record MutableEntity : LiteMutableEntity, IFieldModifiedUs { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] public override T Id { get; init; } /// [Column(CanInsert = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public long? ModifiedUserId { get; init; } /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanInsert = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public string ModifiedUserName { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs index 5af11ff7..2704d9c7 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/SimpleEntity.cs @@ -5,6 +5,7 @@ public abstract record SimpleEntity : SimpleEntity { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override long Id { get; init; } } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs index 1bba5a7f..b0bbf267 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs @@ -5,6 +5,7 @@ public abstract record VersionEntity : VersionEntity { /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] [Snowflake] public override long Id { get; init; } } @@ -17,29 +18,30 @@ public abstract record VersionEntity : LiteVersionEntity, IFieldModifiedUs { /// [Column(CanUpdate = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long? CreatedUserId { get; init; } /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string CreatedUserName { get; init; } /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [CsvIgnore] public override T Id { get; init; } /// [Column(CanInsert = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long? ModifiedUserId { get; init; } /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanInsert = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ModifiedUserName { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs index e499e2af..3ab7a8b0 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs @@ -10,14 +10,14 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// /// 子节点 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(ParentId))] public IEnumerable Children { get; init; } /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127, IsIdentity = false, IsPrimary = true, Position = 1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public override string Id { get; init; } @@ -25,7 +25,7 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// 请求方式 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Method { get; init; } @@ -33,7 +33,7 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// 服务名称 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Name { get; init; } @@ -41,7 +41,7 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// 命名空间 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] #pragma warning disable CA1716 public virtual string Namespace { get; init; } @@ -51,7 +51,7 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// 父编号 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ParentId { get; init; } @@ -59,14 +59,14 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// 路径CRC32 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public int PathCrc32 { get; init; } /// /// 角色集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_RoleApi))] public ICollection Roles { get; init; } @@ -75,7 +75,7 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// 服务描述 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Summary { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs index f47ab15c..ebf34ba2 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs @@ -10,7 +10,7 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// 是否启用 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool Enabled { get; init; } @@ -18,14 +18,14 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// 用户注册是否需要人工确认 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool UserRegisterConfirm { get; init; } /// /// 用户注册默认部门 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(UserRegisterDeptId))] public Sys_Dept UserRegisterDept { get; init; } @@ -34,14 +34,14 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// 用户注册默认部门编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long UserRegisterDeptId { get; init; } /// /// 用户注册默认角色 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(UserRegisterRoleId))] public Sys_Role UserRegisterRole { get; init; } @@ -50,7 +50,7 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// 用户注册默认角色编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long UserRegisterRoleId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs index f7213f50..7065d858 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs @@ -9,7 +9,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// /// 子节点 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(ParentId))] public IEnumerable Children { get; init; } @@ -18,7 +18,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// 是否启用 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool Enabled { get; init; } @@ -26,7 +26,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// 部门名称 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Name { get; init; } @@ -34,14 +34,14 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// 父编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long ParentId { get; init; } /// /// 角色集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_RoleDept))] public ICollection Roles { get; init; } @@ -49,7 +49,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// /// 发送给此部门的站内信集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgDept))] public ICollection SiteMsgs { get; init; } @@ -58,7 +58,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// 排序值，越大越前 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long Sort { get; init; } @@ -66,7 +66,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// 部门描述 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Summary { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs index 3524a734..8f578b95 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs @@ -10,7 +10,7 @@ public record Sys_DicCatalog : VersionEntity /// /// 子节点 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(ParentId))] public IEnumerable Children { get; init; } @@ -19,14 +19,14 @@ public record Sys_DicCatalog : VersionEntity /// 字典编码 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Code { get; init; } /// /// 字典内容集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(Sys_DicContent.CatalogId))] public ICollection Contents { get; init; } @@ -35,7 +35,7 @@ public record Sys_DicCatalog : VersionEntity /// 字典名称 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Name { get; init; } @@ -43,7 +43,7 @@ public record Sys_DicCatalog : VersionEntity /// 父编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long ParentId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs index fdbf8b31..4978410e 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs @@ -10,7 +10,7 @@ public record Sys_DicContent : VersionEntity /// /// 字典目录 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(CatalogId))] public Sys_DicCatalog Catalog { get; init; } @@ -19,7 +19,7 @@ public record Sys_DicContent : VersionEntity /// 字典目录编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long CatalogId { get; init; } @@ -27,7 +27,7 @@ public record Sys_DicContent : VersionEntity /// 键名称 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Key { get; init; } @@ -35,7 +35,7 @@ public record Sys_DicContent : VersionEntity /// 键值 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Value { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs index 3e467221..9e051f62 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs @@ -11,7 +11,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary { /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool Enabled { get; init; } @@ -19,7 +19,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 执行时间计划 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ExecutionCron { get; init; } @@ -27,7 +27,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 请求方法 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual HttpMethods HttpMethod { get; init; } @@ -35,7 +35,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 作业名称 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string JobName { get; init; } @@ -43,7 +43,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 上次执行耗时 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long? LastDuration { get; init; } @@ -51,7 +51,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 上次执行时间 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DateTime? LastExecTime { get; init; } @@ -59,7 +59,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 上次执行状态 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public HttpStatusCode? LastStatusCode { get; init; } @@ -67,7 +67,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 下次执行时间 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DateTime? NextExecTime { get; init; } @@ -75,7 +75,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 下次执行时间编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long? NextTimeId { get; init; } @@ -83,7 +83,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 随机延时起始值（毫秒） /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int? RandomDelayBegin { get; init; } @@ -91,7 +91,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 随机延时结束值（毫秒） /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int? RandomDelayEnd { get; init; } @@ -103,7 +103,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestBody { get; init; } @@ -115,7 +115,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestHeader { get; init; } @@ -127,7 +127,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestUrl { get; init; } @@ -135,7 +135,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 作业状态 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual JobStatues Status { get; init; } @@ -145,14 +145,14 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Summary { get; init; } /// /// 执行用户 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(UserId))] public Sys_User User { get; init; } @@ -161,7 +161,7 @@ public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary /// 执行用户编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long UserId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs index a66ad4c6..84944b4b 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs @@ -16,7 +16,7 @@ public record Sys_JobRecord : LiteImmutableEntity /// 执行耗时（毫秒） /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long Duration { get; init; } @@ -24,7 +24,7 @@ public record Sys_JobRecord : LiteImmutableEntity /// 请求方法 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual HttpMethods HttpMethod { get; init; } @@ -32,14 +32,14 @@ public record Sys_JobRecord : LiteImmutableEntity /// HTTP 状态码 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public int HttpStatusCode { get; init; } /// /// 拥有者信息 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(JobId))] public Sys_Job Job { get; init; } @@ -48,7 +48,7 @@ public record Sys_JobRecord : LiteImmutableEntity /// 作业编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long JobId { get; init; } @@ -60,7 +60,7 @@ public record Sys_JobRecord : LiteImmutableEntity #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestBody { get; init; } @@ -72,7 +72,7 @@ public record Sys_JobRecord : LiteImmutableEntity #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestHeader { get; init; } @@ -80,7 +80,7 @@ public record Sys_JobRecord : LiteImmutableEntity /// 请求的网络地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestUrl { get; init; } @@ -92,7 +92,7 @@ public record Sys_JobRecord : LiteImmutableEntity #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ResponseBody { get; init; } @@ -104,7 +104,7 @@ public record Sys_JobRecord : LiteImmutableEntity #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ResponseHeader { get; init; } @@ -112,7 +112,7 @@ public record Sys_JobRecord : LiteImmutableEntity /// 执行时间编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long TimeId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs index bfe17a5e..72478fa8 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs @@ -13,14 +13,14 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 子节点或详情页需要高亮的上级菜单路由地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Active { get; init; } /// /// 子节点 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(ParentId))] public IEnumerable Children { get; init; } @@ -29,7 +29,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 背景颜色 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_7)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Color { get; init; } @@ -37,7 +37,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 组件 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Component { get; init; } @@ -45,7 +45,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 是否整页路由 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool FullPageRouting { get; init; } @@ -53,7 +53,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 是否隐藏菜单 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool Hidden { get; init; } @@ -61,7 +61,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 是否隐藏面包屑 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool HiddenBreadCrumb { get; init; } @@ -69,7 +69,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 图标 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Icon { get; init; } @@ -77,7 +77,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 菜单名称 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Name { get; init; } @@ -85,7 +85,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 父编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long ParentId { get; init; } @@ -93,7 +93,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 菜单路径 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Path { get; init; } @@ -101,14 +101,14 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 重定向地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Redirect { get; init; } /// /// 拥有此菜单的角色集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_RoleMenu))] public ICollection Roles { get; init; } @@ -117,7 +117,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 排序值，越大越前 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long Sort { get; init; } @@ -125,7 +125,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 标签 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Tag { get; init; } @@ -133,7 +133,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 菜单标题 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Title { get; init; } @@ -141,7 +141,7 @@ public record Sys_Menu : VersionEntity, IFieldSort /// 菜单类型 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual MenuTypes Type { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs index faec5f61..f9d70af3 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs @@ -15,7 +15,7 @@ public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFi /// /// 接口 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(ApiPathCrc32), TempPrimary = nameof(Sys_Api.PathCrc32))] public Sys_Api Api { get; init; } @@ -24,26 +24,26 @@ public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFi /// 接口路径CRC32 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int ApiPathCrc32 { get; init; } /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int? CreatedClientIp { get; init; } /// [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DateTime CreatedTime { get; init; } /// /// 明细 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(Id))] public Sys_RequestLogDetail Detail { get; init; } @@ -52,7 +52,7 @@ public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFi /// 执行耗时（毫秒） /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int Duration { get; init; } @@ -60,7 +60,7 @@ public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFi /// 请求方法 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_TINY_INT)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual HttpMethods HttpMethod { get; init; } @@ -68,27 +68,27 @@ public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldOwner, IFi /// HTTP状态码 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_SMALL_INT)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int HttpStatusCode { get; init; } /// /// 拥有者 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(OwnerId))] public Sys_User Owner { get; init; } /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long? OwnerDeptId { get; init; } /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long? OwnerId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs index 6183ec24..5cb47f85 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs @@ -8,7 +8,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea { /// [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DateTime CreatedTime { get; init; } @@ -18,7 +18,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea #else [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string CreatedUserAgent { get; init; } @@ -26,7 +26,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea /// 程序响应码 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual ErrorCodes ErrorCode { get; init; } @@ -38,7 +38,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Exception { get; init; } @@ -50,7 +50,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestBody { get; init; } @@ -58,7 +58,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea /// 请求content-type /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestContentType { get; init; } @@ -70,7 +70,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestHeaders { get; init; } @@ -78,7 +78,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea /// 请求地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RequestUrl { get; init; } @@ -90,7 +90,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ResponseBody { get; init; } @@ -98,7 +98,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea /// 响应content-type /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ResponseContentType { get; init; } @@ -110,7 +110,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string ResponseHeaders { get; init; } @@ -118,7 +118,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea /// 服务器IP /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int? ServerIp { get; init; } @@ -126,7 +126,7 @@ public record Sys_RequestLogDetail : SimpleEntity, IFieldCreatedTime, IFieldCrea /// 请求跟踪标识 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string TraceId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs index 66cee489..f9562c1d 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs @@ -13,7 +13,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// /// 角色-接口映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_RoleApi))] public ICollection Apis { get; init; } @@ -26,7 +26,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string DashboardLayout { get; set; } @@ -34,14 +34,14 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// 数据范围 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DataScopes DataScope { get; init; } /// /// 角色-部门映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_RoleDept))] public ICollection Depts { get; init; } @@ -50,7 +50,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// 是否显示仪表板 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool DisplayDashboard { get; init; } @@ -58,7 +58,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// 是否启用 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool Enabled { get; init; } @@ -66,14 +66,14 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// 是否忽略权限控制 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool IgnorePermissionControl { get; init; } /// /// 角色-菜单映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_RoleMenu))] public ICollection Menus { get; init; } @@ -82,14 +82,14 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// 角色名称 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Name { get; init; } /// /// 发送给此角色的站内信集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgRole))] public ICollection SiteMsgs { get; init; } @@ -98,7 +98,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// 排序值，越大越前 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long Sort { get; init; } @@ -106,14 +106,14 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// 备注 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Summary { get; init; } /// /// 此角色下的用户集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_UserRole))] public ICollection Users { get; init; } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs index 0722e97a..ab7f0634 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs @@ -9,7 +9,7 @@ public record Sys_RoleApi : ImmutableEntity /// /// 关联的接口 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Api Api { get; init; } @@ -17,14 +17,14 @@ public record Sys_RoleApi : ImmutableEntity /// 接口编号 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public string ApiId { get; init; } /// /// 关联的角色 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Role Role { get; init; } @@ -32,7 +32,7 @@ public record Sys_RoleApi : ImmutableEntity /// 角色编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long RoleId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs index d2e5ee4a..44f17fca 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs @@ -10,7 +10,7 @@ public record Sys_RoleDept : ImmutableEntity /// /// 关联的部门 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Dept Dept { get; init; } @@ -18,14 +18,14 @@ public record Sys_RoleDept : ImmutableEntity /// 可访问的部门编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long DeptId { get; init; } /// /// 关联的角色 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Role Role { get; init; } @@ -33,7 +33,7 @@ public record Sys_RoleDept : ImmutableEntity /// 角色编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long RoleId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs index ae856ad8..9e4d612c 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs @@ -10,7 +10,7 @@ public record Sys_RoleMenu : ImmutableEntity /// /// 关联的菜单 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Menu Menu { get; init; } @@ -18,14 +18,14 @@ public record Sys_RoleMenu : ImmutableEntity /// 菜单编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long MenuId { get; init; } /// /// 关联的角色 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Role Role { get; init; } @@ -33,7 +33,7 @@ public record Sys_RoleMenu : ImmutableEntity /// 角色编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long RoleId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs index f147718b..081452ad 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs @@ -17,14 +17,14 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Content { get; init; } /// /// 消息-创建者映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(CreatedUserId))] public Sys_User Creator { get; init; } @@ -32,7 +32,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// /// 消息-部门映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgDept))] public ICollection Depts { get; init; } @@ -40,7 +40,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// /// 消息-标记映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(Sys_SiteMsgFlag.SiteMsgId))] public ICollection Flags { get; init; } @@ -48,14 +48,14 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// /// 消息类型 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual SiteMsgTypes MsgType { get; init; } /// /// 消息-角色映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgRole))] public ICollection Roles { get; init; } @@ -64,7 +64,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// 消息摘要 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Summary { get; init; } @@ -72,14 +72,14 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// 消息主题 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Title { get; init; } /// /// 消息-用户映射 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgUser))] public ICollection Users { get; init; } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs index ddbd2c69..39ffdb49 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs @@ -11,7 +11,7 @@ public record Sys_SiteMsgDept : ImmutableEntity /// /// 关联的部门 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Dept Dept { get; init; } @@ -19,14 +19,14 @@ public record Sys_SiteMsgDept : ImmutableEntity /// 部门编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long DeptId { get; init; } /// /// 关联的站内信 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_SiteMsg SiteMsg { get; init; } @@ -34,7 +34,7 @@ public record Sys_SiteMsgDept : ImmutableEntity /// 站内信编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long SiteMsgId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs index 1ebe997b..7f4b295c 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs @@ -14,7 +14,7 @@ public record Sys_SiteMsgFlag : MutableEntity /// 站内信编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long SiteMsgId { get; init; } @@ -22,7 +22,7 @@ public record Sys_SiteMsgFlag : MutableEntity /// 用户编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long UserId { get; init; } @@ -30,7 +30,7 @@ public record Sys_SiteMsgFlag : MutableEntity /// 用户站内信状态 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual UserSiteMsgStatues UserSiteMsgStatus { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs index 908459ba..221b5020 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs @@ -11,7 +11,7 @@ public record Sys_SiteMsgRole : ImmutableEntity /// /// 关联的角色 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Role Role { get; init; } @@ -19,14 +19,14 @@ public record Sys_SiteMsgRole : ImmutableEntity /// 角色编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long RoleId { get; init; } /// /// 关联的站内信 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_SiteMsg SiteMsg { get; init; } @@ -34,7 +34,7 @@ public record Sys_SiteMsgRole : ImmutableEntity /// 站内信编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long SiteMsgId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs index 9fab0e40..d48ea8bb 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs @@ -11,7 +11,7 @@ public record Sys_SiteMsgUser : ImmutableEntity /// /// 关联的站内信 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_SiteMsg SiteMsg { get; init; } @@ -19,14 +19,14 @@ public record Sys_SiteMsgUser : ImmutableEntity /// 站内信编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long SiteMsgId { get; init; } /// /// 关联的用户 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_User User { get; init; } @@ -34,7 +34,7 @@ public record Sys_SiteMsgUser : ImmutableEntity /// 用户编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long UserId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs index 809f18e7..afb60a4d 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs @@ -15,14 +15,14 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 头像链接 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Avatar { get; init; } /// /// 所属部门 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(nameof(DeptId))] public Sys_Dept Dept { get; init; } @@ -31,7 +31,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 部门编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual long DeptId { get; init; } @@ -39,7 +39,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 邮箱 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Email { get; init; } @@ -47,7 +47,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 是否启用 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual bool Enabled { get; init; } @@ -55,7 +55,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 手机号码 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Mobile { get; init; } @@ -63,21 +63,21 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 密码 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public Guid Password { get; init; } /// /// 用户档案 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_UserProfile Profile { get; init; } /// /// 所属角色 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_UserRole))] public ICollection Roles { get; init; } @@ -85,7 +85,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// /// 发送给此用户的站内信集合 /// - [Ignore] + [CsvIgnore] [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgUser))] public ICollection SiteMsgs { get; init; } @@ -94,7 +94,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 描述 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Summary { get; init; } @@ -102,7 +102,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 授权验证Token，全局唯一，可以随时重置（强制下线） /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public Guid Token { get; init; } @@ -110,7 +110,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// 用户名 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string UserName { get; init; } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs index 17f522ac..86db8b0d 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs @@ -16,7 +16,7 @@ public record Sys_UserProfile : VersionEntity, IRegister #else [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string AppConfig { get; set; } @@ -24,7 +24,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 出生日期 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual DateTime? BornDate { get; init; } @@ -32,7 +32,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 证件号码 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string CertificateNumber { get; init; } @@ -40,7 +40,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 证件类型 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual CertificateTypes? CertificateType { get; init; } @@ -48,7 +48,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 工作地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string CompanyAddress { get; init; } @@ -56,7 +56,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 工作地区 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public int? CompanyArea { get; init; } @@ -64,7 +64,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 工作单位 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string CompanyName { get; init; } @@ -72,7 +72,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 工作电话 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string CompanyTelephone { get; init; } @@ -80,7 +80,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 文化程度 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual Educations? Education { get; init; } @@ -88,7 +88,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 紧急联系地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string EmergencyContactAddress { get; init; } @@ -96,7 +96,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 紧急联系地区 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public int? EmergencyContactArea { get; init; } @@ -104,7 +104,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 紧急联系人手机号 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string EmergencyContactMobile { get; init; } @@ -112,7 +112,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 紧急联系人 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string EmergencyContactName { get; init; } @@ -120,7 +120,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 毕业学校 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string GraduateSchool { get; init; } @@ -128,7 +128,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 身高 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual int? Height { get; init; } @@ -136,7 +136,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 住宅地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string HomeAddress { get; init; } @@ -144,7 +144,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 住宅地区 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public int? HomeArea { get; init; } @@ -152,7 +152,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 住宅电话 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string HomeTelephone { get; init; } @@ -160,7 +160,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 婚姻状况 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual MarriageStatues? MarriageStatus { get; init; } @@ -169,7 +169,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// /// 7 [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual Nations? Nation { get; init; } @@ -177,7 +177,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 籍贯 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public int? NationArea { get; init; } @@ -185,7 +185,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 政治面貌 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual PoliticalStatues? PoliticalStatus { get; init; } @@ -193,7 +193,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 职业 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Profession { get; init; } @@ -201,7 +201,7 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 真实姓名 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string RealName { get; init; } @@ -209,14 +209,14 @@ public record Sys_UserProfile : VersionEntity, IRegister /// 性别 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual Sexes? Sex { get; init; } /// /// 用户基本信息 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_User User { get; init; } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs index e1cc70c0..e0b260e8 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs @@ -9,7 +9,7 @@ public record Sys_UserRole : VersionEntity /// /// 关联的角色 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_Role Role { get; init; } @@ -17,14 +17,14 @@ public record Sys_UserRole : VersionEntity /// 角色编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long RoleId { get; init; } /// /// 关联的用户 /// - [Ignore] + [CsvIgnore] [JsonIgnore] public Sys_User User { get; init; } @@ -32,7 +32,7 @@ public record Sys_UserRole : VersionEntity /// 用户编号 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public long UserId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs index b830a2e4..b25388e5 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs @@ -12,7 +12,7 @@ public record Sys_VerifyCode : VersionEntity /// 验证码 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_7)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string Code { get; init; } @@ -20,7 +20,7 @@ public record Sys_VerifyCode : VersionEntity /// 目标设备 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual string DestDevice { get; init; } @@ -28,7 +28,7 @@ public record Sys_VerifyCode : VersionEntity /// 设备类型 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual VerifyCodeDeviceTypes DeviceType { get; init; } @@ -36,7 +36,7 @@ public record Sys_VerifyCode : VersionEntity /// 发送报告 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] - [Ignore] + [CsvIgnore] [JsonIgnore] public string Report { get; init; } @@ -44,7 +44,7 @@ public record Sys_VerifyCode : VersionEntity /// 验证码状态 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual VerifyCodeStatues Status { get; init; } @@ -52,7 +52,7 @@ public record Sys_VerifyCode : VersionEntity /// 验证码类型 /// [Column] - [Ignore] + [CsvIgnore] [JsonIgnore] public virtual VerifyCodeTypes Type { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs index 5996a866..d9601868 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs @@ -6,30 +6,30 @@ namespace NetAdmin.Domain.Dto.Sys.Api; public record ExportApiRsp : QueryApiRsp { /// - [Ignore] + [CsvIgnore] public override IEnumerable Children { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.接口路径))] + [CsvName(nameof(Ln.接口路径))] public override string Id { get; init; } /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.请求方式))] + [CsvName(nameof(Ln.请求方式))] public override string Method { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.接口名称))] + [CsvName(nameof(Ln.接口名称))] public override string Name { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.接口描述))] + [CsvName(nameof(Ln.接口描述))] public override string Summary { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs index d3ffbef5..3611b6bf 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs @@ -9,45 +9,45 @@ namespace NetAdmin.Domain.Dto.Sys.Config; public record ExportConfigRsp : QueryConfigRsp, IRegister { /// + [CsvIgnore(false)] [CsvIndex(6)] - [Ignore(false)] - [Name(nameof(Ln.是否启用))] + [CsvName(nameof(Ln.是否启用))] public override bool Enabled { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.人工审核))] + [CsvName(nameof(Ln.人工审核))] public override bool UserRegisterConfirm { get; init; } /// - [Ignore] + [CsvIgnore] public override QueryDeptRsp UserRegisterDept { get; init; } /// /// 默认部门 /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.默认部门))] + [CsvName(nameof(Ln.默认部门))] public string UserRegisterDeptName { get; init; } /// - [Ignore] + [CsvIgnore] public override QueryRoleRsp UserRegisterRole { get; init; } /// /// 默认角色 /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.默认角色))] + [CsvName(nameof(Ln.默认角色))] public string UserRegisterRoleName { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs index 061c8529..2c848c9a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs @@ -6,42 +6,42 @@ namespace NetAdmin.Domain.Dto.Sys.Dept; public record ExportDeptRsp : QueryDeptRsp { /// - [Ignore] + [CsvIgnore] public override IEnumerable Children { get; init; } /// + [CsvIgnore(false)] [CsvIndex(5)] - [Ignore(false)] - [Name(nameof(Ln.创建时间))] + [CsvName(nameof(Ln.创建时间))] public override DateTime CreatedTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(4)] - [Ignore(false)] - [Name(nameof(Ln.是否启用))] + [CsvName(nameof(Ln.是否启用))] public override bool Enabled { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.部门名称))] + [CsvName(nameof(Ln.部门名称))] public override string Name { get; init; } /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.排序))] + [CsvName(nameof(Ln.排序))] public override long Sort { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.备注))] + [CsvName(nameof(Ln.备注))] public override string Summary { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs index 2d80f8cf..6b8386f8 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs @@ -6,20 +6,20 @@ namespace NetAdmin.Domain.Dto.Sys.Dic.Content; public record ExportDicContentRsp : QueryDicContentRsp { /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.创建时间))] + [CsvName(nameof(Ln.创建时间))] public override DateTime CreatedTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.项名))] + [CsvName(nameof(Ln.项名))] public override string Key { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.项值))] + [CsvName(nameof(Ln.项值))] public override string Value { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs index a6fe2777..f96dff0a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs @@ -10,72 +10,72 @@ namespace NetAdmin.Domain.Dto.Sys.Job; public record ExportJobRsp : QueryJobRsp { /// + [CsvIgnore(false)] [CsvIndex(5)] - [Ignore(false)] - [Name(nameof(Ln.上次执行状态))] + [CsvName(nameof(Ln.上次执行状态))] public override string LastStatusCode => base.LastStatusCode; /// + [CsvIgnore(false)] [CsvIndex(10)] - [Ignore(false)] - [Name(nameof(Ln.创建时间))] + [CsvName(nameof(Ln.创建时间))] public override DateTime CreatedTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(9)] - [Ignore(false)] - [Name(nameof(Ln.是否启用))] + [CsvName(nameof(Ln.是否启用))] public override bool Enabled { get; init; } /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.执行计划))] + [CsvName(nameof(Ln.执行计划))] public override string ExecutionCron { get; init; } /// + [CsvIgnore(false)] [CsvIndex(4)] - [Ignore(false)] - [Name(nameof(Ln.请求方式))] + [CsvName(nameof(Ln.请求方式))] public override HttpMethods HttpMethod { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.作业名称))] + [CsvName(nameof(Ln.作业名称))] public override string JobName { get; init; } /// + [CsvIgnore(false)] [CsvIndex(7)] - [Ignore(false)] - [Name(nameof(Ln.上次执行耗时))] + [CsvName(nameof(Ln.上次执行耗时))] public override long? LastDuration { get; init; } /// + [CsvIgnore(false)] [CsvIndex(6)] - [Ignore(false)] - [Name(nameof(Ln.上次执行时间))] + [CsvName(nameof(Ln.上次执行时间))] public override DateTime? LastExecTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(8)] - [Ignore(false)] - [Name(nameof(Ln.下次执行时间))] + [CsvName(nameof(Ln.下次执行时间))] public override DateTime? NextExecTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.作业状态))] + [CsvName(nameof(Ln.作业状态))] public override JobStatues Status { get; init; } /// - [Ignore] + [CsvIgnore] public override QueryUserRsp User { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs index e13c99b3..60dde7b7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs @@ -8,45 +8,45 @@ namespace NetAdmin.Domain.Dto.Sys.JobRecord; public record ExportJobRecordRsp : QueryJobRecordRsp, IRegister { /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.响应状态码))] + [CsvName(nameof(Ln.响应状态码))] public override string HttpStatusCode => base.HttpStatusCode; /// + [CsvIgnore(false)] [CsvIndex(6)] - [Ignore(false)] - [Name(nameof(Ln.创建时间))] + [CsvName(nameof(Ln.创建时间))] public override DateTime CreatedTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.执行耗时))] + [CsvName(nameof(Ln.执行耗时))] public override long Duration { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// - [Ignore] + [CsvIgnore] public override QueryJobRsp Job { get; init; } /// /// 作业名称 /// + [CsvIgnore(false)] [CsvIndex(4)] - [Ignore(false)] - [Name(nameof(Ln.作业名称))] + [CsvName(nameof(Ln.作业名称))] public string JobName { get; set; } /// + [CsvIgnore(false)] [CsvIndex(5)] - [Ignore(false)] - [Name(nameof(Ln.响应体))] + [CsvName(nameof(Ln.响应体))] public override string ResponseBody { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs index 9be1816c..b0165e8b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs @@ -14,69 +14,69 @@ public record ExportRequestLogRsp : QueryRequestLogRsp /// 接口路径 /// [CsvIndex(2)] + [CsvName(nameof(Ln.接口路径))] [JsonInclude] - [Name(nameof(Ln.接口路径))] public string ApiId => Api.Id; /// + [CsvIgnore(false)] [CsvIndex(6)] - [Ignore(false)] - [Name(nameof(Ln.客户端IP))] + [CsvName(nameof(Ln.客户端IP))] public override string CreatedClientIp => base.CreatedClientIp; /// /// 用户名 /// [CsvIndex(5)] + [CsvName(nameof(Ln.用户名))] [JsonInclude] - [Name(nameof(Ln.用户名))] public string UserName => Owner?.UserName; /// - [Ignore] + [CsvIgnore] public override QueryApiRsp Api { get; init; } /// - [Ignore] + [CsvIgnore] public override DateTime CreatedTime { get; init; } /// - [Ignore] + [CsvIgnore] public override QueryRequestLogDetailRsp Detail { get; init; } /// + [CsvIgnore(false)] [CsvIndex(4)] - [Ignore(false)] - [Name(nameof(Ln.执行耗时))] + [CsvName(nameof(Ln.执行耗时))] public override int Duration { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.请求方式))] + [CsvName(nameof(Ln.请求方式))] public override HttpMethods HttpMethod { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.响应状态码))] + [CsvName(nameof(Ln.响应状态码))] public override int HttpStatusCode { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// - [Ignore] + [CsvIgnore] public override QueryUserLiteRsp Owner { get; init; } /// - [Ignore] + [CsvIgnore] public override long? OwnerDeptId { get; init; } /// - [Ignore] + [CsvIgnore] public override long? OwnerId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs index d9f21853..291ada57 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs @@ -8,50 +8,50 @@ namespace NetAdmin.Domain.Dto.Sys.Role; public sealed record ExportRoleRsp : QueryRoleRsp { /// + [CsvIgnore(false)] [CsvIndex(7)] - [Ignore(false)] - [Name(nameof(Ln.创建时间))] + [CsvName(nameof(Ln.创建时间))] public override DateTime CreatedTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(4)] - [Ignore(false)] - [Name(nameof(Ln.数据范围))] + [CsvName(nameof(Ln.数据范围))] public override DataScopes DataScope { get; init; } /// + [CsvIgnore(false)] [CsvIndex(5)] - [Ignore(false)] - [Name(nameof(Ln.显示仪表板))] + [CsvName(nameof(Ln.显示仪表板))] public override bool DisplayDashboard { get; init; } /// + [CsvIgnore(false)] [CsvIndex(6)] - [Ignore(false)] - [Name(nameof(Ln.是否启用))] + [CsvName(nameof(Ln.是否启用))] public override bool Enabled { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.无限权限))] + [CsvName(nameof(Ln.无限权限))] public override bool IgnorePermissionControl { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.角色名称))] + [CsvName(nameof(Ln.角色名称))] public override string Name { get; init; } /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.排序))] + [CsvName(nameof(Ln.排序))] public override long Sort { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs index 2d8f480d..5bddc162 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs @@ -11,50 +11,50 @@ namespace NetAdmin.Domain.Dto.Sys.SiteMsg; public record ExportSiteMsgRsp : QuerySiteMsgRsp { /// + [CsvIgnore(false)] [CsvIndex(5)] - [Ignore(false)] - [Name(nameof(Ln.创建时间))] + [CsvName(nameof(Ln.创建时间))] public override DateTime CreatedTime { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.用户名))] + [CsvName(nameof(Ln.用户名))] public override string CreatedUserName { get; init; } /// - [Ignore] + [CsvIgnore] public override IEnumerable Depts { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.消息类型))] + [CsvName(nameof(Ln.消息类型))] public override SiteMsgTypes MsgType { get; init; } /// - [Ignore] + [CsvIgnore] public override IEnumerable Roles { get; init; } /// + [CsvIgnore(false)] [CsvIndex(4)] - [Ignore(false)] - [Name(nameof(Ln.消息摘要))] + [CsvName(nameof(Ln.消息摘要))] public override string Summary { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.消息主题))] + [CsvName(nameof(Ln.消息主题))] public override string Title { get; init; } /// - [Ignore] + [CsvIgnore] public override IEnumerable Users { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs index 8ac7bead..546aa748 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs @@ -9,61 +9,61 @@ namespace NetAdmin.Domain.Dto.Sys.User; public record ExportUserRsp : QueryUserRsp { /// + [CsvIgnore(false)] [CsvIndex(7)] - [Ignore(false)] - [Name(nameof(Ln.创建时间))] + [CsvName(nameof(Ln.创建时间))] public override DateTime CreatedTime { get; init; } /// - [Ignore] + [CsvIgnore] public override QueryDeptRsp Dept { get; init; } /// /// 所属部门 /// [CsvIndex(5)] - [Name(nameof(Ln.所属部门))] + [CsvName(nameof(Ln.所属部门))] public string DeptName { get; init; } /// + [CsvIgnore(false)] [CsvIndex(3)] - [Ignore(false)] - [Name(nameof(Ln.邮箱号))] + [CsvName(nameof(Ln.邮箱号))] public override string Email { get; init; } /// + [CsvIgnore(false)] [CsvIndex(6)] - [Ignore(false)] - [Name(nameof(Ln.是否启用))] + [CsvName(nameof(Ln.是否启用))] public override bool Enabled { get; init; } /// + [CsvIgnore(false)] [CsvIndex(0)] - [Ignore(false)] - [Name(nameof(Ln.唯一编码))] + [CsvName(nameof(Ln.唯一编码))] public override long Id { get; init; } /// + [CsvIgnore(false)] [CsvIndex(2)] - [Ignore(false)] - [Name(nameof(Ln.手机号))] + [CsvName(nameof(Ln.手机号))] public override string Mobile { get; init; } /// /// 所属角色 /// [CsvIndex(4)] - [Name(nameof(Ln.所属角色))] + [CsvName(nameof(Ln.所属角色))] public string RoleNames { get; init; } /// - [Ignore] + [CsvIgnore] public override IEnumerable Roles { get; init; } /// + [CsvIgnore(false)] [CsvIndex(1)] - [Ignore(false)] - [Name(nameof(Ln.用户名))] + [CsvName(nameof(Ln.用户名))] public override string UserName { get; init; } /// diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs index cd5f547b..78a9b921 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs @@ -18,15 +18,14 @@ public sealed class ToolsService : ServiceBase, IToolsService /// public Task> GetModulesAsync() { - return Task.FromResult>(AppDomain.CurrentDomain.GetAssemblies() - .Select(x => { - var asm = x.GetName(); - return new GetModulesRsp { - Name = asm.Name - , Version = asm.Version?.ToString() - }; - }) - .OrderBy(x => x.Name)); + return Task.FromResult>( // + AppDomain.CurrentDomain.GetAssemblies() + .Where(x => !x.FullName?.Contains('#') ?? false) + .Select(x => { + var asm = x.GetName(); + return new GetModulesRsp { Name = asm.Name, Version = asm.Version?.ToString() }; + }) + .OrderBy(x => x.Name)); } ///