|
@@ -53,16 +53,21 @@ public class SmsServiceImpl implements SmsService {
|
|
@Override
|
|
@Override
|
|
public void sendSms(SmsAssemblyCacheBean smsAssembly, List<String> phoneList,
|
|
public void sendSms(SmsAssemblyCacheBean smsAssembly, List<String> phoneList,
|
|
Map<String, String> params) {
|
|
Map<String, String> params) {
|
|
-
|
|
|
|
- execute(smsAssembly, "SendSms", phoneList, params);
|
|
|
|
|
|
+ boolean virtualEnable = PropertyHolder.getBoolean("sms.virtual.enable", false);
|
|
|
|
+ if (!virtualEnable) {
|
|
|
|
+ try {
|
|
|
|
+ execute(smsAssembly, "SendSms", phoneList, params);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ // ignore
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void sendSmsCode(String phone, String code) {
|
|
public void sendSmsCode(String phone, String code) {
|
|
{
|
|
{
|
|
|
|
|
|
- boolean virtualEnable = PropertyHolder.getBoolean("sms.securityCode.virtual.enable",
|
|
|
|
- false);
|
|
|
|
|
|
+ boolean virtualEnable = PropertyHolder.getBoolean("sms.smsCode.virtual.enable", false);
|
|
|
|
|
|
if (virtualEnable) {
|
|
if (virtualEnable) {
|
|
return;
|
|
return;
|
|
@@ -119,42 +124,39 @@ public class SmsServiceImpl implements SmsService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void validateSmsCode(String phone, String code) {
|
|
public void validateSmsCode(String phone, String code) {
|
|
- {
|
|
|
|
|
|
|
|
- boolean virtualEnable = PropertyHolder.getBoolean("sms.securityCode.virtual.enable",
|
|
|
|
- false);
|
|
|
|
|
|
+ boolean virtualEnable = PropertyHolder.getBoolean("sms.smsCode.virtual.enable", false);
|
|
|
|
|
|
- if (virtualEnable) {
|
|
|
|
- String virtualCode = PropertyHolder.getString("sms.securityCode.virtual.code",
|
|
|
|
- "5220");
|
|
|
|
- if (!virtualCode.equals(code)) {
|
|
|
|
- throw new StatusException("102008", "验证码错误");
|
|
|
|
- } else {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+ if (virtualEnable) {
|
|
|
|
+ String virtualCode = PropertyHolder.getString("sms.smsCode.virtual.code", "5220");
|
|
|
|
+ if (!virtualCode.equals(code)) {
|
|
|
|
+ throw new StatusException("102008", "验证码错误");
|
|
|
|
+ } else {
|
|
|
|
+ return;
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
|
|
- String key = "$_SMS:" + phone;
|
|
|
|
- ShortMessageInfo sm = redisClient.get(key, ShortMessageInfo.class);
|
|
|
|
|
|
+ String key = "$_SMS:" + phone;
|
|
|
|
+ ShortMessageInfo sm = redisClient.get(key, ShortMessageInfo.class);
|
|
|
|
|
|
- if (null == sm) {
|
|
|
|
- throw new StatusException("102001", "未发送验证码");
|
|
|
|
- }
|
|
|
|
- List<Date> sendTimeList = sm.getSendTimeList();
|
|
|
|
- Date date = sendTimeList.get(sendTimeList.size() - 1);
|
|
|
|
- Date now = new Date();
|
|
|
|
|
|
+ if (null == sm) {
|
|
|
|
+ throw new StatusException("102001", "未发送验证码");
|
|
|
|
+ }
|
|
|
|
+ List<Date> sendTimeList = sm.getSendTimeList();
|
|
|
|
+ Date date = sendTimeList.get(sendTimeList.size() - 1);
|
|
|
|
+ Date now = new Date();
|
|
|
|
|
|
- if (now.getTime() - date.getTime() > 1000 * 60 * 5) {
|
|
|
|
- throw new StatusException("102002", "验证码过期");
|
|
|
|
- }
|
|
|
|
|
|
+ if (now.getTime() - date.getTime() > 1000 * 60 * 5) {
|
|
|
|
+ throw new StatusException("102002", "验证码过期");
|
|
|
|
+ }
|
|
|
|
|
|
- if (!sm.getLastMessage().equals(code)) {
|
|
|
|
- throw new StatusException("102003", "验证码错误");
|
|
|
|
- } else {
|
|
|
|
- sm.setLastMessage(UUID.randomUUID());
|
|
|
|
- redisClient.set(key, sm);
|
|
|
|
- }
|
|
|
|
|
|
+ if (!sm.getLastMessage().equals(code)) {
|
|
|
|
+ throw new StatusException("102003", "验证码错误");
|
|
|
|
+ } else {
|
|
|
|
+ sm.setLastMessage(UUID.randomUUID());
|
|
|
|
+ redisClient.set(key, sm);
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|