杨杰 4 years ago
parent
commit
1be4648458

+ 5 - 11
src/main/java/com/llisoft/sms/controller/SmsController.java

@@ -14,7 +14,6 @@ import com.llisoft.sms.util.ServletUtil;
 import com.llisoft.sms.vo.CheckCodeRequestVo;
 import com.llisoft.sms.vo.ResponseVo;
 import com.llisoft.sms.vo.SendCodeRequestVo;
-import com.llisoft.sms.vo.SendNoCodeRequestVo;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,17 +32,12 @@ public class SmsController {
 		return ResponseVo.success(smsService.sendCode(requestVo.getPhone(), requestVo.getAppkey(), requestVo.getScene(), requestVo.getToken(), 
 			requestVo.getSessionid(), requestVo.getSig(), ServletUtil.getIp(request), requestVo.getType()));
 	}
-
-	@ApiOperation(value="发送验证码-无参")
-	@PostMapping("/sendNosigCode")
-	public ResponseVo<Boolean> sendNoCode(@Valid @RequestBody SendNoCodeRequestVo requestVo) throws Exception{
-		return ResponseVo.success(smsService.sendNoCode(requestVo.getPhone()));
-	}
 	
-	@ApiOperation(value="发送消息")
-	@PostMapping("/sendMsg")
-	public ResponseVo<Boolean> sendMsg(@Valid @RequestBody CheckCodeRequestVo vo) throws MtaException{
-		return ResponseVo.success(false);
+	@ApiOperation(value="验证验证码")
+	@PostMapping("/checkCode")
+	@Deprecated
+	public ResponseVo<Boolean> checkCode(@Valid @RequestBody CheckCodeRequestVo requestVo) throws MtaException{
+		return ResponseVo.success(smsService.checkCode(requestVo.getPhone(), requestVo.getCode()));
 	}
 	
 }

+ 0 - 25
src/main/java/com/llisoft/sms/service/SmsService.java

@@ -61,31 +61,6 @@ public class SmsService {
 	}
 	
 	/**
-	 * 发送无参验证码
-	 * 同手机号 每分钟1条/每小时5条/每天10条
-	 * @param phone
-	 * @throws Exception 
-	 */
-	public boolean sendNoCode(String phone) throws Exception {
-		// 检查人机验证码
-		if (debug) {
-			logger.warn("开发模式:人机验证已跳过");
-		}
-		// 检查号码
-		logger.debug("检查手机号: {}", phone);
-		if(!this.checkSend(phone)) {
-			logger.warn("手机号被限制发送:{}", phone);
-			throw new MtaException("此号码被限制发送:" + phone);
-		}
-		// 发送短信
-		String code = String.valueOf(CodeUtil.ints(4));
-		RedisUtil.set(phone + "_" + code, "", 10, TimeUnit.MINUTES); // 有效期10分钟
-		logger.debug("发送验证码: {}", code);
-		aliyunService.sms(phone, code, 0); // 第三方发送短信(异步)
-		return true;
-	}
-	
-	/**
 	 * 检查发送
 	 * @param phone
 	 * @return