验证码调整

This commit is contained in:
akun 2024-04-12 15:46:15 +08:00
parent aa13c22813
commit ceeeea9bca
2 changed files with 4 additions and 3 deletions

View File

@ -48,10 +48,9 @@ public class SysLoginController
public AjaxResult login(@RequestBody LoginBody loginBody, HttpSession session) public AjaxResult login(@RequestBody LoginBody loginBody, HttpSession session)
{ {
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
loginService.validateCaptcha(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
// 生成令牌 // 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(),
session); loginBody.getCode(),loginBody.getUuid(), session);
ajax.put(Constants.TOKEN, token); ajax.put(Constants.TOKEN, token);
return ajax; return ajax;
} }

View File

@ -68,8 +68,10 @@ public class SysLoginService
* @param password 密码 * @param password 密码
* @return 结果 * @return 结果
*/ */
public String login(String username, String password, HttpSession session) public String login(String username, String password, String code, String uuid, HttpSession session)
{ {
// 验证码校验
validateCaptcha(username, code, uuid);
// 登录前置校验 // 登录前置校验
loginPreCheck(username, password); loginPreCheck(username, password);
// 用户验证 // 用户验证