短信问题修改

src/main/java/com/ydtech/components/aliyun/AliyunApiSmsProperties.java → src/main/java/com/ydtech/components/aliyun/AliyunApiProperties.java

@@ -7,8 +7,8 @@ import org.springframework.stereotype.Component;
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "aliyun.api.sms")
-public class AliyunApiSmsProperties {
+@ConfigurationProperties(prefix = "aliyun.api")
+public class AliyunApiProperties {
 
     //
     private String accessKeyId;
@@ -16,7 +16,4 @@ public class AliyunApiSmsProperties {
     //
     private String accessKeySecret;
 
-    // 签名
-    private String signName;
-
 }

src/main/java/com/ydtech/components/aliyun/SMSVerificationCode.java

@@ -0,0 +1,14 @@
+package com.ydtech.components.aliyun;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@AllArgsConstructor
+@Data
+public class SMSVerificationCode {
+
+    @JsonProperty(value = "code")
+    private String code;
+
+}

src/main/java/com/ydtech/components/aliyun/SendSmsComponents.java

@@ -7,7 +7,6 @@ import com.aliyun.tea.TeaException;
 import com.aliyun.teaopenapi.models.Config;
 import com.aliyun.teautil.models.RuntimeOptions;
 import com.ydtech.exception.SystemException;
-import com.ydtech.utils.aliyun.SendSms;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -18,11 +17,11 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 public class SendSmsComponents {
 
-    private final AliyunApiSmsProperties properties;
+    private final AliyunApiProperties properties;
 
     /**
-     * @description: TODO
-     * @author: wenks 
+     * @description: 创建请求
+     * @author: wenks
      * @date: 2024/11/6 8:46
      * @return:
      **/
@@ -33,23 +32,27 @@ public class SendSmsComponents {
                 // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。
                 .setAccessKeyId(properties.getAccessKeyId())
                 // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。
-                .setAccessKeySecret(properties.getAccessKeyId());
+                .setAccessKeySecret(properties.getAccessKeySecret());
         // Endpoint 请参考 https://api.aliyun.com/product/Dysmsapi
         config.endpoint = "dysmsapi.aliyuncs.com";
         return new Client(config);
     }
 
-
-    public void sendSms(String phoneNumber, SendSmsEnum sendSmsEnum) throws Exception {
-        Client client = SendSms.createClient();
+    public void sendSms(String phoneNumber, SendSmsEnum sendSmsEnum, String templateParam) throws Exception {
+        Client client = createClient();
         SendSmsRequest sendSmsRequest = new SendSmsRequest()
                 .setPhoneNumbers(phoneNumber)
-                .setSignName(properties.getSignName())
-                .setTemplateCode(sendSmsEnum.getCode());
+                .setSignName(sendSmsEnum.getSignName())
+                .setTemplateCode(sendSmsEnum.getCode())
+                .setTemplateParam(templateParam);
+
+        sendSmsData(client, sendSmsRequest);
+    }
 
+    private void sendSmsData(Client client, SendSmsRequest sendSmsRequest) {
         try {
             // 复制代码运行请自行打印 API 的返回值
-            client.sendSmsWithOptions(sendSmsRequest, new RuntimeOptions());
+            client.sendSms(sendSmsRequest);
         } catch (TeaException error) {
             // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
             // 错误 message
@@ -64,6 +67,5 @@ public class SendSmsComponents {
             // 诊断地址
             log.info((String) error.getData().get("Recommend"));
         }
-        throw new SystemException("发送短信异常请重试");
     }
 }

src/main/java/com/ydtech/components/aliyun/SendSmsEnum.java

@@ -2,17 +2,19 @@ package com.ydtech.components.aliyun;
 
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 public enum SendSmsEnum {
 
-    SMS_220650023("SMS_220650023", "验证码短信");
+    SMS_220650023("SMS_220650023", "山西掌柜鼎科技", "验证码短信"),
+    SMS_481735501("SMS_481735501", "晋掌柜", "验证码短信");
 
     private final String code;
 
+    private final String signName;
+
     private final String desc;
 
 }

src/main/java/com/ydtech/utils/aliyun/SendSms.java

@@ -1,64 +0,0 @@
-package com.ydtech.utils.aliyun;
-
-import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
-import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
-import com.aliyun.tea.TeaException;
-import com.aliyun.teaopenapi.models.Config;
-import com.aliyun.dysmsapi20170525.Client;
-import com.aliyun.teautil.models.RuntimeOptions;
-import com.ydtech.exception.SystemException;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Slf4j
-public class SendSms {
-
-    /**
-     * <b>description</b> :
-     * <p>使用AK&amp;SK初始化账号Client</p>
-     *
-     * @return Client
-     * @throws Exception
-     */
-    public static Client createClient() throws Exception {
-        // 工程代码泄露可能会导致 AccessKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考。
-        // 建议使用更安全的 STS 方式，更多鉴权访问方式请参见：https://help.aliyun.com/document_detail/378657.html。
-        Config config = new Config()
-                // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。
-                .setAccessKeyId(System.getenv("ALIBABA_CLOUD_ACCESS_KEY_ID"))
-                // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。
-                .setAccessKeySecret(System.getenv("ALIBABA_CLOUD_ACCESS_KEY_SECRET"));
-        // Endpoint 请参考 https://api.aliyun.com/product/Dysmsapi
-        config.endpoint = "dysmsapi.aliyuncs.com";
-        return new Client(config);
-    }
-
-    public static void sendSms(String phoneNumber, String signName, String templateCode) throws Exception {
-        Client client = SendSms.createClient();
-        SendSmsRequest sendSmsRequest = new SendSmsRequest()
-                .setPhoneNumbers(phoneNumber)
-                .setSignName(signName)
-                .setTemplateCode(templateCode);
-
-        try {
-            // 复制代码运行请自行打印 API 的返回值
-            client.sendSmsWithOptions(sendSmsRequest, new RuntimeOptions());
-        } catch (TeaException error) {
-            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
-            // 错误 message
-            log.info(error.getMessage());
-            // 诊断地址
-            log.info((String) error.getData().get("Recommend"));
-        } catch (Exception _error) {
-            TeaException error = new TeaException(_error.getMessage(), _error);
-            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
-            // 错误 message
-            log.info(error.getMessage());
-            // 诊断地址
-            log.info((String) error.getData().get("Recommend"));
-        }
-        throw new SystemException("发送短信异常请重试");
-    }
-
-}

src/main/resources/application-pre.yml

@@ -21,14 +21,12 @@ baidu:
   idcard: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
 
 
+
 ## 阿里云
 aliyun:
   api:
-    # 发送短信
-    sms:
-      access-key-id:
-      access-key-secret:
-      sign-name:
+    access-key-id: LTAI5tPMfiyeXCfJ2nYhx5zp
+    access-key-secret: VWP8tw3uGlKkxCbCH8ZzTrYVRsWvxj
 
 
 #银联API参数配置

src/main/resources/application-prod.yml

@@ -20,14 +20,12 @@ baidu:
   vehicle: https://aip.baidubce.com/rest/2.0/ocr/v1/vehicle_license
   idcard: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
 
+
 ## 阿里云
 aliyun:
   api:
-    # 发送短信
-    sms:
-      access-key-id:
-      access-key-secret:
-      sign-name:
+    access-key-id: LTAI5tPMfiyeXCfJ2nYhx5zp
+    access-key-secret: VWP8tw3uGlKkxCbCH8ZzTrYVRsWvxj
 
 
 #银联API参数配置

src/main/resources/application-test.yml

@@ -22,14 +22,12 @@ baidu:
   vehicle: https://aip.baidubce.com/rest/2.0/ocr/v1/vehicle_license
   idcard: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
 
+
 ## 阿里云
 aliyun:
   api:
-    # 发送短信
-    sms:
-      access-key-id:
-      access-key-secret:
-      sign-name:
+    access-key-id: LTAI5tPMfiyeXCfJ2nYhx5zp
+    access-key-secret: VWP8tw3uGlKkxCbCH8ZzTrYVRsWvxj
 
 #银联API参数配置
 unionPay:
@@ -256,7 +254,7 @@ wechat:
   # 微信客服
   customer:
     corp-id: wwfe67d19509d43ec5
-#    secret: lbn1DU7VhqK3dG0XDciPDXf_AdSryne84nvRhtSEGLc
+    #    secret: lbn1DU7VhqK3dG0XDciPDXf_AdSryne84nvRhtSEGLc
     secret: 5M_5mGONe-t4xCPlwPU-EJt53GiWaUjtbJjY5CR-dgc
     token: btgwGK2r
     encoding-aes-key: eevs11QeInJYRysGYnC8gK68F4CGsedM1Dn1X79cPCs