From 5edcf63e24f6b13f5515e01ee8cf120b1a814d40 Mon Sep 17 00:00:00 2001 From: nsnail Date: Wed, 29 May 2024 15:03:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20=E6=A1=86=E6=9E=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5=20(#130)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- assets/res/Enums.ln | 4 ++-- assets/res/Statements.ln | 2 +- .../Attributes/DataValidation/MobileAttribute.cs | 4 ++-- .../Attributes/DataValidation/UserNameAttribute.cs | 4 ++-- src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs | 2 +- .../NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs | 2 +- .../Dto/Sys/User/CheckMobileAvailableReq.cs | 4 ++-- .../NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs | 2 +- .../NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs | 2 +- .../NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs | 8 ++++---- .../Modules/Sys/IUserModule.cs | 4 ++-- .../Services/Sys/UserService.cs | 14 +++++++------- .../Controllers/Sys/UserController.cs | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assets/res/Enums.ln b/assets/res/Enums.ln index 90a0c2f2..fb0ef7c6 100644 --- a/assets/res/Enums.ln +++ b/assets/res/Enums.ln @@ -70,13 +70,13 @@ 等于 等待发送 系统模块 -绑定手机号 +绑定手机号码 结果非预期 群众 自定义 范围 菜单 -解绑手机号 +解绑手机号码 警告 调试 跟踪 diff --git a/assets/res/Statements.ln b/assets/res/Statements.ln index 5487add1..fc0fc66b 100644 --- a/assets/res/Statements.ln +++ b/assets/res/Statements.ln @@ -58,7 +58,7 @@ XML注释文件不存在 父节点不存在 用户不存在 用户名不能为空 -用户名不能是手机号 +用户名不能是手机号码 用户名或密码错误 用户名长度4位以上 用户头像不能为空 diff --git a/src/backend/NetAdmin.Domain/Attributes/DataValidation/MobileAttribute.cs b/src/backend/NetAdmin.Domain/Attributes/DataValidation/MobileAttribute.cs index 0f9e85b0..0d550f0d 100644 --- a/src/backend/NetAdmin.Domain/Attributes/DataValidation/MobileAttribute.cs +++ b/src/backend/NetAdmin.Domain/Attributes/DataValidation/MobileAttribute.cs @@ -1,7 +1,7 @@ namespace NetAdmin.Domain.Attributes.DataValidation; /// -/// 手机号验证器 +/// 手机号码验证器 /// [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Parameter)] public sealed class MobileAttribute : RegexAttribute @@ -12,7 +12,7 @@ public sealed class MobileAttribute : RegexAttribute public MobileAttribute() // : base(Chars.RGX_MOBILE) { - ErrorMessageResourceName = nameof(Ln.手机号不正确); + ErrorMessageResourceName = nameof(Ln.手机号码不正确); ErrorMessageResourceType = typeof(Ln); } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Attributes/DataValidation/UserNameAttribute.cs b/src/backend/NetAdmin.Domain/Attributes/DataValidation/UserNameAttribute.cs index a97ed3da..ca17b04a 100644 --- a/src/backend/NetAdmin.Domain/Attributes/DataValidation/UserNameAttribute.cs +++ b/src/backend/NetAdmin.Domain/Attributes/DataValidation/UserNameAttribute.cs @@ -27,8 +27,8 @@ public sealed class UserNameAttribute : RegexAttribute return true; } - // 不能是手机号 - ErrorMessageResourceName = nameof(Ln.用户名不能是手机号); + // 不能是手机号码 + ErrorMessageResourceName = nameof(Ln.用户名不能是手机号码); return false; } } \ 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 d29be8e1..12f2aa59 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs @@ -49,7 +49,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister public virtual bool Enabled { get; init; } /// - /// 手机号 + /// 手机号码 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs index 340b16ba..45976f93 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs @@ -80,7 +80,7 @@ public record Sys_UserProfile : VersionEntity, IRegister public int? EmergencyContactArea { get; init; } /// - /// 紧急联系人手机号 + /// 紧急联系人手机号码 /// [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)] [JsonIgnore] diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs index d467f50e..f05a0238 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs @@ -4,13 +4,13 @@ using NetAdmin.Domain.DbMaps.Sys; namespace NetAdmin.Domain.Dto.Sys.User; /// -/// 请求：检查手机号是否可用 +/// 请求：检查手机号码是否可用 /// public sealed record CheckMobileAvailableReq : Sys_User { /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [Mobile] - [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.手机号不能为空))] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.手机号码不能为空))] public override string Mobile { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs index e4980e9a..b61aa031 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs @@ -8,7 +8,7 @@ namespace NetAdmin.Domain.Dto.Sys.User; public sealed record LoginByPwdReq : DataAbstraction { /// - /// 用户名、手机号、邮箱 + /// 用户名、手机号码、邮箱 /// [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.账号不能为空))] public string Account { get; init; } diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs index 8e42a120..90f573de 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs @@ -3,7 +3,7 @@ using NetAdmin.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.Domain.Dto.Sys.User; /// -/// 请求：设置手机号 +/// 请求：设置手机号码 /// public sealed record SetMobileReq : DataAbstraction { diff --git a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs b/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs index a30fa9c2..90b8195b 100644 --- a/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs +++ b/src/backend/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs @@ -7,9 +7,9 @@ namespace NetAdmin.Domain.Enums.Sys; public enum VerifyCodeTypes { /// - /// 绑定手机号 + /// 绑定手机号码 /// - [ResourceDescription(nameof(Ln.绑定手机号))] + [ResourceDescription(nameof(Ln.绑定手机号码))] LinkMobile = 1 , @@ -23,9 +23,9 @@ public enum VerifyCodeTypes , /// - /// 解绑手机号 + /// 解绑手机号码 /// - [ResourceDescription(nameof(Ln.解绑手机号))] + [ResourceDescription(nameof(Ln.解绑手机号码))] UnlinkMobile = 3 , diff --git a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs index 69cd70ce..309ee209 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs @@ -15,7 +15,7 @@ public interface IUserModule : ICrudModule { /// - /// 检查手机号是否可用 + /// 检查手机号码是否可用 /// Task CheckMobileAvailableAsync(CheckMobileAvailableReq req); @@ -65,7 +65,7 @@ public interface IUserModule : ICrudModule - /// 设置手机号 + /// 设置手机号码 /// Task SetMobileAsync(SetMobileReq req); diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index d7c02805..63a52232 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs @@ -284,14 +284,14 @@ public sealed class UserService( .ToOneAsync(a => new { a.Mobile, a.Version, a.Email }) .ConfigureAwait(false); - // 如果已绑定手机号、需要手机安全验证 + // 如果已绑定手机号码、需要手机安全验证 if (!user.Mobile.NullOrEmpty()) { if (!await verifyCodeService.VerifyAsync(req.VerifySmsCodeReq).ConfigureAwait(false)) { throw new NetAdminInvalidOperationException(Ln.验证码不正确); } if (user.Mobile != req.VerifySmsCodeReq.DestDevice) { - throw new NetAdminInvalidOperationException($"{Ln.手机号不正确}"); + throw new NetAdminInvalidOperationException($"{Ln.手机号码不正确}"); } } @@ -328,19 +328,19 @@ public sealed class UserService( .ConfigureAwait(false); if (!user.Mobile.NullOrEmpty()) { - // 已有手机号，需验证旧手机 + // 已有手机号码，需验证旧手机 if (!await verifyCodeService.VerifyAsync(req.OriginVerifySmsCodeReq).ConfigureAwait(false)) { - throw new NetAdminInvalidOperationException($"{Ln.旧手机号验证码不正确}"); + throw new NetAdminInvalidOperationException($"{Ln.旧手机号码验证码不正确}"); } if (user.Mobile != req.OriginVerifySmsCodeReq.DestDevice) { - throw new NetAdminInvalidOperationException($"{Ln.旧手机号不正确}"); + throw new NetAdminInvalidOperationException($"{Ln.旧手机号码不正确}"); } } - // 验证新手机号 + // 验证新手机号码 if (!await verifyCodeService.VerifyAsync(req.NewVerifySmsCodeReq).ConfigureAwait(false)) { - throw new NetAdminInvalidOperationException($"{Ln.新手机号验证码不正确}"); + throw new NetAdminInvalidOperationException($"{Ln.新手机号码验证码不正确}"); } if (await Rpo.UpdateDiy diff --git a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs index bdf542ab..f02c23c7 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs @@ -27,7 +27,7 @@ public sealed class UserController(IUserCache cache, IConfigCache configCache) } /// - /// 检查手机号是否可用 + /// 检查手机号码是否可用 /// [AllowAnonymous] public Task CheckMobileAvailableAsync(CheckMobileAvailableReq req) @@ -192,7 +192,7 @@ public sealed class UserController(IUserCache cache, IConfigCache configCache) } /// - /// 设置手机号 + /// 设置手机号码 /// [Transaction] public Task SetMobileAsync(SetMobileReq req)