diff --git a/assets/res/Statements.ln b/assets/res/Statements.ln index a8e6918c..c9da7e97 100644 --- a/assets/res/Statements.ln +++ b/assets/res/Statements.ln @@ -56,6 +56,7 @@ XML注释文件不存在 短信验证请求不能为空 站内信不存在 签名缺失 +网络地址不正确 菜单名称不能为空 菜单标题不能为空 菜单编号不能为空 diff --git a/src/backend/NetAdmin.BizServer.Host/Properties/launchSettings.json b/src/backend/NetAdmin.BizServer.Host/Properties/launchSettings.json index 7b410e7b..bbe592a4 100644 --- a/src/backend/NetAdmin.BizServer.Host/Properties/launchSettings.json +++ b/src/backend/NetAdmin.BizServer.Host/Properties/launchSettings.json @@ -4,20 +4,13 @@ "NetAdmin.BizServer.Host": { "commandName": "Project", "dotnetRunMessages": true, + "commandLineArgs": "-is", "launchBrowser": true, "launchUrl": "http://localhost:5010", "applicationUrl": "http://[::]:5010", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } - }, - "InitDB": { - "commandName": "Project", - "dotnetRunMessages": true, - "commandLineArgs": "-is", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } } } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs index e5255d62..78924630 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs @@ -26,6 +26,6 @@ public record CreateDeptReq : Sys_Dept public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Summary { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs index 64305f86..b4bc03e9 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs @@ -10,14 +10,14 @@ namespace NetAdmin.Domain.Dto.Sys.Menu; public record CreateMenuReq : Sys_Menu { /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Active { get; init; } /// public override string Color => Meta.Color; /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Component { get; init; } /// @@ -47,11 +47,11 @@ public record CreateMenuReq : Sys_Menu public override long ParentId { get; init; } = 0; /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Path { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Redirect { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs index 493acc21..cbcfbb9b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs @@ -52,6 +52,6 @@ public record CreateRoleReq : Sys_Role public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Summary { 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 16f39def..740428bf 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] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [Url(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.网络地址不正确))] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Avatar { get; init; } /// @@ -20,7 +20,7 @@ public abstract record CreateUpdateUserReq : Sys_User /// [EmailAddress] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Email { get; init; } /// @@ -29,7 +29,7 @@ public abstract record CreateUpdateUserReq : Sys_User /// [Mobile] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Mobile { get; init; } /// @@ -47,12 +47,12 @@ public abstract record CreateUpdateUserReq : Sys_User public IReadOnlyCollection RoleIds { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Summary { get; init; } /// [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))] [UserName] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [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 bf0fbe01..533e79f2 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs @@ -26,7 +26,7 @@ public record RegisterUserReq : Sys_User /// [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))] [UserName] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string UserName { 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 1cdbce52..730b7c90 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] + [Url(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.网络地址不正确))] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户头像不能为空))] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Avatar { 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 5e4f3ff0..8dc0d601 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs @@ -15,7 +15,7 @@ public record CreateUserProfileReq : Sys_UserProfile /// [Certificate] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string CertificateNumber { get; init; } /// @@ -24,19 +24,19 @@ public record CreateUserProfileReq : Sys_UserProfile public override CertificateTypes? CertificateType { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string CompanyAddress { get; init; } /// public new QueryDicContentRsp CompanyArea { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string CompanyName { get; init; } /// [Telephone] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string CompanyTelephone { get; init; } /// @@ -45,7 +45,7 @@ public record CreateUserProfileReq : Sys_UserProfile public override Educations? Education { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string EmergencyContactAddress { get; init; } /// @@ -53,15 +53,15 @@ public record CreateUserProfileReq : Sys_UserProfile /// [Mobile] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string EmergencyContactMobile { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string EmergencyContactName { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string GraduateSchool { get; init; } /// @@ -70,7 +70,7 @@ public record CreateUserProfileReq : Sys_UserProfile public override int? Height { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string HomeAddress { get; init; } /// @@ -78,7 +78,7 @@ public record CreateUserProfileReq : Sys_UserProfile /// [Telephone] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string HomeTelephone { get; init; } /// @@ -100,11 +100,11 @@ public record CreateUserProfileReq : Sys_UserProfile public override PoliticalStatues? PoliticalStatus { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Profession { get; init; } /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string RealName { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs index 9bfc1aa2..b4e248d7 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs @@ -9,7 +9,7 @@ public sealed record SendVerifyCodeRsp : Sys_VerifyCode { #if DEBUG /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Code { get; init; } #endif } \ No newline at end of file diff --git a/src/frontend/admin/src/views/profile/account/set-email.vue b/src/frontend/admin/src/views/profile/account/set-email.vue index a967ad4a..606138d3 100644 --- a/src/frontend/admin/src/views/profile/account/set-email.vue +++ b/src/frontend/admin/src/views/profile/account/set-email.vue @@ -1,5 +1,5 @@