[feat]

1、优化短信硬编码配置
2、增加短信开关

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/LoginToWebsiteController.java

@@ -114,6 +114,9 @@ public class LoginToWebsiteController {
     @Autowired
     private SmsSwitch smsSwitch;
 
+    @Autowired
+    private SMSUtils smsUtils;
+
     private static final String SHOW_NAME_FIELD = "showName";
     private static final String HEAD_IMAGE_URL_FIELD = "headImageUrl";
 
@@ -261,7 +264,7 @@ public class LoginToWebsiteController {
 //        String code = String.valueOf(rondom);
         // 校验成功后，发短信到手机
 //        SmsResponse huawei = SmsFactory.getSmsBlend("huawei").sendMessage(checkImageDto.getPhoneNumber(), random);
-        SMSUtils.sendMsg(checkImageDto.getCountryCode(), checkImageDto.getPhoneNumber(), random);
+        smsUtils.sendMsg(checkImageDto.getCountryCode(), checkImageDto.getPhoneNumber(), random);
         String smsCodeKey = CacheConstants.getSmsCodeKey(checkImageDto.getPhoneNumber());
         //5分钟有效时长
         redissonClient.getBucket(smsCodeKey).set(random, CacheConstants.getSmsEffectiveSeconds(), TimeUnit.SECONDS);

application-webadmin/src/main/java/com/tourism/webadmin/back/util/SMSUtils.java

@@ -1,34 +1,38 @@
 package com.tourism.webadmin.back.util;
 
 import com.alibaba.fastjson.JSON;
+import com.tourism.webadmin.config.SmsSwitch;
 import com.volcengine.model.request.SmsSendRequest;
 import com.volcengine.model.response.SmsSendResponse;
 import com.volcengine.service.sms.SmsService;
 import com.volcengine.service.sms.SmsServiceInfoConfig;
 import com.volcengine.service.sms.impl.SmsServiceImpl;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class SMSUtils {
+
+    @Autowired
+    private SmsSwitch smsSwitch;
     private static final String AK = "AKLTYzA3ZDNiY2M5MWNlNGM1NThhM2ZlN2JhNTIyYWMxZDA";
 
     private static final String SK = "WXpVME1USTBNbVprTnpKaU5HTTNORGhsT1dJNU1tUXlaVFl4TjJVeE1Uaw==";
 
     private static SmsService smsService = SmsServiceImpl.getInstance(new SmsServiceInfoConfig(AK, SK));
 
-    public static void sendMsg(String countryCode, String phoneNumber, String code){
+    public void sendMsg(String countryCode, String phoneNumber, String code){
         SmsSendRequest req = new SmsSendRequest();
         req.setPhoneNumbers(countryCode.replaceAll("\\+", "") + phoneNumber);
+        req.setSmsAccount(smsSwitch.getSmsAccount());
         if(countryCode.equals("86") || StringUtils.isBlank(countryCode)){
-            req.setSmsAccount("7fe76339");
-            req.setTemplateId("ST_7fe71e56");
-            req.setSign("山东老韩国际人才合作");
+            req.setTemplateId(smsSwitch.getChinaTemplateId());
+            req.setSign(smsSwitch.getChinaSign());
         }else {
-            req.setSmsAccount("7fe76339");
-            req.setTemplateId("ST_7fe70c7c");
-            req.setSign("XYTravel");
+            req.setTemplateId(smsSwitch.getOtherTemplateId());
+            req.setSign(smsSwitch.getOtherSign());
         }
 
         Map<String,String> param = new HashMap<>();

application-webadmin/src/main/java/com/tourism/webadmin/config/SmsSwitch.java

@@ -6,10 +6,30 @@ import org.springframework.stereotype.Component;
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "sms")
+@ConfigurationProperties(prefix = "sms.blends.huawei")
 public class SmsSwitch {
     /**
      * 短信开关
      */
     private boolean enable;
+    /**
+     * 短信账号
+     */
+    private String smsAccount;
+    /**
+     * 国内签名
+     */
+    private String chinaSign;
+    /**
+     * 国外签名
+     */
+    private String otherSign;
+    /**
+     * 国内模板ID
+     */
+    private String chinaTemplateId;
+    /**
+     * 国外模板ID
+     */
+    private String otherTemplateId;
 }

application-webadmin/src/main/resources/application-prod.yml

@@ -206,7 +206,6 @@ sa-token:
   is-read-header: true
   is-read-cookie: false
 sms:
-  enable: false
   config-type: yaml
   blends:
     huawei:
@@ -224,6 +223,18 @@ sms:
       statusCallBack:
       #华为分配的app请求地址
       url: https://smsapi.cn-north-4.myhuaweicloud.com:443
+      #华为短信开关
+      enable: true
+      #短信账号
+      smsAccount: 7fe76339
+      #国内短信签名
+      chinaSign: 山东老韩国际人才合作
+      #国外短信签名
+      otherSign: XYTravel
+      #国内短信模板
+      chinaTemplateId: ST_7fe71e56
+      #国外短信模板
+      otherTemplateId: ST_7fe70c7c
 wx:
   miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
     appid: wx2d0bc678042f0817

application-webadmin/src/main/resources/application-test.yml

@@ -214,7 +214,6 @@ sa-token:
   is-read-header: true
   is-read-cookie: false
 sms:
-  enable: false
   config-type: yaml
   blends:
     huawei:
@@ -232,6 +231,18 @@ sms:
       statusCallBack:
       #华为分配的app请求地址
       url: https://smsapi.cn-north-4.myhuaweicloud.com:443
+      #华为短信开关
+      enable: true
+      #短信账号
+      smsAccount: 7fe76339
+      #国内短信签名
+      chinaSign: 山东老韩国际人才合作
+      #国外短信签名
+      otherSign: XYTravel
+      #国内短信模板
+      chinaTemplateId: ST_7fe71e56
+      #国外短信模板
+      otherTemplateId: ST_7fe70c7c
 wx:
   miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
     appid: wx2d0bc678042f0817