Browse Source

Merge remote-tracking branch 'origin/test'

anderx 8 years ago
parent
commit
c315679569

+ 5 - 2
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -421,12 +421,15 @@ public class PublicController extends BaseController {
 			cleanCodeSession();
 			return res;
 		}
-		if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE).equals(resetCode)) {
+		if(null == TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE)){
+			res.getError().add(buildError(ErrorConstants.RESET_CODE_OVERTIME, "", "页面超时失效,请重新获取验证码!"));
+			cleanCodeSession();
+			return res;
+		}else if(!TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE).equals(resetCode)){
 			res.getError().add(buildError(ErrorConstants.RESET_CODE_ERROR, "", "验证码错误,请重新获取验证码!"));
 			cleanCodeSession();
 			return res;
 		}
-
 		if (StringUtils.isBlank(newPwd)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新密码"));
 			return res;