|
@@ -11,7 +11,6 @@ import com.inspur.inform.client.email.SmsbEmailService;
|
|
|
import com.inspur.inform.client.sms.SmsbSmsService;
|
|
import com.inspur.inform.client.sms.SmsbSmsService;
|
|
|
import com.inspur.inform.object.message.EmailMessage;
|
|
import com.inspur.inform.object.message.EmailMessage;
|
|
|
import com.inspur.inform.object.message.SmsMessage;
|
|
import com.inspur.inform.object.message.SmsMessage;
|
|
|
-import com.inspur.inform.object.message.sms.SmsbSmsMessageResponse;
|
|
|
|
|
import com.inspur.inform.object.message.sms.SmsbSmsTemplateType;
|
|
import com.inspur.inform.object.message.sms.SmsbSmsTemplateType;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -24,7 +23,8 @@ import java.util.Map;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
|
|
|
|
|
-/**@Description: 验证码相关功能实现类
|
|
|
|
|
|
|
+/**
|
|
|
|
|
+ * 验证码相关功能实现类
|
|
|
* @version v1.0
|
|
* @version v1.0
|
|
|
* @author joe wan
|
|
* @author joe wan
|
|
|
* @date 2022/6/29 17:22
|
|
* @date 2022/6/29 17:22
|
|
@@ -49,6 +49,7 @@ public class AuthCodeServiceImpl implements AuthCodeService {
|
|
|
* @author joe wan
|
|
* @author joe wan
|
|
|
* @date 2022/6/29 17:20
|
|
* @date 2022/6/29 17:20
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @Override
|
|
|
public Response sendAuthCode(AuthCodeDTO authCodeDTO){
|
|
public Response sendAuthCode(AuthCodeDTO authCodeDTO){
|
|
|
try{
|
|
try{
|
|
|
|
|
|
|
@@ -61,7 +62,9 @@ public class AuthCodeServiceImpl implements AuthCodeService {
|
|
|
emailMessage.setEmailContent("【浪潮安播云】您的验证码"+ authcode +",该验证码5分钟内有效,请勿泄漏于他人!");
|
|
emailMessage.setEmailContent("【浪潮安播云】您的验证码"+ authcode +",该验证码5分钟内有效,请勿泄漏于他人!");
|
|
|
emailMessage.setAddressees(Lists.newArrayList(authCodeDTO.getEmail()));
|
|
emailMessage.setAddressees(Lists.newArrayList(authCodeDTO.getEmail()));
|
|
|
Boolean aBoolean = smsbEmailService.sendEmail(emailMessage);
|
|
Boolean aBoolean = smsbEmailService.sendEmail(emailMessage);
|
|
|
- if(aBoolean)redisTemplate.opsForValue().set("smsb:authcode:email:" + authCodeDTO.getEmail(), authcode + "", 5, TimeUnit.MINUTES);
|
|
|
|
|
|
|
+ if(aBoolean) {
|
|
|
|
|
+ redisTemplate.opsForValue().set("smsb:authcode:email:" + authCodeDTO.getEmail(), authcode + "", 5, TimeUnit.MINUTES);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//发送手机短信
|
|
//发送手机短信
|
|
|
if(StringUtils.isNotBlank(authCodeDTO.getPhoneNum())){
|
|
if(StringUtils.isNotBlank(authCodeDTO.getPhoneNum())){
|
|
@@ -72,12 +75,12 @@ public class AuthCodeServiceImpl implements AuthCodeService {
|
|
|
smsMessage.setPhones(Lists.newArrayList(authCodeDTO.getPhoneNum()));
|
|
smsMessage.setPhones(Lists.newArrayList(authCodeDTO.getPhoneNum()));
|
|
|
smsMessage.setSignName("浪潮安播云");
|
|
smsMessage.setSignName("浪潮安播云");
|
|
|
smsMessage.setTemplateType(SmsbSmsTemplateType.AUTH_CODE);
|
|
smsMessage.setTemplateType(SmsbSmsTemplateType.AUTH_CODE);
|
|
|
- SmsbSmsMessageResponse smsbSmsMessageResponse = smsbSmsService.sendWarningMessage(smsMessage);
|
|
|
|
|
- if (smsbSmsMessageResponse.getSuccess()) {
|
|
|
|
|
|
|
+ Response sendResponse = smsbSmsService.sendWarningMessage(smsMessage);
|
|
|
|
|
+ if (sendResponse.isSuccess()) {
|
|
|
redisTemplate.opsForValue().set("smsb:authcode:phoneNum:" + authCodeDTO.getPhoneNum(), authcode + "", 5, TimeUnit.MINUTES);
|
|
redisTemplate.opsForValue().set("smsb:authcode:phoneNum:" + authCodeDTO.getPhoneNum(), authcode + "", 5, TimeUnit.MINUTES);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }catch (Exception e){
|
|
|
|
|
|
|
+ } catch (Exception e){
|
|
|
log.error("发送验证码报错 --》 {}", authCodeDTO, e);
|
|
log.error("发送验证码报错 --》 {}", authCodeDTO, e);
|
|
|
return Response.buildFailure("999","发送失败!");
|
|
return Response.buildFailure("999","发送失败!");
|
|
|
}
|
|
}
|
|
@@ -91,16 +94,21 @@ public class AuthCodeServiceImpl implements AuthCodeService {
|
|
|
* @author joe wan
|
|
* @author joe wan
|
|
|
* @date 2022/6/30 17:56
|
|
* @date 2022/6/30 17:56
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @Override
|
|
|
public AuthCodeCheckResponse checkAuthCode(AuthCodeCheckDTO authCodeCheckDTO){
|
|
public AuthCodeCheckResponse checkAuthCode(AuthCodeCheckDTO authCodeCheckDTO){
|
|
|
|
|
|
|
|
AuthCodeCheckResponse result = new AuthCodeCheckResponse();
|
|
AuthCodeCheckResponse result = new AuthCodeCheckResponse();
|
|
|
if(StringUtils.isNotBlank(authCodeCheckDTO.getPhoneNumAuthCode())){
|
|
if(StringUtils.isNotBlank(authCodeCheckDTO.getPhoneNumAuthCode())){
|
|
|
String authcodePhone = redisTemplate.opsForValue().get("smsb:authcode:phoneNum:" + authCodeCheckDTO.getPhoneNum());
|
|
String authcodePhone = redisTemplate.opsForValue().get("smsb:authcode:phoneNum:" + authCodeCheckDTO.getPhoneNum());
|
|
|
- if(authCodeCheckDTO.getPhoneNumAuthCode().equals(authcodePhone))result.setCheckPhoneNum(true);
|
|
|
|
|
|
|
+ if(authCodeCheckDTO.getPhoneNumAuthCode().equals(authcodePhone)) {
|
|
|
|
|
+ result.setCheckPhoneNum(true);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if(StringUtils.isNotBlank(authCodeCheckDTO.getEmailAuthCode())){
|
|
if(StringUtils.isNotBlank(authCodeCheckDTO.getEmailAuthCode())){
|
|
|
String authcodeEmail = redisTemplate.opsForValue().get("smsb:authcode:email:" + authCodeCheckDTO.getEmail());
|
|
String authcodeEmail = redisTemplate.opsForValue().get("smsb:authcode:email:" + authCodeCheckDTO.getEmail());
|
|
|
- if(authCodeCheckDTO.getEmailAuthCode().equals(authcodeEmail))result.setCheckEmail(true);
|
|
|
|
|
|
|
+ if(authCodeCheckDTO.getEmailAuthCode().equals(authcodeEmail)) {
|
|
|
|
|
+ result.setCheckEmail(true);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|