1.删除一些无用代码

      2.类和方法重命名

examcloud-exchange-inner-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/provider/SendSmsProvider.java

@@ -1,129 +0,0 @@
-/*
-package cn.com.qmth.examcloud.exchange.inner.api.provider;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-
-import org.springframework.web.bind.annotation.RestController;
-
-import com.google.gson.JsonObject;
-
-import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.exchange.inner.api.SendSmsCloudService;
-import cn.com.qmth.examcloud.exchange.inner.api.request.CaptureFailedAlarmReq;
-import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
-import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq1;
-import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
-import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
-import cn.com.qmth.examcloud.exchange.inner.service.SendSmsService;
-import cn.com.qmth.examcloud.exchange.inner.service.bean.CaptureFailedAlarmInfo;
-import cn.com.qmth.examcloud.exchange.inner.service.bean.SendSmsInfo;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-
-*/
-/**
- * 
- * @author chenken
- * @date 2018年7月3日 下午4:03:59
- * @company QMTH
- * @description SendSmsProvider.java
- *//*
-
-@RestController
-@RequestMapping("${$rmp.cloud.exchange.inner}" + "/sendSms")
-public class SendSmsProvider extends ControllerSupport implements SendSmsCloudService {
-
-	private static final long serialVersionUID = -1497756895732370672L;
-	
-	@Autowired
-	private SendSmsService sendSmsService;
-
-	@Override
-	@RequestMapping(method = RequestMethod.POST, value = "/sendIdentifyingCode")
-	public SendSmsResp sendIdentifyingCode(@RequestBody SendSmsReq1 sendSmsReq){
-		checkSendSmsReq(sendSmsReq);
-		SendSmsInfo sendSmsInfo = new SendSmsInfo();
-		sendSmsInfo.setPhone(sendSmsReq.getPhone());
-		sendSmsInfo.setCode(sendSmsReq.getCode());
-		sendSmsInfo.setSign(sendSmsReq.getSign());
-		sendSmsInfo.setTemplateCode(sendSmsReq.getTemplateCode());
-		sendSmsInfo.setEffectiveTime(sendSmsReq.getEffectiveTime());
-		sendSmsInfo.setIntervalSeconds(sendSmsReq.getIntervalSeconds());
-		SendSmsResp sendSmsResp = new SendSmsResp();
-		try{
-			sendSmsService.sendIdentifyingCode(sendSmsInfo);
-			sendSmsResp.setSuccess(true);
-			sendSmsResp.setReturnMsg("发送成功");
-		}catch(StatusException exception){
-			exception.printStackTrace();
-			sendSmsResp.setSuccess(false);
-			sendSmsResp.setReturnMsg(exception.getDesc());
-		}
-		return sendSmsResp;
-	}
-	
-	@Override
-	@RequestMapping(method = RequestMethod.POST, value = "/checkIdentifyingCode")
-	public CheckIdentifyingCodeResp checkIdentifyingCode(@RequestBody CheckSmsCodeReq checkSmsCodeReq){
-		if(StringUtils.isBlank(checkSmsCodeReq.getPhone())){
-			throw new StatusException("CheckIdentifyingCodeResp-001", "手机号码不能为空");
-		}
-		if(StringUtils.isBlank(checkSmsCodeReq.getCode())){
-			throw new StatusException("CheckIdentifyingCodeResp-002", "验证码不能为空");
-		}
-		boolean success = sendSmsService.checkIdentifyingCode(checkSmsCodeReq.getPhone(), checkSmsCodeReq.getCode());
-		CheckIdentifyingCodeResp resp = new CheckIdentifyingCodeResp();
-		resp.setSuccess(success);
-		resp.setReturnMsg(success?"校验通过":"校验不通过");
-		return resp;
-	}
-
-	private void checkSendSmsReq(SendSmsReq1 sendSmsReq){
-		if(StringUtils.isBlank(sendSmsReq.getPhone())){
-			throw new StatusException("SendSmsProvider-001", "手机号码不能为空");
-		}
-		if(StringUtils.isBlank(sendSmsReq.getCode())){
-			throw new StatusException("SendSmsProvider-002", "短信验证码不能为空");
-		}
-		if(StringUtils.isBlank(sendSmsReq.getSign())){
-			throw new StatusException("SendSmsProvider-003", "短信签名不能为空");
-		}
-		if(StringUtils.isBlank(sendSmsReq.getTemplateCode())){
-			throw new StatusException("SendSmsProvider-004", "短信模板code不能为空");
-		}
-	}
-
-	@Override
-	@RequestMapping(method = RequestMethod.POST, value = "/captureFailedAlarm")
-	public void captureFailedAlarm(@RequestBody CaptureFailedAlarmReq captureFailedAlarmReq) throws Exception {
-		checkCaptureFailedAlarmReq(captureFailedAlarmReq);
-		CaptureFailedAlarmInfo captureFailedAlarmInfo = new CaptureFailedAlarmInfo();
-		captureFailedAlarmInfo.setTemplateCode(captureFailedAlarmReq.getTemplateCode());
-		captureFailedAlarmInfo.setSign(captureFailedAlarmReq.getSign());
-		captureFailedAlarmInfo.setPhone(captureFailedAlarmReq.getPhone());
-		JsonObject jsonObject = new JsonObject();
-		jsonObject.addProperty("totalCount", captureFailedAlarmReq.getTotalCount());
-		jsonObject.addProperty("errorCount", captureFailedAlarmReq.getErrorCount());
-		captureFailedAlarmInfo.setTemplateParam(jsonObject.toString());
-		sendSmsService.captureFailedAlarm(captureFailedAlarmInfo);
-	}
-
-	private void checkCaptureFailedAlarmReq(
-			CaptureFailedAlarmReq captureFailedAlarmReq) {
-		if(StringUtils.isBlank(captureFailedAlarmReq.getPhone())){
-			throw new StatusException("SendSmsProvider-001", "手机号码不能为空");
-		}
-		if(StringUtils.isBlank(captureFailedAlarmReq.getSign())){
-			throw new StatusException("SendSmsProvider-003", "短信签名不能为空");
-		}
-		if(StringUtils.isBlank(captureFailedAlarmReq.getTemplateCode())){
-			throw new StatusException("SendSmsProvider-004", "短信模板code不能为空");
-		}
-	}
-	
-}
-*/

