anderx лет назад: 7
Родитель
Сommit
4c6804898b

+ 1 - 4
src/main/java/com/goafanti/common/utils/TimeUtils.java

@@ -12,10 +12,7 @@ public class TimeUtils {
 
 	public static Boolean checkOverTime(String s) {
 		Boolean flag = false;
-		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) ==null) {
-			flag = true;
-		}
-		if ("getMCode".equals(s)) {
+		 if ("getMCode".equals(s)) {
 			if (System.currentTimeMillis()
 					- (Long) TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) > 60000) {
 				flag = true;

+ 10 - 5
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -65,22 +65,27 @@ public class UserRegisterController extends BaseController {
 					UserFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (null != user.getUnitName()) {
+		if (StringUtils.isBlank(user.getUnitName())) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "用户名不能为空"));
+			return res;
+		}
+		if (StringUtils.isBlank(user.getMobile())) {
+			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "手机号码不能为空"));
+			return res;
 		}
 		User u = userService.selectByMobieAndType(user.getMobile().trim(),user.getType());
 		if (null != u) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "用户已存在"));
 		}
+		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) ==null||!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode.toLowerCase())) {
+			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
+			return res;
+		}
 		// 验证码15分钟有效
 		if (TimeUtils.checkOverTime("register")) {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
 			return res;
 		}
-		if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode.toLowerCase())) {
-			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
-			return res;
-		}
 		if (res.getError().isEmpty()) {
 			User us = new User();
 			us.setId(UUID.randomUUID().toString());