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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/EnvConstant.java

@@ -0,0 +1,15 @@
+package com.sckw.core.common.enums;
+
+/**
+ * @desc: 环境常量
+ * @author: yzc
+ * @date: 2023-09-28 17:14
+ */
+public class EnvConstant {
+
+    public static final String LOCAL = "local";
+    public static final String DEV = "dev";
+    public static final String TEST = "test";
+    public static final String PROD = "prod";
+
+}

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SckwSmsHandlerService.java

@@ -1,14 +1,17 @@
 package com.sckw.message.service;
 
 import com.alibaba.fastjson2.JSON;
+import com.sckw.core.common.enums.EnvConstant;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.message.model.KwmSms;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.stream.enums.SmsCodeEnum;
 import com.sckw.stream.model.SckwSms;
+import com.sckw.stream.utils.SmsUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 /**
@@ -23,6 +26,10 @@ public class SckwSmsHandlerService {
 
     private final KwmSmsService kwmSmsService;
 
+    @Value("${spring.profiles.active}")
+    private String env;
+
+
     /**
      * @param sckwSms
      * @return void
@@ -45,8 +52,10 @@ public class SckwSmsHandlerService {
                 throw new BusinessException("请勿频繁获取短信验证码！");
             }
             RedissonUtils.putString(requestKey, String.valueOf(sckwSms.getParams().get("code")), RedisConstant.SMS_VERIFY_CODE_REQUEST_TIME);
-            //发送短信 TODO:测试暂时屏蔽，上线再放开
-//            SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
+            //发送短信 生产环境才发短信
+            if (EnvConstant.PROD.equals(env)) {
+                SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
+            }
             //放入缓存
             String valueKey = getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, type, phone);
             RedissonUtils.putString(valueKey, String.valueOf(sckwSms.getParams().get("code")), RedisConstant.SMS_VERIFY_CODE_VALID_TIME);

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SmsService.java

@@ -1,10 +1,12 @@
 package com.sckw.message.service;
 
 import com.alibaba.fastjson2.JSON;
+import com.sckw.core.common.enums.EnvConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.NumberUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.message.model.vo.req.GetSmsVerifyCoderReqVO;
@@ -17,6 +19,7 @@ import com.sckw.system.api.RemoteSystemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +43,10 @@ public class SmsService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
+    @Value("${spring.profiles.active}")
+    private String env;
+
+
     /**
      * @param param
      * @return com.sckw.core.web.response.HttpResult
@@ -50,9 +57,9 @@ public class SmsService {
     public void sendVerifyCode(SendSmsVerifyCoderReqVO param) {
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(Collections.singletonList(DictTypeEnum.SEND_SMS_TYPE.getType()));
         Map<String, String> map;
-        if (CollectionUtils.isNotEmpty(dict)){
+        if (CollectionUtils.isNotEmpty(dict)) {
             map = dict.get(DictTypeEnum.SEND_SMS_TYPE.getType());
-        }else {
+        } else {
             map = new HashMap<>();
         }
         String type = param.getType();
@@ -65,9 +72,9 @@ public class SmsService {
             throw new BusinessException("请勿频繁获取短信验证码！");
         }
         Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        //TODO:测试先写死code码为123456，上线再放开
-        params.put("code", 123456);
-//        params.put("code", NumberUtils.createRandomVcode());
+        //生产环境才发短信
+        String code = EnvConstant.PROD.equals(env) ? NumberUtils.createRandomVcode() : "123456";
+        params.put("code", code);
         SckwSms sckwSms = new SckwSms();
         sckwSms.setPhone(param.getPhone()).setType(type).setTemplateCode(SmsCodeEnum.VERIFICATION_CODE)
                 .setParams(params).setCreateBy(LoginUserHolder.getUserId());