diff --git a/Yi.BBS.Vue3/src/views/Login.vue b/Yi.BBS.Vue3/src/views/Login.vue index 36f3a692..5b516844 100644 --- a/Yi.BBS.Vue3/src/views/Login.vue +++ b/Yi.BBS.Vue3/src/views/Login.vue @@ -2,15 +2,23 @@

{{configStore.name}}-登录

+ + +
- 使用账号或者手机号 + + 使用账号 +
+
+ 密码 +
- +
没有账号?前往注册 @@ -49,6 +57,17 @@ const configStore= useConfigStore(); const userStore = useUserStore(); const router = useRouter(); const route = useRoute(); + +const rules = reactive({ + userName: [ + { required: true, message: '请输入账号名', trigger: 'blur' }, + { min: 3, message: '至少大于等于3位', trigger: 'blur' }, + ], +password:[ +{ required: true, message: '请输入密码', trigger: 'blur' }, + { min: 3, message: '至少大于等于6位', trigger: 'blur' }, + +]}) const loginForm = reactive({ userName: "", password: "", diff --git a/Yi.BBS.Vue3/src/views/Register.vue b/Yi.BBS.Vue3/src/views/Register.vue index 7d93f1bd..43143c7a 100644 --- a/Yi.BBS.Vue3/src/views/Register.vue +++ b/Yi.BBS.Vue3/src/views/Register.vue @@ -12,7 +12,10 @@
- +
+ 手机短信验证码 + +
密码 diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs index 9814f2d8..a16c85af 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs @@ -186,7 +186,7 @@ namespace Yi.RBAC.Application.Identity var entity = await _userRepository.InsertReturnEntityAsync(newUser); //赋上一个初始角色 var roleRepository = _roleRepository; - var role = await roleRepository.GetFirstAsync(x => x.RoleName == UserConst.GuestRoleName); + var role = await roleRepository.GetFirstAsync(x => x.RoleCode == UserConst.GuestRoleCode); if (role is not null) { await _userManager.GiveUserSetRoleAsync(new List { entity.Id }, new List { role.Id }); diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Identity/ConstClasses/UserConst.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Identity/ConstClasses/UserConst.cs index 32f44bd8..8b927a0d 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Identity/ConstClasses/UserConst.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Identity/ConstClasses/UserConst.cs @@ -23,7 +23,7 @@ namespace Yi.RBAC.Domain.Shared.Identity.ConstClasses public const string AdminRolesCode = "admin"; public const string AdminPermissionCode = "*:*:*"; - public const string GuestRoleName = "guest"; + public const string GuestRoleCode = "guest"; public const string CommonRoleName = "common"; } }