Merge remote-tracking branch 'origin/div' into div

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java

@@ -9,10 +9,11 @@


import com.yeshi.fanli.dao.mybatis.SMSHistoryMapper;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;

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);

      // 验证码模板

@@ -42,12 +43,16 @@
            msgCode);

      // 发送短信

      // 发送间隔2分钟内的采用阿里云短信发送

      if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

      String cacheString = redisManager.getCommonString(key);

      if (StringUtil.isNullOrEmpty(cacheString) || Integer.parseInt(cacheString) < 2) {

         TencentSMSUtil.sendSingleMsg(phone, msg);

         redisManager.cacheCommonString(key, "1", 120);

         redisManager.increase(key);

         redisManager.expire(key, 120);

      } else {

         redisManager.removeCommonString(key);

         // 发送阿里云短信

         JSONObject data = new JSONObject();

         data.put("code", msgCode);

         AliyunSMSUtil.sendSingleMsg(phone, Constant.smsConfig.getAliyunLoginTemplatecode(), data.toString());

      }

      // 缓存

@@ -89,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)