From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java
index b75abfa..0e73af3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java
@@ -13,6 +13,7 @@
import com.yeshi.fanli.service.inter.user.SMSService;
import com.yeshi.fanli.util.AliyunSMSUtil;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TencentSMSUtil;
@@ -34,7 +35,7 @@
if (limit)
throw new SMSException(1001, "璇疯繃60绉掑啀璇�");
- String key = StringUtil.Md5("sms-login-tencent-latest-" + phone);
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5("sms-login-tencent-latest-" + phone));
String msgCode = StringUtil.getVerifyCode(codeLength);
// 楠岃瘉鐮佹ā鏉�
@@ -93,6 +94,31 @@
}
@Override
+ public void sendRemoveVCode(String phone, int codeLength) throws SMSException {
+ boolean limit = redisManager.isSmsFrequencyLimit(phone, SMSHistory.TYPE_REMVOE);
+ if (limit)
+ throw new SMSException(1001, "璇疯繃60绉掑啀璇�");
+ String msgCode = StringUtil.getVerifyCode(codeLength);
+
+ // 楠岃瘉鐮佹ā鏉�
+ String msg = Constant.smsConfig.getSmsBind().replace("[绛惧悕]", Constant.smsConfig.getSmsSign()).replace("[楠岃瘉鐮乚",
+ msgCode);
+ // 鍙戦�佺煭淇�
+ TencentSMSUtil.sendSingleMsg(phone, msg);
+
+ // 缂撳瓨
+ redisManager.sendSms(phone, SMSHistory.TYPE_REMVOE);
+ redisManager.saveSMSVCode(phone, SMSHistory.TYPE_REMVOE, msgCode);
+
+ SMSHistory smsHistory = new SMSHistory();
+ smsHistory.setContent(msg);
+ smsHistory.setCreateTime(new Date());
+ smsHistory.setPhone(phone);
+ smsHistory.setType(SMSHistory.TYPE_REMVOE);
+ smsHistoryMapper.insertSelective(smsHistory);
+ }
+
+ @Override
public void sendExtractVCode(String phone) throws SMSException {
boolean limit = redisManager.isSmsFrequencyLimit(phone, SMSHistory.TYPE_EXTRACT);
if (limit)
--
Gitblit v1.8.0