用户登录问题修改
This commit is contained in:
parent
d0100bb092
commit
5c340f728c
|
|
@ -104,7 +104,7 @@ public class TokenController {
|
||||||
return R.fail("不支持的登录方式");
|
return R.fail("不支持的登录方式");
|
||||||
}
|
}
|
||||||
LoginUser login = strategy.login(form.getUsername(), form.getPassword());
|
LoginUser login = strategy.login(form.getUsername(), form.getPassword());
|
||||||
if (login.getRoles().contains("admin") && form.getLoginType().equals(LoginType.USERNAME_PASSWORD)) {
|
if (login.getRoles().contains("admin") && form.getLoginType().equals(LoginType.USERNAME_PASSWORD) && isAdmin) {
|
||||||
passwordValidatorService.checkPhoneCaptcha(form.getVerificationCode(), login.getSysUser().getPhonenumber());
|
passwordValidatorService.checkPhoneCaptcha(form.getVerificationCode(), login.getSysUser().getPhonenumber());
|
||||||
return R.ok(tokenService.createToken(login));
|
return R.ok(tokenService.createToken(login));
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue