Antiloveg 8 yıl önce
ebeveyn
işleme
22546f7280

+ 2 - 0
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -92,4 +92,6 @@ public class ErrorConstants {
 
 	public static final String	MCODE_FREQUENCY_ERROR			= "MCODE_FREQUENCY_ERROR";
 
+	public static final String	MCODE_EMPTY_ERROR				= "MCODE_EMPTY_ERROR";
+
 }

+ 28 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -364,4 +364,32 @@ public class PublicController extends BaseController {
 		return new Result().data(districtGlossoryService.list(pid));
 	}
 
+	/**
+	 * 
+	 * @param mobileCode
+	 * @return
+	 */
+	@RequestMapping(value = "/checkMCode", method = RequestMethod.POST)
+	public Result checkMCode(String mobileCode) {
+		Result res = new Result();
+
+		if (StringUtils.isBlank(mobileCode)) {
+			res.getError().add(buildError(ErrorConstants.MCODE_EMPTY_ERROR, "", "手机验证码"));
+			return res;
+		}
+
+		if (TimeUtils.checkOverTime("register")) {
+			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "", "手机验证码超时失效!"));
+			TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE);
+			TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE_TIME);
+			return res;
+		}
+		if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)) {
+			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "", "手机验证码错误"));
+			return res;
+		}
+		return res;
+
+	}
+
 }

+ 1 - 28
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -194,34 +194,7 @@ public class UserApiController extends BaseApiController {
 		return res;
 	}
 
-	/**
-	 * 
-	 * @param mobileCode
-	 * @return
-	 */
-	@RequestMapping(value = "/checkMCode", method = RequestMethod.POST)
-	public Result checkMCode(String mobileCode) {
-		Result res = new Result();
-
-		if (StringUtils.isBlank(mobileCode)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "手机验证码"));
-			return res;
-		}
-
-		if (TimeUtils.checkOverTime("register")) {
-			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
-			TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE);
-			TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE_TIME);
-			return res;
-		}
-		System.out.println(TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE));
-		if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)) {
-			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
-			return res;
-		}
-		return res;
-
-	}
+	
 
 	/**
 	 * 更换手机

+ 5 - 1
src/main/resources/props/error.properties

@@ -41,7 +41,7 @@ DATA_EMPTY_ERROR=\u5f53\u524d{0}\u6ca1\u6709\u6570\u636e\u3002
 
 PWD_NOT_MATCH_ERROR=\u539f\u5bc6\u7801\u8f93\u5165\u4e0d\u5339\u914d\u3002
 
-MCODE_ERROR=\u83b7\u53d6\u624b\u673a\u9a8c\u8bc1\u7801\u5f02\u5e38\uff01
+MCODE_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u9519\u8bef\uff01
 
 NON_CERTIFIED=\u672a\u901a\u8fc7\u5b9e\u540d\u8ba4\u8bc1\uff0c\u65e0\u6cd5\u64cd\u4f5c\uff01
 
@@ -72,3 +72,7 @@ VCODE_EMPTY_ERROR=\u56fe\u50cf\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
 MCODE_FREQUENCY_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u53d1\u9001\u9891\u7e41\uff01
 
 NON_REGISTER=\u8be5\u7528\u6237\u672a\u6ce8\u518c\uff01
+
+MCODE_EMPTY_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
+
+MCODE_OVERTIME_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u8d85\u65f6\u5931\u6548\uff01