Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
685f967fdf
1 changed files with 37 additions and 30 deletions
  1. 37 30
      src/main/java/com/goafanti/common/controller/PublicController.java

+ 37 - 30
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.enums.MobileCodeCheckOverTimeSign;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.User;
 import com.goafanti.common.service.IndustryCategoryService;
@@ -136,11 +135,11 @@ public class PublicController extends BaseController {
 
 		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == null
 				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == "") {
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
 		} else if (TimeUtils.checkOverTime("getMCode")) {
 			VerifyCodeUtils.clearMobileCode();
 			VerifyCodeUtils.clearMobileCodeTime();
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
 		} else {
 			res.getError().add(buildError(ErrorConstants.MCODE_FREQUENCY_ERROR, "", "手机验证码发送频繁!"));
 		}
@@ -154,10 +153,15 @@ public class PublicController extends BaseController {
 	 * @param res
 	 * @return
 	 */
-	private Result sendMessage(String mobile, Result res) {
+	private Result sendMessage(String mobile, Result res,String codeType) {
 		String mobileVerifyCode = VerifyCodeUtils.generateMobileVerifyCode(6); // 生成随机字串
-		TokenManager.setVal2Session(VerifyCodeUtils.M_CODE, mobileVerifyCode);// 存入Shiro会话session
-		TokenManager.setVal2Session(VerifyCodeUtils.M_CODE_TIME, System.currentTimeMillis());
+		if(VerifyCodeUtils.M_CODE.equals(codeType)){
+			TokenManager.setVal2Session(VerifyCodeUtils.M_CODE, mobileVerifyCode);// 存入Shiro会话session
+			TokenManager.setVal2Session(VerifyCodeUtils.M_CODE_TIME, System.currentTimeMillis());
+		}else if(VerifyCodeUtils.RESET_CODE.equals(codeType)){
+			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE, mobileVerifyCode);// 存入Shiro会话session
+			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE_TIME, System.currentTimeMillis());
+		}
 		String paramString = "{\"code\":\"" + mobileVerifyCode + "\",\"product\":\"阿凡提信息科技\"}";
 		String ret = MobileMessageUtils.sendMessage(mobileCodeTemplate, paramString, mobile, accessKey, accessSecret);
 		if (StringUtils.isNotBlank(ret)) {
@@ -378,8 +382,7 @@ public class PublicController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.MCODE_EMPTY_ERROR, "", "手机验证码"));
 			return res;
 		}
-
-		if (TimeUtils.checkOverTime(MobileCodeCheckOverTimeSign.REGISTER.getCode())) {
+		if (TimeUtils.checkOverTime(VerifyCodeUtils.M_CODE)) {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "", "手机验证码超时失效!"));
 			VerifyCodeUtils.clearMobileCode();
 			VerifyCodeUtils.clearMobileCodeTime();
@@ -413,7 +416,7 @@ public class PublicController extends BaseController {
 	@ResponseBody
 	public Result resetPwd(String resetCode, String mobile, Integer type, String newPwd) {
 		Result res = new Result();
-		if (TimeUtils.checkOverTime(MobileCodeCheckOverTimeSign.RESETCODE.getCode())) {
+		if (TimeUtils.checkOverTime(VerifyCodeUtils.M_CODE)) {
 			res.getError().add(buildError(ErrorConstants.RESET_CODE_OVERTIME, "", "页面超时失效,请重新获取验证码!"));
 			cleanCodeSession();
 			return res;
@@ -459,37 +462,41 @@ public class PublicController extends BaseController {
 		VerifyCodeUtils.clearMobileCodeTime();
 	}
 	
-	/**
-	 * APP手机验证码
-	 * 
-	 * @param mobile
-	 * @param sign
-	 *            是否用与找回密码
-	 * @param type
-	 * @return
-	 */
-	@RequestMapping(value = "/getAppMCode", method = RequestMethod.GET)
+	@RequestMapping(value = "/getRegisterMCode", method = RequestMethod.GET )
 	@ResponseBody
-	public Result getAppMcode(String mobile, boolean sign, Integer type) {
+	public Result getRegisterMCode(String mobile){
 		Result res = new Result();
-		// 用于找回密码
-		if (sign) {
-			if (null == userService.selectByMobieAndType(mobile.trim(), type)) {
-				res.getError().add(buildError(ErrorConstants.NON_REGISTER, "", "该用户未注册!"));
-				return res;
-			}
-		}
 		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == null
 				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == "") {
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
 		} else if (TimeUtils.checkOverTime("getMCode")) {
 			VerifyCodeUtils.clearMobileCode();
 			VerifyCodeUtils.clearMobileCodeTime();
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
+		} else {
+			res.getError().add(buildError(ErrorConstants.MCODE_FREQUENCY_ERROR, "", "手机验证码发送频繁!"));
+		}
+		return res;
+	}
+	
+	@RequestMapping(value = "/getResetMCode", method = RequestMethod.GET )
+	@ResponseBody
+	public Result getResetMCode(String mobile, Integer type) {
+		Result res = new Result();
+		if (null == userService.selectByMobieAndType(mobile.trim(), type)) {
+			res.getError().add(buildError(ErrorConstants.NON_REGISTER, "", "该用户未注册!"));
+			return res;
+		}
+		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE_TIME) == null
+				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE_TIME) == "") {
+			sendMessage(mobile, res,VerifyCodeUtils.RESET_CODE);
+		} else if (TimeUtils.checkOverTime("resetCode")) {
+			VerifyCodeUtils.clearMobileCode();
+			VerifyCodeUtils.clearMobileCodeTime();
+			sendMessage(mobile, res,VerifyCodeUtils.RESET_CODE);
 		} else {
 			res.getError().add(buildError(ErrorConstants.MCODE_FREQUENCY_ERROR, "", "手机验证码发送频繁!"));
 		}
-
 		return res;
 	}