From bcf7802f9401cbb6a7d2218b9be8c791574221dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Wed, 29 Mar 2023 23:20:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.BBS.Vue3/src/views/Login.vue               | 23 +++++++++++++++++--
 Yi.BBS.Vue3/src/views/Register.vue            |  5 +++-
 .../Identity/AccountService.cs                |  2 +-
 .../Identity/ConstClasses/UserConst.cs        |  2 +-
 4 files changed, 27 insertions(+), 5 deletions(-)

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 @@
     <div class="login-wrapper">
         <h1>{{configStore.name}}-登录</h1>
         <div class="login-form">
+
+            <el-form  ref="loginFormRef" v-model="loginForm"   :rules="rules" >
+             
             <div class="username form-item">
-                <span>使用账号或者手机号</span>
+                <el-form-item  prop="userName">
+                <span>使用账号</span>
                 <input type="text" class="input-item" v-model="loginForm.userName">
+            </el-form-item>
             </div>
+          
             <div class="password form-item">
+                <el-form-item  prop="password">
                 <span>密码</span>
                 <input type="password" class="input-item" v-model="loginForm.password">
+            </el-form-item>
             </div>
-
+        </el-form>
             <RouterLink to="/register"  > 没有账号？前往注册</RouterLink>
             <button class="login-btn" @click="login">登 录</button>
             <button class="login-btn" @click="guestlogin">游客临时登录</button>
@@ -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 @@
                 <button v-if="!isSendCaptcha" style="width: 30%;background-color: #C14949;" class="login-btn" @click="captcha" >验证码</button>
                 <button v-else style="width: 30%;background-color:#F0F2F5;" class="login-btn"  >已发送</button>
             </div>
-            
+            <div class="username form-item"  v-show="isSendCaptcha">
+                <span>手机短信验证码</span>
+                <input type="text" class="input-item" v-model="registerForm.code">
+            </div>
             <div class="password form-item">
                 <span>密码</span>
                 <input type="password" class="input-item" v-model="registerForm.password">
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<long> { entity.Id }, new List<long> { 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";
     }
 }