Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/util/SmsUtil.java

@@ -2,6 +2,7 @@ package com.abi.qms.platform.infrastructure.util;
 
 import com.abi.qms.platform.feign.SmsClient;
 import com.abi.smscenter.dto.SmsTemplateMsgDto;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -15,6 +16,7 @@ import java.util.UUID;
  * @author AndyTan
  */
 @Component
+@Slf4j
 public class SmsUtil {
 
     @Autowired
@@ -34,7 +36,7 @@ public class SmsUtil {
         smsDto.setPhones(mobile);
         //uuid
         smsDto.setRequestId(String.valueOf(UUID.randomUUID()));
-        //qms-codepackage
+        //qms-codepackagesendMobileMsg
         smsDto.setSource(source);
         //模板code
         smsDto.setTemplateCode(templateCode);
@@ -44,7 +46,10 @@ public class SmsUtil {
         Map<String, Object> map = new HashMap<>();
         map.put("code", code);
         smsDto.setParamMap(map);
-        smsClient.sendTemplateMsg(smsDto);
+        try {
+            smsClient.sendTemplateMsg(smsDto);
+        }catch (Exception e){
+            log.warn("发送短信失败,",e);
+        }
     }
-
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -423,7 +423,7 @@ public class QrPackageServiceImpl implements QrPackageService {
     public ListQrPackageRes listQrPackage(ListQrPackageReq req) {
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
         //todo:测试定位问题
-        log.info("===码包分页查询数据隔离问题定位==》userUtil.getWholeUser()：" + JSONUtil.toJsonStr(userUtil.getWholeUser()));
+        log.info("===码包分页查询数据隔离问题定位==》userUtil.getWholeUser()：{}" , JSONUtil.toJsonStr(userUtil.getWholeUser()));
         if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType())) {
             req.setFactoryCoverId(userUtil.getWholeUser().getFactoryId());
         }
@@ -776,12 +776,11 @@ public class QrPackageServiceImpl implements QrPackageService {
 
         //获取随机验证码
         String captcha = RandomCodeUtils.getCaptcha(6);
-
+        log.info("开始执行发送短信:{}",captcha);
         //发送短信
         smsUtil.sendCode(mobile, captcha);
-
         //将验证码存入redis
-        redisClient.getRedisTemplate().opsForValue().set(key, captcha, 30 * 60, TimeUnit.SECONDS);
+        redisClient.set(key, captcha, 30 * 60, TimeUnit.SECONDS);
     }
 
     /**