Commit af0f5572 authored by 技术部-任文超's avatar 技术部-任文超

统一优化短信验证码逻辑,使新旧版快速登录的差别只存在于:是否有一次性令牌

parent 91961fd4
...@@ -130,18 +130,6 @@ public class UserController implements IBaseController { ...@@ -130,18 +130,6 @@ public class UserController implements IBaseController {
@RequestParam(required = false,defaultValue = "xyqb") String key, @RequestParam(required = false,defaultValue = "xyqb") String key,
@RequestParam(required = false)Long btRegisterChannelId, @RequestParam(required = false)Long btRegisterChannelId,
@RequestParam(required = false) String dimension ,HttpServletRequest request) { @RequestParam(required = false) String dimension ,HttpServletRequest request) {
Map<String, JsonResult> validMap = getHeaderParam(request);
if (null != validMap.get("fail")) {
return validMap.get("fail");
}
Merchant merchant = merchantService.findMerchantByName(key);
if (merchant == null) {
return JsonResult.buildErrorStateResult("未知的连接", null);
}
JsonResult successResult = validMap.get("success");
String phoneNo = successResult.getData().toString();
String verificationCode = successResult.getMsg();
smsValidForFastLogin(phoneNo, verificationCode);
return loginFast(channelId, appChannel, createdFrom, key, btRegisterChannelId, dimension, request); return loginFast(channelId, appChannel, createdFrom, key, btRegisterChannelId, dimension, request);
} }
...@@ -205,10 +193,8 @@ public class UserController implements IBaseController { ...@@ -205,10 +193,8 @@ public class UserController implements IBaseController {
JsonResult successResult = validMap.get("success"); JsonResult successResult = validMap.get("success");
String phoneNo = successResult.getData().toString(); String phoneNo = successResult.getData().toString();
String verificationCode = successResult.getMsg(); String verificationCode = successResult.getMsg();
if (!smsService.validateFastLoginVerificationCode(phoneNo, verificationCode)) { // 执行短信验证码检查
LOGGER.info("用户快速登录,验证码校验失败,phoneNo:{} , verificationCode:{}", phoneNo, verificationCode); smsValidForFastLogin(phoneNo, verificationCode);
return JsonResult.buildErrorStateResult("验证码不正确", null);
}
User user = userService.findByPhoneWithCache(phoneNo); User user = userService.findByPhoneWithCache(phoneNo);
if (user != null && !user.getEnable()) { if (user != null && !user.getEnable()) {
return JsonResult.buildErrorStateResult("登录失败", null); return JsonResult.buildErrorStateResult("登录失败", null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment