From f005da8db3088c49fed642a251939a7701346815 Mon Sep 17 00:00:00 2001 From: nsnail Date: Thu, 25 Apr 2024 21:59:54 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=F0=9F=92=84=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=95=B4=E7=90=86=20(#105)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NetAdmin.AdmServer.Tests/AllTests.cs | 4 +- .../DbMaps/Dependency/ImmutableEntity.cs | 6 +-- .../DbMaps/Dependency/LiteImmutableEntity.cs | 6 +-- .../DbMaps/Dependency/LiteMutableEntity.cs | 4 +- .../DbMaps/Dependency/LiteVersionEntity.cs | 4 +- .../DbMaps/Dependency/MutableEntity.cs | 6 +-- .../DbMaps/Dependency/VersionEntity.cs | 10 ++-- .../NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs | 12 ++--- .../NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs | 8 ++-- .../NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs | 10 ++-- .../DbMaps/Sys/Sys_DicCatalog.cs | 8 ++-- .../DbMaps/Sys/Sys_DicContent.cs | 8 ++-- .../NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs | 30 ++++++------ .../DbMaps/Sys/Sys_JobRecord.cs | 6 +-- .../NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs | 32 ++++++------- .../DbMaps/Sys/Sys_RequestLog.cs | 2 +- .../NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs | 16 +++---- .../NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs | 4 +- .../DbMaps/Sys/Sys_RoleDept.cs | 6 +-- .../DbMaps/Sys/Sys_RoleMenu.cs | 6 +-- .../NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs | 6 +-- .../DbMaps/Sys/Sys_SiteMsgDept.cs | 6 +-- .../DbMaps/Sys/Sys_SiteMsgFlag.cs | 5 +- .../DbMaps/Sys/Sys_SiteMsgRole.cs | 6 +-- .../DbMaps/Sys/Sys_SiteMsgUser.cs | 6 +-- .../NetAdmin.Domain/DbMaps/Sys/Sys_User.cs | 24 +++++----- .../DbMaps/Sys/Sys_UserProfile.cs | 48 +++++++++---------- .../DbMaps/Sys/Sys_UserRole.cs | 4 +- .../DbMaps/Sys/Sys_VerifyCode.cs | 12 ++--- .../NetAdmin.Domain/Dto/Dependency/BulkReq.cs | 4 +- .../Dto/Sys/Job/CreateJobReq.cs | 4 +- .../Dto/Sys/SiteMsg/CreateSiteMsgReq.cs | 8 ++-- .../Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs | 2 +- .../Dto/Sys/User/CheckMobileAvailableReq.cs | 2 +- .../Dto/Sys/User/CreateUpdateUserReq.cs | 10 ++-- .../Dto/Sys/User/RegisterUserReq.cs | 6 +-- .../Dto/Sys/User/ResetPasswordReq.cs | 2 +- .../Dto/Sys/User/SetAvatarReq.cs | 4 +- .../Dto/Sys/User/SetPasswordReq.cs | 4 +- .../Dto/Sys/User/SetUserEnabledReq.cs | 2 +- .../Sys/UserProfile/CreateUserProfileReq.cs | 8 ++-- .../Dto/Sys/VerifyCode/SendVerifyCodeReq.cs | 10 ++-- .../Dto/Sys/VerifyCode/VerifyCodeReq.cs | 2 +- .../NetAdmin.Host/NetAdmin.Host.csproj | 2 +- .../Enums/LogLevels.cs | 12 ++--- .../Controllers/Sys/JobController.cs | 2 +- .../Controllers/Sys/UserController.cs | 2 +- .../Controllers/Sys/VerifyCodeController.cs | 4 +- 48 files changed, 199 insertions(+), 196 deletions(-) diff --git a/src/backend/NetAdmin.AdmServer.Tests/AllTests.cs b/src/backend/NetAdmin.AdmServer.Tests/AllTests.cs index 79d77d27..a73e2afd 100644 --- a/src/backend/NetAdmin.AdmServer.Tests/AllTests.cs +++ b/src/backend/NetAdmin.AdmServer.Tests/AllTests.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; using System.Net.Http.Json; using Microsoft.AspNetCore.Mvc.Testing; -using NetAdmin.Application.Modules; using NetAdmin.AdmServer.Host; +using NetAdmin.Application.Modules; using NetAdmin.Domain.Dto.Dependency; using NetAdmin.Domain.Dto.Sys.Api; using NetAdmin.Domain.Dto.Sys.Cache; @@ -81,8 +81,8 @@ public class AllTests(WebApplicationFactory factory, ITestOutputHelper } /// - [Theory] [InlineData(default)] + [Theory] public async Task> GetAllEntriesAsync(PagedQueryReq req) { var rsp = await PostAsync("/api/sys/cache/get.all.entries" diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs index 223ee964..450c6f92 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs @@ -7,8 +7,8 @@ namespace NetAdmin.Domain.DbMaps.Dependency; public abstract record ImmutableEntity : ImmutableEntity { /// - [Snowflake] [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [Snowflake] public override long Id { get; init; } } @@ -19,13 +19,13 @@ public abstract record ImmutableEntity : ImmutableEntity public abstract record ImmutableEntity : LiteImmutableEntity, IFieldCreatedUser { /// - [JsonIgnore] [Column(CanUpdate = false, Position = -1)] + [JsonIgnore] public long? CreatedUserId { get; init; } /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] + [JsonIgnore] public virtual string CreatedUserName { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs index 299f5a6d..35b9f491 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteImmutableEntity.cs @@ -7,8 +7,8 @@ namespace NetAdmin.Domain.DbMaps.Dependency; public abstract record LiteImmutableEntity : LiteImmutableEntity { /// - [Snowflake] [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [Snowflake] public override long Id { get; init; } } @@ -19,12 +19,12 @@ public abstract record LiteImmutableEntity : LiteImmutableEntity public abstract record LiteImmutableEntity : EntityBase, IFieldPrimary, IFieldCreatedTime { /// - [JsonIgnore] [Column(ServerTime = DateTimeKind.Utc, CanUpdate = false, Position = -1)] + [JsonIgnore] public virtual DateTime CreatedTime { get; init; } /// - [JsonIgnore] [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [JsonIgnore] public virtual 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 2b15f9fb..8bdaed84 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteMutableEntity.cs @@ -7,8 +7,8 @@ namespace NetAdmin.Domain.DbMaps.Dependency; public abstract record LiteMutableEntity : LiteMutableEntity { /// - [Snowflake] [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [Snowflake] public override long Id { get; init; } } @@ -22,7 +22,7 @@ public abstract record LiteMutableEntity : LiteImmutableEntity, IFieldModi public override T Id { get; init; } /// - [JsonIgnore] [Column(ServerTime = DateTimeKind.Utc, CanInsert = false, Position = -1)] + [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 582d6770..17219d19 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/LiteVersionEntity.cs @@ -7,8 +7,8 @@ namespace NetAdmin.Domain.DbMaps.Dependency; public abstract record LiteVersionEntity : LiteVersionEntity { /// - [Snowflake] [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [Snowflake] public override long Id { get; init; } } @@ -22,7 +22,7 @@ public abstract record LiteVersionEntity : LiteMutableEntity, IFieldVersio public override T Id { get; init; } /// - [JsonIgnore] [Column(IsVersion = true, Position = -1)] + [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 8c030a29..5fd8fb19 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs @@ -7,8 +7,8 @@ namespace NetAdmin.Domain.DbMaps.Dependency; public abstract record MutableEntity : MutableEntity { /// - [Snowflake] [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [Snowflake] public override long Id { get; init; } } @@ -22,12 +22,12 @@ public abstract record MutableEntity : LiteMutableEntity, IFieldModifiedUs public override T Id { get; init; } /// - [JsonIgnore] [Column(CanInsert = false, Position = -1)] + [JsonIgnore] public long? ModifiedUserId { get; init; } /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanInsert = false, Position = -1)] + [JsonIgnore] public string ModifiedUserName { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs index f9c724f5..958f6765 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs @@ -7,8 +7,8 @@ namespace NetAdmin.Domain.DbMaps.Dependency; public abstract record VersionEntity : VersionEntity { /// - [Snowflake] [Column(IsIdentity = false, IsPrimary = true, Position = 1)] + [Snowflake] public override long Id { get; init; } } @@ -18,13 +18,13 @@ public abstract record VersionEntity : VersionEntity public abstract record VersionEntity : LiteVersionEntity, IFieldModifiedUser, IFieldCreatedUser { /// - [JsonIgnore] [Column(CanUpdate = false, Position = -1)] + [JsonIgnore] public virtual long? CreatedUserId { get; init; } /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] + [JsonIgnore] public virtual string CreatedUserName { get; init; } /// @@ -32,12 +32,12 @@ public abstract record VersionEntity : LiteVersionEntity, IFieldModifiedUs public override T Id { get; init; } /// - [JsonIgnore] [Column(CanInsert = false, Position = -1)] + [JsonIgnore] public virtual long? ModifiedUserId { get; init; } /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanInsert = false, Position = -1)] + [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 8ad0062d..70c096f2 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs @@ -17,29 +17,29 @@ public record Sys_Api : ImmutableEntity, IFieldSummary public IEnumerable Children { get; init; } /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127, IsIdentity = false, IsPrimary = true, Position = 1)] + [JsonIgnore] public override string Id { get; init; } /// /// 请求方式 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] + [JsonIgnore] public virtual string Method { get; init; } /// /// 服务名称 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string Name { get; init; } /// /// 命名空间 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] #pragma warning disable CA1716 public virtual string Namespace { get; init; } #pragma warning restore CA1716 @@ -47,8 +47,8 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// /// 父编号 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string ParentId { get; init; } /// @@ -61,7 +61,7 @@ public record Sys_Api : ImmutableEntity, IFieldSummary /// /// 服务描述 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [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 a8ca3806..9086f3aa 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs @@ -12,15 +12,15 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// /// 是否启用 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool Enabled { get; init; } /// /// 用户注册是否需要人工确认 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool UserRegisterConfirm { get; init; } /// @@ -33,8 +33,8 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// /// 用户注册默认部门编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long UserRegisterDeptId { get; init; } /// @@ -47,7 +47,7 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// /// 用户注册默认角色编号 /// - [JsonIgnore] [Column] + [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 240dfd0a..a5246585 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs @@ -19,22 +19,22 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// /// 是否启用 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool Enabled { get; init; } /// /// 部门名称 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string Name { get; init; } /// /// 父编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long ParentId { get; init; } /// @@ -54,14 +54,14 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort /// /// 排序值，越大越前 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long Sort { get; init; } /// /// 部门描述 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [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 3ddeb475..4150bb67 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs @@ -5,8 +5,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 字典目录表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_DicCatalog))] [Index($"idx_{{tablename}}_{nameof(Code)}", nameof(Code), true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_DicCatalog))] public record Sys_DicCatalog : VersionEntity { /// @@ -19,8 +19,8 @@ public record Sys_DicCatalog : VersionEntity /// /// 字典编码 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string Code { get; init; } /// @@ -33,14 +33,14 @@ public record Sys_DicCatalog : VersionEntity /// /// 字典名称 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string Name { get; init; } /// /// 父编号 /// - [JsonIgnore] [Column] + [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 bab4f2ce..5ef34bf0 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs @@ -5,9 +5,9 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 字典内容表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_DicContent))] [Index($"idx_{{tablename}}_{nameof(CatalogId)}_{nameof(Key)}", $"{nameof(CatalogId)},{nameof(Key)}", true)] [Index($"idx_{{tablename}}_{nameof(CatalogId)}_{nameof(Value)}", $"{nameof(CatalogId)},{nameof(Value)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_DicContent))] public record Sys_DicContent : VersionEntity { /// @@ -20,21 +20,21 @@ public record Sys_DicContent : VersionEntity /// /// 字典目录编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long CatalogId { get; init; } /// /// 键名称 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string Key { get; init; } /// /// 键值 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [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 76c25096..ee9d9ac6 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs @@ -12,103 +12,103 @@ namespace NetAdmin.Domain.DbMaps.Sys; public record Sys_Job : VersionEntity, IFieldEnabled, IFieldSummary { /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool Enabled { get; init; } /// /// 执行时间计划 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string ExecutionCron { get; init; } /// /// 请求方法 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual HttpMethods HttpMethod { get; init; } /// /// 作业名称 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string JobName { get; init; } /// /// 上次执行时间 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual DateTime? LastExecTime { get; init; } /// /// 上次执行状态 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual HttpStatusCode? LastStatusCode { get; init; } /// /// 下次执行时间 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual DateTime? NextExecTime { get; init; } /// /// 下次执行时间编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long? NextTimeId { get; init; } /// /// 请求体 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string RequestBody { get; init; } /// /// 请求头 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string RequestHeader { get; init; } /// /// 请求的网络地址 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string RequestUrl { get; init; } /// /// 作业状态 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual JobStatues Status { get; init; } /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string Summary { get; init; } /// /// 执行用户 /// - [Navigate(nameof(UserId))] [JsonIgnore] + [Navigate(nameof(UserId))] public Sys_User User { get; init; } /// /// 执行用户编号 /// - [JsonIgnore] [Column] + [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 f20de677..4d23be05 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs @@ -6,8 +6,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 计划作业执行记录表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_JobRecord))] [Index($"idx_{{tablename}}_{nameof(JobId)}_{nameof(TimeId)}", $"{nameof(JobId)},{nameof(TimeId)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_JobRecord))] public record Sys_JobRecord : LiteImmutableEntity { /// @@ -20,8 +20,8 @@ public record Sys_JobRecord : LiteImmutableEntity /// /// 请求方法 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual HttpMethods HttpMethod { get; init; } /// @@ -34,8 +34,8 @@ public record Sys_JobRecord : LiteImmutableEntity /// /// 拥有者信息 /// - [Navigate(nameof(JobId))] [JsonIgnore] + [Navigate(nameof(JobId))] public Sys_Job Job { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs index a82961ec..3a64e64e 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs @@ -7,15 +7,15 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 菜单表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_Menu))] [Index($"idx_{{tablename}}_{nameof(Name)}", nameof(Name), true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_Menu))] public record Sys_Menu : VersionEntity, IFieldSort { /// /// 子节点或详情页需要高亮的上级菜单路由地址 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string Active { get; init; } /// @@ -28,71 +28,71 @@ public record Sys_Menu : VersionEntity, IFieldSort /// /// 背景颜色 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_7)] + [JsonIgnore] public virtual string Color { get; init; } /// /// 组件 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string Component { get; init; } /// /// 是否整页路由 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool FullPageRouting { get; init; } /// /// 是否隐藏菜单 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool Hidden { get; init; } /// /// 是否隐藏面包屑 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool HiddenBreadCrumb { get; init; } /// /// 图标 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string Icon { get; init; } /// /// 菜单名称 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string Name { get; init; } /// /// 父编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long ParentId { get; init; } /// /// 菜单路径 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string Path { get; init; } /// /// 重定向地址 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string Redirect { get; init; } /// @@ -105,28 +105,28 @@ public record Sys_Menu : VersionEntity, IFieldSort /// /// 排序值，越大越前 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long Sort { get; init; } /// /// 标签 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string Tag { get; init; } /// /// 菜单标题 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string Title { get; init; } /// /// 菜单类型 /// - [JsonIgnore] [Column] + [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 ea3ce17a..2887eb26 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs @@ -6,9 +6,9 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 请求日志表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_RequestLog))] [Index($"idx_{{tablename}}_{nameof(ApiId)}", nameof(ApiId), false)] [Index($"idx_{{tablename}}_{nameof(CreatedTime)}", nameof(CreatedTime), false)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_RequestLog))] public record Sys_RequestLog : ImmutableEntity, IFieldCreatedClient { /// diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs index e88eeaad..2636e319 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs @@ -8,8 +8,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 角色表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_Role))] [Index("idx_{tablename}_01", nameof(Name), true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_Role))] public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary, IRegister { /// @@ -22,8 +22,8 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// /// 数据范围 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual DataScopes DataScope { get; init; } /// @@ -36,22 +36,22 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// /// 是否显示仪表板 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool DisplayDashboard { get; init; } /// /// 是否启用 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool Enabled { get; init; } /// /// 是否忽略权限控制 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool IgnorePermissionControl { get; init; } /// @@ -64,8 +64,8 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// /// 角色名称 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string Name { get; init; } /// @@ -78,15 +78,15 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// /// 排序值，越大越前 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long Sort { get; init; } /// /// 备注 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string Summary { 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 7aa7be29..db20f4fe 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs @@ -17,8 +17,8 @@ public record Sys_RoleApi : ImmutableEntity /// /// 接口编号 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public string ApiId { get; init; } /// @@ -30,7 +30,7 @@ public record Sys_RoleApi : ImmutableEntity /// /// 角色编号 /// - [JsonIgnore] [Column] + [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 96da168a..e4c451b1 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs @@ -5,8 +5,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 角色-部门映射表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_RoleDept))] [Index($"idx_{{tablename}}_{nameof(RoleId)}_{nameof(DeptId)}", $"{nameof(RoleId)},{nameof(DeptId)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_RoleDept))] public record Sys_RoleDept : ImmutableEntity { /// @@ -18,8 +18,8 @@ public record Sys_RoleDept : ImmutableEntity /// /// 可访问的部门编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public long DeptId { get; init; } /// @@ -31,7 +31,7 @@ public record Sys_RoleDept : ImmutableEntity /// /// 角色编号 /// - [JsonIgnore] [Column] + [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 a1edcb93..f82832da 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs @@ -5,8 +5,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 角色-菜单映射表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_RoleMenu))] [Index($"idx_{{tablename}}_{nameof(RoleId)}_{nameof(MenuId)}", $"{nameof(RoleId)},{nameof(MenuId)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_RoleMenu))] public record Sys_RoleMenu : ImmutableEntity { /// @@ -18,8 +18,8 @@ public record Sys_RoleMenu : ImmutableEntity /// /// 菜单编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long MenuId { get; init; } /// @@ -31,7 +31,7 @@ public record Sys_RoleMenu : ImmutableEntity /// /// 角色编号 /// - [JsonIgnore] [Column] + [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 05dcae71..dcf87705 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs @@ -14,8 +14,8 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// /// 消息内容 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string Content { get; init; } /// @@ -55,15 +55,15 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// /// 消息摘要 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string Summary { get; init; } /// /// 消息主题 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string Title { 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 65940933..debfd4b7 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs @@ -5,8 +5,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信-部门映射表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgDept))] [Index($"idx_{{tablename}}_{nameof(DeptId)}_{nameof(SiteMsgId)}", $"{nameof(DeptId)},{nameof(SiteMsgId)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgDept))] public record Sys_SiteMsgDept : ImmutableEntity { /// @@ -18,8 +18,8 @@ public record Sys_SiteMsgDept : ImmutableEntity /// /// 部门编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public long DeptId { get; init; } /// @@ -31,7 +31,7 @@ public record Sys_SiteMsgDept : ImmutableEntity /// /// 站内信编号 /// - [JsonIgnore] [Column] + [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 a41deec6..35addc2e 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs @@ -6,25 +6,28 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信标记表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgFlag))] [Index($"idx_{{tablename}}_{nameof(SiteMsgId)}_{nameof(UserId)}", $"{nameof(SiteMsgId)},{nameof(UserId)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgFlag))] public record Sys_SiteMsgFlag : MutableEntity { /// /// 站内信编号 /// + [Column] [JsonIgnore] public virtual long SiteMsgId { get; init; } /// /// 用户编号 /// + [Column] [JsonIgnore] public long UserId { get; init; } /// /// 用户站内信状态 /// + [Column] [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 4a7f2c07..08af8f6d 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs @@ -5,8 +5,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信-角色映射表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgRole))] [Index($"idx_{{tablename}}_{nameof(RoleId)}_{nameof(SiteMsgId)}", $"{nameof(RoleId)},{nameof(SiteMsgId)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgRole))] public record Sys_SiteMsgRole : ImmutableEntity { /// @@ -18,8 +18,8 @@ public record Sys_SiteMsgRole : ImmutableEntity /// /// 角色编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public long RoleId { get; init; } /// @@ -31,7 +31,7 @@ public record Sys_SiteMsgRole : ImmutableEntity /// /// 站内信编号 /// - [JsonIgnore] [Column] + [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 a714eb41..15e2c2ac 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs @@ -5,8 +5,8 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信-用户映射表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgUser))] [Index($"idx_{{tablename}}_{nameof(UserId)}_{nameof(SiteMsgId)}", $"{nameof(UserId)},{nameof(SiteMsgId)}", true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_SiteMsgUser))] public record Sys_SiteMsgUser : ImmutableEntity { /// @@ -18,8 +18,8 @@ public record Sys_SiteMsgUser : ImmutableEntity /// /// 站内信编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public long SiteMsgId { get; init; } /// @@ -31,7 +31,7 @@ public record Sys_SiteMsgUser : ImmutableEntity /// /// 用户编号 /// - [JsonIgnore] [Column] + [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 1d776c08..e9e57ac3 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs @@ -7,17 +7,17 @@ namespace NetAdmin.Domain.DbMaps.Sys; /// /// 用户基本信息表 /// -[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_User))] -[Index($"idx_{{tablename}}_{nameof(UserName)}", nameof(UserName), true)] -[Index($"idx_{{tablename}}_{nameof(Mobile)}", nameof(Mobile), true)] [Index($"idx_{{tablename}}_{nameof(Email)}", nameof(Email), true)] +[Index($"idx_{{tablename}}_{nameof(Mobile)}", nameof(Mobile), true)] +[Index($"idx_{{tablename}}_{nameof(UserName)}", nameof(UserName), true)] +[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_User))] public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister { /// /// 头像链接 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string Avatar { get; init; } /// @@ -30,36 +30,36 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// /// 部门编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual long DeptId { get; init; } /// /// 邮箱 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string Email { get; init; } /// /// 是否启用 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual bool Enabled { get; init; } /// /// 手机号 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] + [JsonIgnore] public virtual string Mobile { get; init; } /// /// 密码 /// - [JsonIgnore] [Column] + [JsonIgnore] public Guid Password { get; init; } /// @@ -85,22 +85,22 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// /// 描述 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public virtual string Summary { get; init; } /// /// 授权验证Token，全局唯一，可以随时重置（强制下线） /// - [JsonIgnore] [Column] + [JsonIgnore] public Guid Token { get; init; } /// /// 用户名 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [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 3bab847c..340b16ba 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs @@ -12,170 +12,170 @@ public record Sys_UserProfile : VersionEntity, IRegister /// /// 出生日期 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual DateTime? BornDate { get; init; } /// /// 证件号码 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string CertificateNumber { get; init; } /// /// 证件类型 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual CertificateTypes? CertificateType { get; init; } /// /// 工作地址 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string CompanyAddress { get; init; } /// /// 工作地区 /// - [JsonIgnore] [Column] + [JsonIgnore] public int? CompanyArea { get; init; } /// /// 工作单位 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string CompanyName { get; init; } /// /// 工作电话 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string CompanyTelephone { get; init; } /// /// 文化程度 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual Educations? Education { get; init; } /// /// 紧急联系地址 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string EmergencyContactAddress { get; init; } /// /// 紧急联系地区 /// - [JsonIgnore] [Column] + [JsonIgnore] public int? EmergencyContactArea { get; init; } /// /// 紧急联系人手机号 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] + [JsonIgnore] public virtual string EmergencyContactMobile { get; init; } /// /// 紧急联系人 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string EmergencyContactName { get; init; } /// /// 毕业学校 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string GraduateSchool { get; init; } /// /// 身高 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual int? Height { get; init; } /// /// 住宅地址 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] + [JsonIgnore] public virtual string HomeAddress { get; init; } /// /// 住宅地区 /// - [JsonIgnore] [Column] + [JsonIgnore] public int? HomeArea { get; init; } /// /// 住宅电话 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string HomeTelephone { get; init; } /// /// 婚姻状况 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual MarriageStatues? MarriageStatus { get; init; } /// /// 民族 /// /// 7 - [JsonIgnore] [Column] + [JsonIgnore] public virtual Nations? Nation { get; init; } /// /// 籍贯 /// - [JsonIgnore] [Column] + [JsonIgnore] public int? NationArea { get; init; } /// /// 政治面貌 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual PoliticalStatues? PoliticalStatus { get; init; } /// /// 职业 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string Profession { get; init; } /// /// 真实姓名 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31)] + [JsonIgnore] public virtual string RealName { get; init; } /// /// 性别 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual Sexes? Sex { 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 1a58b4c2..9706b102 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs @@ -17,8 +17,8 @@ public record Sys_UserRole : VersionEntity /// /// 角色编号 /// - [JsonIgnore] [Column] + [JsonIgnore] public long RoleId { get; init; } /// @@ -30,7 +30,7 @@ public record Sys_UserRole : VersionEntity /// /// 用户编号 /// - [JsonIgnore] [Column] + [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 fa141557..7e2bb7e4 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs @@ -12,42 +12,42 @@ public record Sys_VerifyCode : VersionEntity /// /// 验证码 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_7)] + [JsonIgnore] public virtual string Code { get; init; } /// /// 目标设备 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)] + [JsonIgnore] public virtual string DestDevice { get; init; } /// /// 设备类型 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual VerifyCodeDeviceTypes DeviceType { get; init; } /// /// 发送报告 /// - [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] + [JsonIgnore] public string Report { get; init; } /// /// 验证码状态 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual VerifyCodeStatues Status { get; init; } /// /// 验证码类型 /// - [JsonIgnore] [Column] + [JsonIgnore] public virtual VerifyCodeTypes Type { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Dependency/BulkReq.cs b/src/backend/NetAdmin.Domain/Dto/Dependency/BulkReq.cs index 85dfee3b..db5d48a7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Dependency/BulkReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Dependency/BulkReq.cs @@ -9,8 +9,8 @@ public sealed record BulkReq : DataAbstraction /// /// 请求对象 /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.请求对象不能为空))] - [MinLength(1)] [MaxLength(Numbers.MAX_LIMIT_BULK_REQ)] + [MinLength(1)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.请求对象不能为空))] public IEnumerable Items { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs index 56696b08..80483d7b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs @@ -16,15 +16,15 @@ public record CreateJobReq : Sys_Job public override bool Enabled { get; init; } = true; /// - [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [Cron] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.时间计划不能为空))] public override string ExecutionCron { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [EnumDataType(typeof(HttpMethods), ErrorMessageResourceType = typeof(Ln) , ErrorMessageResourceName = nameof(Ln.请求方法不正确))] + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override HttpMethods HttpMethod { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs index 620b9275..749b8af7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs @@ -16,21 +16,21 @@ public record CreateSiteMsgReq : Sys_SiteMsg /// /// 部门编号列表 /// - [MinLength(1)] [MaxLength(Numbers.MAX_LIMIT_BULK_REQ)] + [MinLength(1)] public IReadOnlyCollection DeptIds { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [EnumDataType(typeof(SiteMsgTypes), ErrorMessageResourceType = typeof(Ln) , ErrorMessageResourceName = nameof(Ln.站内信类型不正确))] + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override SiteMsgTypes MsgType { get; init; } /// /// 角色编号列表 /// - [MinLength(1)] [MaxLength(Numbers.MAX_LIMIT_BULK_REQ)] + [MinLength(1)] public IReadOnlyCollection RoleIds { get; init; } /// @@ -41,7 +41,7 @@ public record CreateSiteMsgReq : Sys_SiteMsg /// /// 用户编号列表 /// - [MinLength(1)] [MaxLength(Numbers.MAX_LIMIT_BULK_REQ)] + [MinLength(1)] public IReadOnlyCollection UserIds { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs index 33d61bf2..442d5214 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs @@ -13,8 +13,8 @@ public record CreateSiteMsgFlagReq : Sys_SiteMsgFlag public override long SiteMsgId { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [EnumDataType(typeof(UserSiteMsgStatues), ErrorMessageResourceType = typeof(Ln) , ErrorMessageResourceName = nameof(Ln.站内信状态不正确))] + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override UserSiteMsgStatues UserSiteMsgStatus { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs index b6637f16..ba06098e 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs @@ -9,8 +9,8 @@ namespace NetAdmin.Domain.Dto.Sys.User; public sealed record CheckMobileAvailableReq : Sys_User { /// + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [Mobile] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.手机号码不能为空))] - [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Mobile { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateUpdateUserReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateUpdateUserReq.cs index 5cb6ae08..f1ce026c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateUpdateUserReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/CreateUpdateUserReq.cs @@ -10,8 +10,8 @@ namespace NetAdmin.Domain.Dto.Sys.User; public abstract record CreateUpdateUserReq : Sys_User { /// - [Url(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.网络地址不正确))] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Url(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.网络地址不正确))] public override string Avatar { get; init; } /// @@ -28,8 +28,8 @@ public abstract record CreateUpdateUserReq : Sys_User public override bool Enabled { get; init; } /// - [Mobile] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Mobile] public override string Mobile { get; init; } /// @@ -41,9 +41,9 @@ public abstract record CreateUpdateUserReq : Sys_User /// /// 角色编号列表 /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.角色编号列表不能为空))] - [MinLength(1)] [MaxLength(Numbers.MAX_LIMIT_BULK_REQ)] + [MinLength(1)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.角色编号列表不能为空))] public IReadOnlyCollection RoleIds { get; init; } /// @@ -51,8 +51,8 @@ public abstract record CreateUpdateUserReq : Sys_User public override string Summary { get; init; } /// + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))] [UserName] - [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string UserName { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs index ad02633c..26a3706c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs @@ -12,9 +12,9 @@ public sealed record RegisterUserReq : Sys_User /// /// 密码 /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.密码不能为空))] - [Password] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [Password] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.密码不能为空))] public string PasswordText { get; init; } /// @@ -24,9 +24,9 @@ public sealed record RegisterUserReq : Sys_User public IReadOnlyCollection RoleIds { get; init; } /// + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))] [UserName] - [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string UserName { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs index 669f520f..29906b96 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs @@ -11,8 +11,8 @@ public sealed record ResetPasswordReq : DataAbstraction /// /// 密码 /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.密码不能为空))] [Password] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.密码不能为空))] public string PasswordText { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs index 730b7c90..758bf1f6 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs @@ -8,8 +8,8 @@ namespace NetAdmin.Domain.Dto.Sys.User; public sealed record SetAvatarReq : Sys_User { /// - [Url(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.网络地址不正确))] - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户头像不能为空))] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户头像不能为空))] + [Url(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.网络地址不正确))] public override string Avatar { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs index 4feb378a..4d53a2e1 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs @@ -10,14 +10,14 @@ public sealed record SetPasswordReq : DataAbstraction /// /// 新密码 /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.新密码不能为空))] [Password] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.新密码不能为空))] public string NewPassword { get; init; } /// /// 旧密码 /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.旧密码不能为空))] [Password] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.旧密码不能为空))] public string OldPassword { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs index 0a0f255e..e3485a00 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs @@ -13,7 +13,7 @@ public sealed record SetUserEnabledReq : Sys_User public override bool Enabled { get; init; } /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户编号不能为空))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户编号不能为空))] public override long Id { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs index 67e58f7a..594a3d2c 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs @@ -36,8 +36,8 @@ public record CreateUserProfileReq : Sys_UserProfile public override string CompanyName { get; init; } /// - [Telephone] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Telephone] public override string CompanyTelephone { get; init; } /// @@ -54,8 +54,8 @@ public record CreateUserProfileReq : Sys_UserProfile public new QueryDicContentRsp EmergencyContactArea { get; init; } /// - [Mobile] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Mobile] public override string EmergencyContactMobile { get; init; } /// @@ -79,8 +79,8 @@ public record CreateUserProfileReq : Sys_UserProfile public new QueryDicContentRsp HomeArea { get; init; } /// - [Telephone] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Telephone] public override string HomeTelephone { get; init; } /// @@ -98,9 +98,9 @@ public record CreateUserProfileReq : Sys_UserProfile public new CreateDicContentReq NationArea { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [EnumDataType(typeof(PoliticalStatues), ErrorMessageResourceType = typeof(Ln) , ErrorMessageResourceName = nameof(Ln.政治面貌不正确))] + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override PoliticalStatues? PoliticalStatus { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs index 6a273a39..3044492b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs @@ -11,25 +11,25 @@ namespace NetAdmin.Domain.Dto.Sys.VerifyCode; public sealed record SendVerifyCodeReq : Sys_VerifyCode, IValidatableObject { /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.目标设备不能为空))] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.目标设备不能为空))] public override string DestDevice { get; init; } /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.设备类型不能为空))] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [EnumDataType(typeof(VerifyCodeDeviceTypes), ErrorMessageResourceType = typeof(Ln) , ErrorMessageResourceName = nameof(Ln.验证码目标设备类型不正确))] + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.设备类型不能为空))] public override VerifyCodeDeviceTypes DeviceType { get; init; } /// public override VerifyCodeStatues Status => VerifyCodeStatues.Waiting; /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.验证码类型不能为空))] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [EnumDataType(typeof(VerifyCodeTypes), ErrorMessageResourceType = typeof(Ln) , ErrorMessageResourceName = nameof(Ln.验证码类型不正确))] + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.验证码类型不能为空))] public override VerifyCodeTypes Type { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs index 17004883..6011f228 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs @@ -9,8 +9,8 @@ namespace NetAdmin.Domain.Dto.Sys.VerifyCode; public abstract record VerifyCodeReq : Sys_VerifyCode { /// - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.验证码不能为空))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.验证码不能为空))] [VerifyCode] public override string Code { get; init; } diff --git a/src/backend/NetAdmin.Host/NetAdmin.Host.csproj b/src/backend/NetAdmin.Host/NetAdmin.Host.csproj index 00679f33..59c35c58 100644 --- a/src/backend/NetAdmin.Host/NetAdmin.Host.csproj +++ b/src/backend/NetAdmin.Host/NetAdmin.Host.csproj @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Enums/LogLevels.cs b/src/backend/NetAdmin.Infrastructure/Enums/LogLevels.cs index d472f8ae..28cafeb0 100644 --- a/src/backend/NetAdmin.Infrastructure/Enums/LogLevels.cs +++ b/src/backend/NetAdmin.Infrastructure/Enums/LogLevels.cs @@ -8,8 +8,8 @@ public enum LogLevels /// /// 跟踪 /// - [ResourceDescription(nameof(Ln.跟踪))] [Display(Name = "[gray]TCE[/]", ShortName = "TCE")] + [ResourceDescription(nameof(Ln.跟踪))] Trace = 0 , @@ -17,8 +17,8 @@ public enum LogLevels /// /// 调试 /// - [ResourceDescription(nameof(Ln.调试))] [Display(Name = "[gray]DBG[/]", ShortName = "DBG")] + [ResourceDescription(nameof(Ln.调试))] Debug = 1 , @@ -26,8 +26,8 @@ public enum LogLevels /// /// 信息 /// - [ResourceDescription(nameof(Ln.信息))] [Display(Name = "[green]INF[/]", ShortName = "INF")] + [ResourceDescription(nameof(Ln.信息))] Information = 2 , @@ -35,8 +35,8 @@ public enum LogLevels /// /// 警告 /// - [ResourceDescription(nameof(Ln.警告))] [Display(Name = "[yellow]WRN[/]", ShortName = "WRN")] + [ResourceDescription(nameof(Ln.警告))] Warning = 3 , @@ -44,8 +44,8 @@ public enum LogLevels /// /// 错误 /// - [ResourceDescription(nameof(Ln.错误))] [Display(Name = "[red]ERR[/]", ShortName = "ERR")] + [ResourceDescription(nameof(Ln.错误))] Error = 4 , @@ -53,7 +53,7 @@ public enum LogLevels /// /// 宕机 /// - [ResourceDescription(nameof(Ln.宕机))] [Display(Name = "[red]CTL[/]", ShortName = "CTL")] + [ResourceDescription(nameof(Ln.宕机))] Critical = 5 } \ No newline at end of file diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs index c2c039a5..fca95089 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs @@ -144,8 +144,8 @@ public sealed class JobController(IJobCache cache) : ControllerBase /// 更新计划作业 /// - [Transaction] [NonAction] + [Transaction] public Task UpdateAsync(UpdateJobReq req) { return Cache.UpdateAsync(req); diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs index 56292c6d..bdf542ab 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs @@ -138,8 +138,8 @@ public sealed class UserController(IUserCache cache, IConfigCache configCache) /// /// 注册用户 /// - [Transaction] [AllowAnonymous] + [Transaction] public async Task RegisterAsync(RegisterUserReq req) { var config = await configCache.GetLatestConfigAsync().ConfigureAwait(false); diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs index d9734eb6..82da5b41 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs @@ -89,8 +89,8 @@ public sealed class VerifyCodeController(IVerifyCodeCache cache, ICaptchaCache c /// /// 发送验证码 /// - [Transaction] [AllowAnonymous] + [Transaction] public async Task SendVerifyCodeAsync(SendVerifyCodeReq req) { await captchaCache.VerifyCaptchaAndRemoveAsync(req.VerifyCaptchaReq).ConfigureAwait(false); @@ -109,8 +109,8 @@ public sealed class VerifyCodeController(IVerifyCodeCache cache, ICaptchaCache c /// /// 完成验证 /// - [Transaction] [AllowAnonymous] + [Transaction] public Task VerifyAsync(VerifyCodeReq req) { return Cache.VerifyAsync(req);