|
|
@@ -92,25 +92,25 @@ public class MallUserInfoBaseController extends BaseController{ |
|
|
|
*/ |
|
|
|
public ResultData doLogin(MallUserInfo user, HttpServletResponse response,EnumProject projectType) { |
|
|
|
String ipaddress = getIpAddr(); |
|
|
|
try { |
|
|
|
String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); |
|
|
|
logger.info("登录接口-验证码:{}", user.getCaptcha()); |
|
|
|
logger.info("登录接口-生成的验证码:{}", kaptcha); |
|
|
|
if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ |
|
|
|
return new ResultData(ErrorCode.KAPCHA_NOT_EQUAL); |
|
|
|
} |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("验证码" + e.getMessage()); |
|
|
|
return new ResultData(ErrorCode.KAPCHA_NOT_VALID.getCode(), e.getMessage()); |
|
|
|
} |
|
|
|
// String key = Constant.captchaPrev + ":" + getIpAddr(); |
|
|
|
// String code = RedisCacheUtils.getCacheString(redisTemplate, key); |
|
|
|
// if (StringUtils.isBlank(code)) { |
|
|
|
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "验证码已过期"); |
|
|
|
// } |
|
|
|
// if (!code.equals(user.getCaptcha())) { |
|
|
|
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "验证码不正确"); |
|
|
|
// try { |
|
|
|
// String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); |
|
|
|
// logger.info("登录接口-验证码:{}", user.getCaptcha()); |
|
|
|
// logger.info("登录接口-生成的验证码:{}", kaptcha); |
|
|
|
// if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ |
|
|
|
// return new ResultData(ErrorCode.KAPCHA_NOT_EQUAL); |
|
|
|
// } |
|
|
|
// } catch (MallinkException e) { |
|
|
|
// logger.error("验证码" + e.getMessage()); |
|
|
|
// return new ResultData(ErrorCode.KAPCHA_NOT_VALID.getCode(), e.getMessage()); |
|
|
|
// } |
|
|
|
String key = Constant.captchaPrev + ":" + getIpAddr(); |
|
|
|
String code = RedisCacheUtils.getCacheString(redisTemplate, key); |
|
|
|
if (StringUtils.isBlank(code)) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "验证码已过期"); |
|
|
|
} |
|
|
|
if (!code.equals(user.getCaptcha())) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "验证码不正确"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) { |
|
|
|