--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/client/third/SmsClient.java

@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import com.zrqx.core.form.third.sms.SmsForm;
+import com.zrqx.core.util.response.CallBack;
 
 /**
  * 手机短信
@@ -18,6 +19,6 @@ public interface SmsClient {
 	 * @return
 	 */
 	@PostMapping("/sms/send")
-	public String sendSms(@RequestBody SmsForm smsForm);
+	public CallBack<String> sendSms(@RequestBody SmsForm smsForm);
 
 }

com.zrqx.member/src/main/java/com/zrqx/member/fg/client/third/SmsHystric.java

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import com.zrqx.core.form.third.sms.SmsForm;
+import com.zrqx.core.util.response.CallBack;
 
 @Component
 public class SmsHystric implements SmsClient {
@@ -13,9 +14,9 @@ public class SmsHystric implements SmsClient {
 	private final Logger logger = LoggerFactory.getLogger(SmsHystric.class);
 
 	@Override
-	public String sendSms(@RequestBody SmsForm smsForm){
+	public CallBack<String> sendSms(@RequestBody SmsForm smsForm){
 		logger.info(" 发送: "+ smsForm.getPhone() + " 验证码: " + smsForm.getCode() + ",短信接口不可用");
-		return "短信接口不可用";
+		return null;
 	}
 	
 }

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -16,7 +16,6 @@ import java.util.regex.Pattern;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +40,7 @@ import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
 import com.zrqx.core.form.member.fg.permissions.SaveOMemberForm;
 import com.zrqx.core.form.member.fg.permissions.SavePMemberForm;
 import com.zrqx.core.form.member.fg.permissions.UpdatePasswordForm;
-import com.zrqx.core.form.third.sdksms.SdkSmsForm;
+import com.zrqx.core.form.third.sms.SmsForm;
 import com.zrqx.core.model.member.Member;
 import com.zrqx.core.model.member.Organ;
 import com.zrqx.core.model.member.OrganMember;
@@ -56,7 +55,7 @@ import com.zrqx.core.util.ip.CusAccessObjectUtil;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.member.commons.redis.Redis;
 import com.zrqx.member.fg.client.third.QQLoginClient;
-import com.zrqx.member.fg.client.third.SdkSmsClient;
+import com.zrqx.member.fg.client.third.SmsClient;
 import com.zrqx.member.fg.client.third.WeChatLoginClient;
 import com.zrqx.member.fg.member.service.FgLoginLogService;
 import com.zrqx.member.fg.member.service.FgMemberService;
@@ -77,7 +76,7 @@ public class FgPermissionsController {
 	@Autowired
 	private QQLoginClient qqLogin;
 	@Autowired
-	private SdkSmsClient sdkSmsClient;
+	private SmsClient smsClient;
 	@Autowired
 	private FgMemberService mService;
 	@Autowired
@@ -619,11 +618,12 @@ public class FgPermissionsController {
 		if (StringUtils.isNotBlank(sendPhoneCount) && sendPhoneCount.equals("10")) {
 			throw new BaseException(17,"当天注册发送验证码超过10次");
 		}
-		SdkSmsForm ssf = new SdkSmsForm();
-		ssf.setMobile(phone);
+		SmsForm ssf = new SmsForm();
+		ssf.setPhone(phone);
 		String code = PasswordUtil.createPassword(6, 1);
-		ssf.setContent("您的验证码是："+code+"，在5分钟内有效。如非本人操作请忽略本短信。");
-		CallBack<String> sms = sdkSmsClient.send(ssf);
+		ssf.setCode(code);
+		ssf.setType(5);	///更换手机号验证验证码
+		CallBack<String> sms = smsClient.sendSms(ssf);
 		if(sms!=null && sms.isStatus()){
 			redis.set(phone, code,60*5,TimeUnit.SECONDS);
 			sendPhoneCount = StringUtils.isBlank(sendPhoneCount) ? "1" : Integer.parseInt(sendPhoneCount) + 1 + "";
@@ -645,11 +645,12 @@ public class FgPermissionsController {
 		if(redis.get(sendTime) != null) {
 			throw new BaseException(16,"60s内不能再次发送");
 		}
-		SdkSmsForm ssf = new SdkSmsForm();
-		ssf.setMobile(phone);
+		SmsForm ssf = new SmsForm();
+		ssf.setPhone(phone);
 		String code = PasswordUtil.createPassword(6, 1);
-		ssf.setContent("您的验证码是："+code+"，在5分钟内有效。如非本人操作请忽略本短信。");
-		CallBack<String> sms = sdkSmsClient.send(ssf);
+		ssf.setCode(code);
+		ssf.setType(3);	///更换手机号验证验证码
+		CallBack<String> sms = smsClient.sendSms(ssf);
 		if(sms!=null && sms.isStatus()){
 			redis.set(phone, code,60*5,TimeUnit.SECONDS);
 			redis.set(sendTime, "60", 60);
@@ -668,11 +669,12 @@ public class FgPermissionsController {
 		if(redis.get(sendTime) != null) {
 			throw new BaseException(16,"60s内不能再次发送");
 		}
-		SdkSmsForm ssf = new SdkSmsForm();
-		ssf.setMobile(phone);
+		SmsForm ssf = new SmsForm();
+		ssf.setPhone(phone);
 		String code = PasswordUtil.createPassword(6, 1);
-		ssf.setContent("您的验证码是："+code+"，在5分钟内有效。如非本人操作请忽略本短信。");
-		CallBack<String> sms = sdkSmsClient.send(ssf);
+		ssf.setCode(code);
+		ssf.setType(2);	///更换手机号验证验证码
+		CallBack<String> sms = smsClient.sendSms(ssf);
 		if(sms!=null && sms.isStatus()){
 			redis.set(phone, code,60*5,TimeUnit.SECONDS);
 			redis.set(sendTime, "60", 60);

com.zrqx.member/src/main/java/com/zrqx/member/fg/personalcenter/PersonalCenterConteroller.java

@@ -2,13 +2,8 @@ package com.zrqx.member.fg.personalcenter;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -35,11 +30,10 @@ import com.zrqx.core.enums.member.LevelEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.member.fg.permissions.BindForm;
 import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
-import com.zrqx.core.form.member.fg.personalcenter.AddVipMemberForm;
 import com.zrqx.core.form.member.fg.personalcenter.UpdateMemberForm;
 import com.zrqx.core.form.member.fg.personalcenter.UpdatePasswordForm;
 import com.zrqx.core.form.member.fg.personalcenter.UpdatePhoneForm;
-import com.zrqx.core.form.third.sdksms.SdkSmsForm;
+import com.zrqx.core.form.third.sms.SmsForm;
 import com.zrqx.core.model.member.ExpertMember;
 import com.zrqx.core.model.member.Member;
 import com.zrqx.core.model.member.PersonalMember;
@@ -53,7 +47,7 @@ import com.zrqx.core.vo.order.fg.FgOrderVO;
 import com.zrqx.core.vo.order.fg.OrderPayVo;
 import com.zrqx.member.commons.redis.Redis;
 import com.zrqx.member.fg.client.order.OrderClient;
-import com.zrqx.member.fg.client.third.SdkSmsClient;
+import com.zrqx.member.fg.client.third.SmsClient;
 import com.zrqx.member.fg.emember.service.FgExpertMemberService;
 import com.zrqx.member.fg.member.service.FgMemberService;
 import com.zrqx.member.fg.omember.service.FgOrganMemberService;
@@ -80,7 +74,7 @@ public class PersonalCenterConteroller {
 	@Autowired
 	private FgOrganMemberService omService;
 	@Autowired
-	private SdkSmsClient sdkSmsClient;
+	private SmsClient smsClient;
 	@Autowired
 	private Redis redis;
 	@Autowired
@@ -216,11 +210,12 @@ public class PersonalCenterConteroller {
 		if (StringUtils.isNotBlank(sendPhoneCount) && sendPhoneCount.equals("10")) {
 			throw new BaseException(17, "当天注册发送验证码超过10次");
 		}
-		SdkSmsForm ssf = new SdkSmsForm();
-		ssf.setMobile(phone);
+		SmsForm ssf = new SmsForm();
+		ssf.setPhone(phone);
 		String code = PasswordUtil.createPassword(6, 1);
-		ssf.setContent("您的验证码是：" + code + "，在5分钟内有效。如非本人操作请忽略本短信。");
-		CallBack<String> sms = sdkSmsClient.send(ssf);
+		ssf.setCode(code);
+		ssf.setType(1);	///更换手机号验证验证码
+		CallBack<String> sms = smsClient.sendSms(ssf);
 		if (sms != null && sms.isStatus()) {
 			redis.set(phone, code, 60 * 5, TimeUnit.SECONDS);
 			sendPhoneCount = StringUtils.isBlank(sendPhoneCount) ? "1" : Integer.parseInt(sendPhoneCount) + 1 + "";