examcloud-exchange-inner-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/provider/SmsProvider.java → examcloud-exchange-inner-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/provider/SmsCloudServiceProvider.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${$rmp.cloud.exchange.inner}" + "/sms")
-public class SmsProvider extends ControllerSupport implements SmsCloudService {
+public class SmsCloudServiceProvider extends ControllerSupport implements SmsCloudService {
 
     private static final long serialVersionUID = -1497756895732370672L;
 
@@ -65,7 +65,7 @@ public class SmsProvider extends ControllerSupport implements SmsCloudService {
 
     @Override
     @RequestMapping(method = RequestMethod.POST, value = "/sendIdentifyingCode")
-    public SendSmsCodeResp sendIdentifyingCode(@RequestBody @Valid @ApiParam(required = true) SendSmsCodeReq req) {
+    public SendSmsCodeResp sendSmsCode(@RequestBody @Valid @ApiParam(required = true) SendSmsCodeReq req) {
 
         SendSmsCodeResp sendSmsResp = new SendSmsCodeResp();
         try {
@@ -82,7 +82,7 @@ public class SmsProvider extends ControllerSupport implements SmsCloudService {
 
     @Override
     @RequestMapping(method = RequestMethod.POST, value = "/checkIdentifyingCode")
-    public CheckIdentifyingCodeResp checkIdentifyingCode(@RequestBody @Valid @ApiParam(required = true) CheckSmsCodeReq req) {
+    public CheckIdentifyingCodeResp checkSmsCode(@RequestBody @Valid @ApiParam(required = true) CheckSmsCodeReq req) {
         CheckIdentifyingCodeResp resp = new CheckIdentifyingCodeResp();
         try {
             smsService.validateSmsSecurityCode(req.getPhone(), req.getCode());