Skip to content

X
xyqb-user2
Commit 5f0f7ec6 authored by ycl's avatar ycl
Browse files
Options

format

parent 921b6f8d
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 92 deletions
pom.xml
View file @ 5f0f7ec6
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<dependency> <dependency>
<groupId>cn.quantgroup</groupId> <groupId>cn.quantgroup</groupId>
<artifactId>quantgroup-sms-sdk</artifactId> <artifactId>quantgroup-sms-sdk</artifactId>
<version>3.0</version> <version>3.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
src/main/java/cn/quantgroup/xyqb/service/sms/impl/SmsServiceImpl.java
View file @ 5f0f7ec6
...@@ -4,121 +4,117 @@ import cn.quantgroup.sms.MsgParams; ...@@ -4,121 +4,117 @@ import cn.quantgroup.sms.MsgParams;
import cn.quantgroup.sms.SmsSender; import cn.quantgroup.sms.SmsSender;
import cn.quantgroup.xyqb.Constants; import cn.quantgroup.xyqb.Constants;
import cn.quantgroup.xyqb.service.sms.ISmsService; import cn.quantgroup.xyqb.service.sms.ISmsService;
import java.util.Collections;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections;
/** /**
* @author mengfan.feng * @author mengfan.feng
* @time 2015-07-25 18:47 * @time 2015-07-25 18:47
*/ */
@Service @Service
@Slf4j
public class SmsServiceImpl implements ISmsService { public class SmsServiceImpl implements ISmsService {
private static final Logger LOGGER = LoggerFactory.getLogger(SmsServiceImpl.class); private static final int SMS_VERIFICATION_MAXLEN = 4;
private static final String SMS_VERIFY_PREFIX = "sms:verify:";
private static SmsSender smsSender = new SmsSender();
@Value("${sms.is.debug}")
private Boolean isDebug;
private static final int SMS_VERIFICATION_MAXLEN = 4; private final RedisTemplate<String, String> stringRedisTemplate;
private static final String SMS_VERIFY_PREFIX = "sms:verify:";
private static final SmsSender smsSender = new SmsSender();
@Value("${sms.is.debug}")
private Boolean isDebug;
@Autowired
@Qualifier("stringRedisTemplate")
private RedisTemplate<String, String> stringRedisTemplate;
@Override @Autowired
public SmsSender getSmsSender() { public SmsServiceImpl(
return smsSender; @Qualifier("stringRedisTemplate") RedisTemplate<String, String> stringRedisTemplate) {
} this.stringRedisTemplate = stringRedisTemplate;
}
@Override @Override
public void sendAfterRegister(String phoneNo) { public SmsSender getSmsSender() {
try { return smsSender;
MsgParams msgParams = new MsgParams(Collections.singletonList(2), phoneNo, "1", "24", Collections.emptyList()); }
smsSender.sendMsg(msgParams);
//smsSender.sendAndForget(new SendAndForgetMsg(Collections.emptyList(), "24", "1", phoneNo));
LOGGER.info("注册完成，发送短信, phoneNo:{}", phoneNo);
} catch (Exception e) {
e.printStackTrace();
}
}
@Override @Override
public void sendAfterRegister(String phoneNo, String contentId) { public void sendAfterRegister(String phoneNo) {
try { try {
if (StringUtils.isBlank(contentId)) { MsgParams msgParams =
contentId = "24"; new MsgParams(Collections.singletonList(2), phoneNo, "1", "24", Collections.emptyList());
} smsSender.sendMsg(msgParams);
MsgParams msgParams = new MsgParams(Collections.singletonList(2), phoneNo, "1", contentId, Collections.emptyList()); //smsSender.sendAndForget(new SendAndForgetMsg(Collections.emptyList(), "24", "1", phoneNo));
smsSender.sendMsg(msgParams); log.info("注册完成，发送短信, phoneNo:{}", phoneNo);
LOGGER.info("注册完成，发送短信, phoneNo:{}", phoneNo); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace();
}
} }
}
/** @Override
* 检查验证码是否正确 public void sendAfterRegister(String phoneNo, String contentId) {
* try {
* @param phoneNo if (StringUtils.isBlank(contentId)) {
* @param smsVerificationCode contentId = "24";
* @return }
*/ MsgParams msgParams = new MsgParams(Collections.singletonList(2), phoneNo, "1", contentId,
@Override Collections.emptyList());
public boolean validRegisterOrResetPasswdVerificationCode(String phoneNo, String smsVerificationCode) { smsSender.sendMsg(msgParams);
//if (StringUtils.isEmpty(smsVerificationCode) || smsVerificationCode.length() != SMS_VERIFICATION_MAXLEN) { log.info("注册完成，发送短信, phoneNo:{}", phoneNo);
// return false; } catch (Exception e) {
//} e.printStackTrace();
String key = Constants.REDIS_PREFIX_VERIFICATION_CODE + phoneNo;
String randomCode = stringRedisTemplate.opsForValue().get(key);
if (StringUtils.isEmpty(randomCode)) {
return false;
}
String[] arr = randomCode.split(":");
String unqiueId = arr[0];
String code = arr[1];
return confirmSms(smsVerificationCode, unqiueId, code);
} }
}
@Override /**
public boolean validateFastLoginVerificationCode(String phoneNo, String verificationCode) { * 检查验证码是否正确
String key = Constants.REDIS_PREFIX_VERIFICATION_CODE + phoneNo; */
String randomCode = stringRedisTemplate.opsForValue().get(key); @Override
if (StringUtils.isBlank(randomCode)) { public boolean validRegisterOrResetPasswdVerificationCode(String phoneNo,
return false; String smsVerificationCode) {
} //if (StringUtils.isEmpty(smsVerificationCode) || smsVerificationCode.length() != SMS_VERIFICATION_MAXLEN) {
String[] arr = randomCode.split(":"); // return false;
if (arr.length != 2) { //}
return false; String key = Constants.REDIS_PREFIX_VERIFICATION_CODE + phoneNo;
} String randomCode = stringRedisTemplate.opsForValue().get(key);
String uniqueId = arr[0]; if (StringUtils.isEmpty(randomCode)) {
String code = arr[1]; return false;
return confirmSms(verificationCode, uniqueId, code);
} }
String[] arr = randomCode.split(":");
String uniqueId = arr[0];
String code = arr[1];
return confirmSms(smsVerificationCode, uniqueId, code);
}
@Override
private boolean confirmSms(String smsVerificationCode, String unqiueId, String code) { public boolean validateFastLoginVerificationCode(String phoneNo, String verificationCode) {
try { String key = Constants.REDIS_PREFIX_VERIFICATION_CODE + phoneNo;
MsgParams message = new MsgParams(Collections.singletonList(2), unqiueId); String randomCode = stringRedisTemplate.opsForValue().get(key);
//MsgParams messageVoice = new MsgParams(Collections.singletonList(4), unqiueId); if (StringUtils.isBlank(randomCode)) {
getSmsSender().confirmMsg(message); return false;
//getSmsSender().confirmMsg(messageVoice);
//smsSender.confirmSmsResult("1", unqiueId);
LOGGER.info("confirmMsg send success, uniqueId={}", unqiueId);
} catch (Exception e) {
LOGGER.info("短信验证向短信中心确认失效");
}
if (StringUtils.equals(code, smsVerificationCode)) {
return true;
}
return false;
} }
String[] arr = randomCode.split(":");
if (arr.length != 2) {
return false;
}
String uniqueId = arr[0];
String code = arr[1];
return confirmSms(verificationCode, uniqueId, code);
}
private boolean confirmSms(String smsVerificationCode, String unqiueId, String code) {
try {
MsgParams message = new MsgParams(Collections.singletonList(2), unqiueId);
//MsgParams messageVoice = new MsgParams(Collections.singletonList(4), unqiueId);
getSmsSender().confirmMsg(message);
//getSmsSender().confirmMsg(messageVoice);
//smsSender.confirmSmsResult("1", unqiueId);
log.info("confirmMsg send success, uniqueId={}", unqiueId);
} catch (Exception e) {
log.info("短信验证向短信中心确认失效");
}
return StringUtils.equals(code, smsVerificationCode);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment