Merge branch 'dev-nw' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nw
This commit is contained in:
commit
a14014831a
|
|
@ -131,16 +131,29 @@ public class TokenController {
|
||||||
|
|
||||||
@PostMapping("sendCode")
|
@PostMapping("sendCode")
|
||||||
public R<?> sendCode(@RequestBody LoginBody form) {
|
public R<?> sendCode(@RequestBody LoginBody form) {
|
||||||
String uuid = form.getUuid();
|
if ("admin".equals(form.getUsername())) {
|
||||||
String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString();
|
// 根据用户名查询用户信息
|
||||||
if (StringUtils.isBlank(captcha)) {
|
LoginUser userInfo = sysLoginService.selectByName(form.getUsername());
|
||||||
return R.fail("验证码超时,请重新刷新");
|
//获取查询的用户手机号
|
||||||
|
String phone = userInfo.getSysUser().getPhonenumber();
|
||||||
|
if (StringUtils.isBlank(phone)) {
|
||||||
|
throw new ServiceException("手机号为空,请联系管理员!");
|
||||||
|
}
|
||||||
|
//图形验证码校验成功,发送短信
|
||||||
|
R<Boolean> sendState = remoteUserService.sendCode(phone);
|
||||||
|
return sendState;
|
||||||
|
} else {
|
||||||
|
String uuid = form.getUuid();
|
||||||
|
String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString();
|
||||||
|
if (StringUtils.isBlank(captcha)) {
|
||||||
|
return R.fail("验证码超时,请重新刷新");
|
||||||
|
}
|
||||||
|
if (form.getCode() != null && !form.getCode().equals(captcha)) {
|
||||||
|
return R.fail("验证码错误");
|
||||||
|
}
|
||||||
|
R<Boolean> sendState = remoteUserService.sendCode(form.getPhone());
|
||||||
|
return sendState;
|
||||||
}
|
}
|
||||||
if (form.getCode() != null && !form.getCode().equals(captcha)) {
|
|
||||||
return R.fail("验证码错误");
|
|
||||||
}
|
|
||||||
R<Boolean> sendState = remoteUserService.sendCode(form.getPhone());
|
|
||||||
return sendState;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("checkCode")
|
@PostMapping("checkCode")
|
||||||
|
|
@ -226,22 +239,4 @@ public class TokenController {
|
||||||
return AjaxResult.success("success", registerService.registersNew(request, registerForms));
|
return AjaxResult.success("success", registerService.registersNew(request, registerForms));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据用户名
|
|
||||||
* @param form
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@PostMapping("/loginByCode")
|
|
||||||
public R<?> sendCodeByName(@RequestBody LoginBody form) {
|
|
||||||
// 根据用户名查询用户信息
|
|
||||||
LoginUser userInfo = sysLoginService.selectByName(form.getUsername());
|
|
||||||
//获取查询的用户手机号
|
|
||||||
String phone = userInfo.getSysUser().getPhonenumber();
|
|
||||||
if (StringUtils.isBlank(phone)) {
|
|
||||||
throw new ServiceException("手机号为空,请联系管理员!");
|
|
||||||
}
|
|
||||||
//图形验证码校验成功,发送短信
|
|
||||||
R<Boolean> sendState = remoteUserService.sendCode(phone);
|
|
||||||
return sendState;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue