diff --git a/assets/res/Statements.ln b/assets/res/Statements.ln index 655633cd..d8e5f83d 100644 --- a/assets/res/Statements.ln +++ b/assets/res/Statements.ln @@ -15,17 +15,21 @@ XML注释文件不存在 唯一编码不能为空 图标代码不能为空 图标名称不能为空 +婚姻状况不正确 字典名称不能为空 字典目录不存在 字典目录编号不能为空 字典编码不能为空 +学历不正确 密码不能为空 已处理完毕 开始事务 +性别不正确 手机号码不正确 手机号码不能为空 接口编码不存在 支付宝账号 +政治面貌不正确 数据库同步开始 数据库服务器时钟偏移 数据库结构同步完成 @@ -47,6 +51,7 @@ XML注释文件不存在 未获取到待执行任务 模块名称不能为空 模块说明不能为空 +民族不正确 消息主题不能为空 消息内容不能为空 父节点不存在 @@ -61,16 +66,21 @@ XML注释文件不存在 目标设备不能为空 短信验证请求不能为空 站内信不存在 +站内信状态不正确 +站内信类型不正确 签名缺失 网络地址不正确 菜单名称不能为空 菜单标题不能为空 +菜单类型不正确 菜单编号不能为空 角色不存在 角色名称不能为空 +角色数据范围不正确 角色编号不能为空 角色编号列表不能为空 设备类型不能为空 +证件类型不正确 该角色下存在用户 该部门下存在子部门 该部门下存在用户 @@ -90,4 +100,6 @@ XML注释文件不存在 验证数据不能为空 验证码不正确 验证码不能为空 +验证码目标设备类型不正确 +验证码类型不正确 验证码类型不能为空 \ No newline at end of file diff --git a/src/backend/NetAdmin.Application/Services/IService.cs b/src/backend/NetAdmin.Application/Services/IService.cs index 62025b6b..48bc95a2 100644 --- a/src/backend/NetAdmin.Application/Services/IService.cs +++ b/src/backend/NetAdmin.Application/Services/IService.cs @@ -10,7 +10,7 @@ public interface IService /// /// 服务编号 /// - Guid ServiceId { get; set; } + Guid ServiceId { get; init; } /// /// 上下文用户令牌 diff --git a/src/backend/NetAdmin.Application/Services/ServiceBase.cs b/src/backend/NetAdmin.Application/Services/ServiceBase.cs index ac8ad622..174c0e0e 100644 --- a/src/backend/NetAdmin.Application/Services/ServiceBase.cs +++ b/src/backend/NetAdmin.Application/Services/ServiceBase.cs @@ -34,7 +34,7 @@ public abstract class ServiceBase : IScoped, IService } /// - public Guid ServiceId { get; set; } + public Guid ServiceId { get; init; } /// public ContextUserToken UserToken { get; set; } diff --git a/src/backend/NetAdmin.Cache/DistributedCache.cs b/src/backend/NetAdmin.Cache/DistributedCache.cs index 6709c373..828fbb38 100644 --- a/src/backend/NetAdmin.Cache/DistributedCache.cs +++ b/src/backend/NetAdmin.Cache/DistributedCache.cs @@ -52,7 +52,7 @@ public abstract class DistributedCache : CacheBase /// 获取缓存键 /// - protected virtual string GetCacheKey(string id = "0", [CallerMemberName] string memberName = null) + protected string GetCacheKey(string id = "0", [CallerMemberName] string memberName = null) { return $"{GetType().FullName}.{memberName}.{id}"; } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldCreatedUser.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldCreatedUser.cs index 4591804c..cd6200d4 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldCreatedUser.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/Fields/IFieldCreatedUser.cs @@ -13,5 +13,5 @@ public interface IFieldCreatedUser /// /// 创建者用户名 /// - string CreatedUserName { get; set; } + string CreatedUserName { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs index 78f580c2..223ee964 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/ImmutableEntity.cs @@ -26,7 +26,7 @@ public abstract record ImmutableEntity : LiteImmutableEntity, IFieldCreate /// [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] - public virtual string CreatedUserName { get; set; } + public virtual string CreatedUserName { get; init; } /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs index 68563c49..83840775 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Dependency/VersionEntity.cs @@ -25,7 +25,7 @@ public abstract record VersionEntity : LiteVersionEntity, IFieldModifiedUs /// [JsonIgnore] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanUpdate = false, Position = -1)] - public string CreatedUserName { get; set; } + public string CreatedUserName { get; init; } /// [Column(IsIdentity = false, IsPrimary = true, Position = 1)] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs index 73a89a8c..35cc7384 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs @@ -21,7 +21,7 @@ public record Sys_Config : VersionEntity, IFieldEnabled /// [JsonIgnore] [Column] - public virtual bool UserRegisterConfirm { get; set; } + public virtual bool UserRegisterConfirm { get; init; } /// /// 用户注册默认部门 diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs index 14d75874..c58f61e3 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs @@ -15,21 +15,21 @@ public record Sys_JobRecord : LiteImmutableEntity /// [Column] [JsonIgnore] - public virtual long Duration { get; init; } + public long Duration { get; init; } /// /// 请求方法 /// [JsonIgnore] [Column] - public virtual HttpMethods HttpMethod { get; init; } + public HttpMethods HttpMethod { get; init; } /// /// HTTP 状态码 /// [Column] [JsonIgnore] - public virtual HttpStatusCode HttpStatusCode { get; init; } + public HttpStatusCode HttpStatusCode { get; init; } /// /// 作业编号 @@ -43,40 +43,40 @@ public record Sys_JobRecord : LiteImmutableEntity /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] [JsonIgnore] - public virtual string RequestBody { get; init; } + public string RequestBody { get; init; } /// /// 请求头 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] [JsonIgnore] - public virtual string RequestHeader { get; init; } + public string RequestHeader { get; init; } /// /// 请求的网络地址 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)] [JsonIgnore] - public virtual string RequestUrl { get; init; } + public string RequestUrl { get; init; } /// /// 响应体 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] [JsonIgnore] - public virtual string ResponseBody { get; init; } + public string ResponseBody { get; init; } /// /// 响应头 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] [JsonIgnore] - public virtual string ResponseHeader { get; init; } + public string ResponseHeader { get; init; } /// /// 执行时间编号 /// [Column] [JsonIgnore] - public long TimeId { get; set; } + public long TimeId { 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 602ab86b..6c8a455c 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs @@ -23,21 +23,21 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// [JsonIgnore] [Navigate(nameof(CreatedUserId))] - public virtual Sys_User Creator { get; init; } + public Sys_User Creator { get; init; } /// /// 消息-部门映射 /// [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgDept))] - public virtual ICollection Depts { get; init; } + public ICollection Depts { get; init; } /// /// 消息-标记映射 /// [JsonIgnore] [Navigate(nameof(Sys_SiteMsgFlag.SiteMsgId))] - public ICollection Flags { get; set; } + public ICollection Flags { get; init; } /// /// 消息类型 @@ -50,7 +50,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgRole))] - public virtual ICollection Roles { get; init; } + public ICollection Roles { get; init; } /// /// 消息摘要 @@ -71,7 +71,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// [JsonIgnore] [Navigate(ManyToMany = typeof(Sys_SiteMsgUser))] - public virtual ICollection Users { get; init; } + public ICollection Users { get; init; } /// public void Register(TypeAdapterConfig config) diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs index e26f1eba..7de03179 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs @@ -20,7 +20,7 @@ public record Sys_SiteMsgDept : ImmutableEntity /// [JsonIgnore] [Column] - public virtual long DeptId { get; init; } + public long DeptId { get; init; } /// /// 关联的站内信 @@ -33,5 +33,5 @@ public record Sys_SiteMsgDept : ImmutableEntity /// [JsonIgnore] [Column] - public virtual long SiteMsgId { get; init; } + 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 eca232b8..1eb710fa 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs @@ -14,17 +14,17 @@ public record Sys_SiteMsgFlag : MutableEntity /// 站内信编号 /// [JsonIgnore] - public virtual long SiteMsgId { get; set; } + public virtual long SiteMsgId { get; init; } /// /// 用户编号 /// [JsonIgnore] - public virtual long UserId { get; init; } + public long UserId { get; init; } /// /// 用户站内信状态 /// [JsonIgnore] - public virtual UserSiteMsgStatues UserSiteMsgStatus { get; set; } + 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 3a0be247..797f7393 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs @@ -20,7 +20,7 @@ public record Sys_SiteMsgRole : ImmutableEntity /// [JsonIgnore] [Column] - public virtual long RoleId { get; init; } + public long RoleId { get; init; } /// /// 关联的站内信 @@ -33,5 +33,5 @@ public record Sys_SiteMsgRole : ImmutableEntity /// [JsonIgnore] [Column] - public virtual long SiteMsgId { get; init; } + 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 7161645d..54bf6a8f 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs @@ -20,7 +20,7 @@ public record Sys_SiteMsgUser : ImmutableEntity /// [JsonIgnore] [Column] - public virtual long SiteMsgId { get; init; } + public long SiteMsgId { get; init; } /// /// 关联的用户 @@ -33,5 +33,5 @@ public record Sys_SiteMsgUser : ImmutableEntity /// [JsonIgnore] [Column] - public virtual long UserId { get; init; } + public long UserId { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Dependency/DynamicFilterInfo.cs b/src/backend/NetAdmin.Domain/Dto/Dependency/DynamicFilterInfo.cs index 4503013a..f95e0509 100644 --- a/src/backend/NetAdmin.Domain/Dto/Dependency/DynamicFilterInfo.cs +++ b/src/backend/NetAdmin.Domain/Dto/Dependency/DynamicFilterInfo.cs @@ -10,27 +10,27 @@ public record DynamicFilterInfo : DataAbstraction /// /// 字段名 /// - public string Field { get; set; } + public string Field { get; init; } /// /// 子过滤条件 /// - public List Filters { get; set; } + public List Filters { get; init; } /// /// 子过滤条件逻辑关系 /// - public DynamicFilterLogics Logic { get; set; } + public DynamicFilterLogics Logic { get; init; } /// /// 操作符 /// - public DynamicFilterOperators Operator { get; set; } + public DynamicFilterOperators Operator { get; init; } /// /// 值 /// - public object Value { get; set; } + public object Value { get; init; } /// /// 隐式转换为 FreeSql 的 DynamicFilterInfo 对象 diff --git a/src/backend/NetAdmin.Domain/Dto/Dependency/QueryReq.cs b/src/backend/NetAdmin.Domain/Dto/Dependency/QueryReq.cs index b69b191c..4bf2a645 100644 --- a/src/backend/NetAdmin.Domain/Dto/Dependency/QueryReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Dependency/QueryReq.cs @@ -25,7 +25,7 @@ public record QueryReq : DataAbstraction /// /// 查询关键字 /// - public string Keywords { get; set; } + public string Keywords { get; init; } /// /// 排序方式 diff --git a/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs b/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs index dfb92ede..08856711 100644 --- a/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs +++ b/src/backend/NetAdmin.Domain/Dto/RestfulInfo.cs @@ -19,5 +19,5 @@ public record RestfulInfo : DataAbstraction /// /// 消息 /// - public virtual object Msg { get; init; } + public object Msg { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs index 5db55870..cc4cc94b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs @@ -14,7 +14,7 @@ public record CreateConfigReq : Sys_Config /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override bool UserRegisterConfirm { get; set; } + public override bool UserRegisterConfirm { get; init; } /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs index 281583b5..95476be2 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs @@ -20,7 +20,7 @@ public sealed record QueryConfigRsp : Sys_Config /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override bool UserRegisterConfirm { get; set; } + public override bool UserRegisterConfirm { get; init; } /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/UpdateJobRecordReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/UpdateJobRecordReq.cs index b869fa1c..d262634e 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/UpdateJobRecordReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/JobRecord/UpdateJobRecordReq.cs @@ -3,4 +3,4 @@ namespace NetAdmin.Domain.Dto.Sys.JobRecord; /// /// 请求:更新计划作业执行记录 /// -public sealed record UpdateJobRecordReq : CreateJobRecordReq { } \ No newline at end of file +public sealed record UpdateJobRecordReq : CreateJobRecordReq; \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs index 04879e31..b213887f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs @@ -66,6 +66,7 @@ public sealed record MetaInfo : DataAbstraction /// /// 类型 /// - [EnumDataType(typeof(MenuTypes))] + [EnumDataType(typeof(MenuTypes), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.菜单类型不正确))] public MenuTypes Type { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs index a939e159..e466554b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs @@ -37,7 +37,7 @@ public sealed record QueryRequestLogRsp : Sys_RequestLog, IRegister /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] - public override string CreatedUserName { get; set; } + public override string CreatedUserName { get; init; } /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] @@ -102,6 +102,6 @@ public sealed record QueryRequestLogRsp : Sys_RequestLog, IRegister /// public void Register(TypeAdapterConfig config) { - _ = config.ForType().Map(dest => dest.ApiSummary, src => src.Api.Summary); + _ = config.ForType().Map(d => d.ApiSummary, s => s.Api.Summary); } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs index cbcfbb9b..cf75bf71 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs @@ -16,7 +16,8 @@ public record CreateRoleReq : Sys_Role public IReadOnlyCollection ApiIds { get; init; } /// - [EnumDataType(typeof(DataScopes))] + [EnumDataType(typeof(DataScopes), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.角色数据范围不正确))] public override DataScopes DataScope { get; init; } = DataScopes.All; /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs index 3599fb3b..3c49004f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs @@ -22,7 +22,8 @@ public record CreateSiteMsgReq : Sys_SiteMsg /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - [EnumDataType(typeof(SiteMsgTypes))] + [EnumDataType(typeof(SiteMsgTypes), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.站内信类型不正确))] public override SiteMsgTypes MsgType { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs index 2956c075..5ad9307f 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs @@ -40,7 +40,7 @@ public sealed record QuerySiteMsgRsp : Sys_SiteMsg /// /// 我的标记 /// - public QuerySiteMsgFlagRsp MyFlags { get; set; } + public QuerySiteMsgFlagRsp MyFlags { get; init; } /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs index 9991b625..33d61bf2 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs @@ -10,10 +10,11 @@ public record CreateSiteMsgFlagReq : Sys_SiteMsgFlag { /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long SiteMsgId { get; set; } + public override long SiteMsgId { get; init; } /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - [EnumDataType(typeof(UserSiteMsgStatues))] - public override UserSiteMsgStatues UserSiteMsgStatus { get; set; } + [EnumDataType(typeof(UserSiteMsgStatues), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.站内信状态不正确))] + public override UserSiteMsgStatues UserSiteMsgStatus { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs index 4d5f180c..cd447e95 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs @@ -15,5 +15,5 @@ public sealed record QuerySiteMsgFlagRsp : Sys_SiteMsgFlag /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override UserSiteMsgStatues UserSiteMsgStatus { get; set; } + public override UserSiteMsgStatues UserSiteMsgStatus { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs index 5d096dc3..8ec88611 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs @@ -13,5 +13,5 @@ public record GetModulesRsp : DataAbstraction /// /// 模块版本 /// - public string Version { get; set; } + public string Version { 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 533e79f2..9e108128 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs @@ -33,5 +33,5 @@ public record RegisterUserReq : Sys_User /// 短信验证请求 /// [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.短信验证请求不能为空))] - public VerifySmsCodeReq VerifySmsCodeReq { get; set; } + public VerifySmsCodeReq VerifySmsCodeReq { 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 8dc0d601..67e58f7a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs @@ -19,7 +19,8 @@ public record CreateUserProfileReq : Sys_UserProfile public override string CertificateNumber { get; init; } /// - [EnumDataType(typeof(CertificateTypes))] + [EnumDataType(typeof(CertificateTypes), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.证件类型不正确))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override CertificateTypes? CertificateType { get; init; } @@ -40,7 +41,8 @@ public record CreateUserProfileReq : Sys_UserProfile public override string CompanyTelephone { get; init; } /// - [EnumDataType(typeof(Educations))] + [EnumDataType(typeof(Educations), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.学历不正确))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override Educations? Education { get; init; } @@ -82,12 +84,13 @@ public record CreateUserProfileReq : Sys_UserProfile public override string HomeTelephone { get; init; } /// - [EnumDataType(typeof(MarriageStatues))] + [EnumDataType(typeof(MarriageStatues), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.婚姻状况不正确))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override MarriageStatues? MarriageStatus { get; init; } /// - [EnumDataType(typeof(Nations))] + [EnumDataType(typeof(Nations), ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.民族不正确))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override Nations? Nation { get; init; } @@ -96,7 +99,8 @@ public record CreateUserProfileReq : Sys_UserProfile /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - [EnumDataType(typeof(PoliticalStatues))] + [EnumDataType(typeof(PoliticalStatues), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.政治面貌不正确))] public override PoliticalStatues? PoliticalStatus { get; init; } /// @@ -108,7 +112,7 @@ public record CreateUserProfileReq : Sys_UserProfile public override string RealName { get; init; } /// - [EnumDataType(typeof(Sexes))] + [EnumDataType(typeof(Sexes), ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.性别不正确))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public override Sexes? Sex { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs index 93088c26..6a273a39 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs @@ -18,7 +18,8 @@ public sealed record SendVerifyCodeReq : Sys_VerifyCode, IValidatableObject /// [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.设备类型不能为空))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - [EnumDataType(typeof(VerifyCodeDeviceTypes))] + [EnumDataType(typeof(VerifyCodeDeviceTypes), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.验证码目标设备类型不正确))] public override VerifyCodeDeviceTypes DeviceType { get; init; } /// @@ -27,7 +28,8 @@ public sealed record SendVerifyCodeReq : Sys_VerifyCode, IValidatableObject /// [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.验证码类型不能为空))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - [EnumDataType(typeof(VerifyCodeTypes))] + [EnumDataType(typeof(VerifyCodeTypes), ErrorMessageResourceType = typeof(Ln) + , ErrorMessageResourceName = nameof(Ln.验证码类型不正确))] public override VerifyCodeTypes Type { get; init; } /// diff --git a/src/backend/NetAdmin.Host/BackgroundRunning/WorkBase.cs b/src/backend/NetAdmin.Host/BackgroundRunning/WorkBase.cs index 3f67c9e4..0fddaeb2 100644 --- a/src/backend/NetAdmin.Host/BackgroundRunning/WorkBase.cs +++ b/src/backend/NetAdmin.Host/BackgroundRunning/WorkBase.cs @@ -54,7 +54,7 @@ public abstract class WorkBase /// 通用工作流 /// /// 加锁失败异常 - protected virtual async ValueTask WorkflowAsync(bool singleInstance, CancellationToken cancelToken) + protected async ValueTask WorkflowAsync(bool singleInstance, CancellationToken cancelToken) { if (singleInstance) { // 加锁 diff --git a/src/backend/NetAdmin.Infrastructure/Configuration/Options/SubNodes/Redis/InstanceNode.cs b/src/backend/NetAdmin.Infrastructure/Configuration/Options/SubNodes/Redis/InstanceNode.cs index 3b86c02a..cb33bad7 100644 --- a/src/backend/NetAdmin.Infrastructure/Configuration/Options/SubNodes/Redis/InstanceNode.cs +++ b/src/backend/NetAdmin.Infrastructure/Configuration/Options/SubNodes/Redis/InstanceNode.cs @@ -13,10 +13,10 @@ public sealed record InstanceNode /// /// 数据库 /// - public int Database { get; set; } + public int Database { get; init; } /// /// 实例名称 /// - public string Name { get; set; } + public string Name { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs index 8d12c61b..17899376 100644 --- a/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs +++ b/src/backend/NetAdmin.Infrastructure/Exceptions/NetAdminException.cs @@ -30,5 +30,5 @@ public abstract class NetAdminException : Exception /// /// 错误码 /// - public ErrorCodes Code { get; set; } + public ErrorCodes Code { get; init; } } \ No newline at end of file diff --git a/src/frontend/admin/.prettierrc b/src/frontend/admin/.prettierrc index bf09cac9..a896e4e0 100644 --- a/src/frontend/admin/.prettierrc +++ b/src/frontend/admin/.prettierrc @@ -1,10 +1,13 @@ { - "tabWidth": 4, - "useTabs": false, + "attributeGroups": ["^v-", "$DEFAULT"], + "attributeSort": "ASC", + "bracketSameLine": true, + "endOfLine": "auto", + "plugins": ["prettier-plugin-organize-attributes"], + "printWidth": 150, "semi": false, "singleQuote": true, + "tabWidth": 4, "trailingComma": "all", - "bracketSameLine": true, - "printWidth": 150, - "endOfLine": "auto" + "useTabs": false } \ No newline at end of file diff --git a/src/frontend/admin/index.html b/src/frontend/admin/index.html index dda0d639..a2fa7363 100644 --- a/src/frontend/admin/index.html +++ b/src/frontend/admin/index.html @@ -99,7 +99,7 @@ -
+