refactor: 修改登录验证码为可空

This commit is contained in:
2025-03-25 15:43:00 +08:00
parent 915dc2fdb2
commit f19927ca33
2 changed files with 17 additions and 15 deletions

View File

@@ -37,16 +37,18 @@ class UserCenter
throw new InvalidLoginException($validate->getError()); throw new InvalidLoginException($validate->getError());
} }
// 校验验证码 if (!empty($post['captcha'])) {
$code = Cache::get('captcha:token.' . $post['token']); // 校验验证码
if (!$code) { $code = Cache::get('captcha:token.' . $post['token']);
throw new InvalidLoginException('验证码不存在或已过期'); if (!$code) {
} throw new InvalidLoginException('验证码不存在或已过期');
Cache::delete('captcha:token.' . $post['token']); }
Cache::delete('captcha:token.' . $post['token']);
// 校验 // 校验
if (!password_verify($post['captcha'], $code)) { if (!password_verify($post['captcha'], $code)) {
throw new InvalidLoginException('验证码错误'); throw new InvalidLoginException('验证码错误');
}
} }
// 验证用户 // 验证用户

View File

@@ -16,8 +16,8 @@ class LoginValidate extends Validate
protected $rule = [ protected $rule = [
'username' => 'require', 'username' => 'require',
'password' => 'require', 'password' => 'require',
'token' => 'require', 'captcha' => 'max:6',
'captcha' => 'require' 'token' => 'requireWith:captcha'
]; ];
/** /**
@@ -27,9 +27,9 @@ class LoginValidate extends Validate
* @var array * @var array
*/ */
protected $message = [ protected $message = [
'username.require' => '用户名不能为空', 'username.require' => '用户名不能为空',
'password.require' => '密码不能为空', 'password.require' => '密码不能为空',
'token.require' => '验证码token不能为空', 'captcha.captcha' => '验证码不能为空',
'captcha.require' => '验证码不能为空' 'token.requireWith' => '验证码token不能为空'
]; ];
} }