- 各短信平台兼容问题，放弃 sign 和 template 模板审核过程

order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java

@@ -330,7 +330,7 @@ public class OrderServiceImpl implements OrderService {
 //        if (commonResult.isError()) {
 //            //手动开启事务回滚
 //            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_PAY_FAIL.getCode());
+//            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_PAY_FAIL.getValue());
 //        }
 
         // TODO: 2019-03-17 Sin 需要发送 创建成果 MQ 消息，业务扩展和统计

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/SmsPlatform.java

-package cn.iocoder.mall.admin.api;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 短信平台
- *
- * @author Sin
- * @time 2019/5/16 6:33 PM
- */
-public interface SmsPlatform {
-
-    @Data
-    @Accessors(chain = true)
-    class Result {
-        /**
-         * 编号
-         */
-        private String id;
-        /**
-         * 审核状态
-         */
-        private Integer applyStatus;
-        /**
-         * 审核内容
-         */
-        private String applyMessage;
-    }
-
-    /**
-     * 签名 - 创建
-     *
-     * @param sign
-     */
-    Result createSign(String sign);
-
-    /**
-     * 签名 - 获取
-     *
-     * @param sign
-     */
-    Result getSign(String sign);
-
-    /**
-     * 签名 - 更新
-     *
-     * @param oldSign
-     * @param sign
-     */
-    Result updateSign(String oldSign, String sign);
-
-    /**
-     * 模板 - 创建
-     *
-     * @param template 模板内容
-     * @param tplType 1 为验证码类型，其他为 null
-     */
-    Result createTemplate(String template, Integer tplType);
-
-    /**
-     * 模板 - 获取
-     *
-     * @param tplId
-     */
-    Result getTemplate(String tplId);
-
-    /**
-     * 模板 - 更新
-     *
-     * @param tplId 选用的哪个签名
-     * @param template 模板内容
-     * @param tplType 1 为验证码类型，其他为 null
-     */
-    Result updateTemplate(String tplId, String template, Integer tplType);
-
-    /**
-     * 模板 - 删除
-     *
-     * @param tplId
-     * @return
-     */
-    Result deleteTemplate(String tplId);
-
-
-    @Data
-    @Accessors(chain = true)
-    class SendResult {
-
-        private Boolean hasSuccess;
-
-        private Integer code;
-
-        private String message;
-
-        private List<String> success;
-
-        private List<String> fail;
-    }
-
-    /**
-     * 短信发送 - 单个
-     *
-     * @return
-     */
-    SendResult singleSend(String mobile, String template);
-
-    /**
-     * 短信发送 - 批量
-     *
-     * @return
-     */
-    SendResult batchSend(List<String> mobileList, String template);
-}

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/SmsService.java

@@ -39,47 +39,56 @@ public interface SmsService {
      *
      * @param sign
      */
-    void createSign(String sign);
+    void createSign(String sign, Integer platform);
 
     /**
      * 签名 - 获取
      *
-     * @param sign
+     * @param id
      */
-    SmsSignBO getSign(String sign);
+    SmsSignBO getSign(Integer id);
 
     /**
      * 签名 - 更新
      *
-     * @param oldSign
-     * @param sign
+     * @param id
+     * @param newSign
+     * @param platform
+     */
+    void updateSign(Integer id, String newSign, Integer platform);
+
+    /**
+     * 签名 - 更新
+     *
+     * @param id
      */
-    void updateSign(String oldSign, String sign);
+    void deleteSign(Integer id);
 
     /**
      * 模板 - 创建
      *
      * @param smsSignId 选用的哪个签名
      * @param template 模板内容
-     * @param tplType 1 为验证码类型，其他为 null
+     * @param platform 平台
      */
-    void createTemplate(Integer smsSignId, String template, Integer tplType);
+    void createTemplate(Integer smsSignId, String template, Integer platform, Integer smsType);
 
     /**
      * 模板 - 获取
      *
      * @param id
      */
-    SmsTemplateBO getTemplate(Integer id);
+    SmsTemplateBO getTemplate(Integer id, Integer platform);
 
     /**
      * 模板 - 更新
      *
      * @param id 模板id
+     * @param smsSignId 短期签名
      * @param template 模板内容
-     * @param tplType 1 为验证码类型，其他为 null
+     * @param platform 短信平台
      */
-    void updateTemplate(Integer id, String template, Integer tplType);
+    void updateTemplate(Integer id, Integer smsSignId, String template, Integer platform, Integer smsType);
 
     /**
      * 模板 - 删除

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java

@@ -56,6 +56,7 @@ public enum AdminErrorCodeEnum {
     SMS_SIGN_IS_EXISTENT(1002006002, "短信签名已存在"),
     SMS_TEMPLATE_NOT_EXISTENT(1002006020, "短信签名不存在"),
     SMS_TEMPLATE_IS_EXISTENT(1002006021, "短信签名不存在"),
+    SMS_NOT_SEND_CLIENT(1002006030, "短信没有发送的client"),
     ;
 
     private final int code;

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/DictKeyConstants.java

+package cn.iocoder.mall.admin.api.constant;
+
+/**
+ * 字典 key
+ *
+ * @author Sin
+ * @time 2019/5/25 3:36 PM
+ */
+public class DictKeyConstants {
+
+}

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/SmsApplyStatusEnum.java

@@ -13,19 +13,19 @@ public enum SmsApplyStatusEnum {
     FAIL(3, "审核失败"),
     ;
 
-    private final int code;
-    private final String message;
+    private final Integer value;
+    private final String name;
 
     SmsApplyStatusEnum(int code, String message) {
-        this.code = code;
-        this.message = message;
+        this.value = code;
+        this.name = message;
     }
 
-    public int getCode() {
-        return code;
+    public int getValue() {
+        return value;
     }
 
-    public String getMessage() {
-        return message;
+    public String getName() {
+        return name;
     }
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/SmsPlatformEnum.java

+package cn.iocoder.mall.admin.api.constant;
+
+/**
+ * 短信审核状态
+ *
+ * @author Sin
+ * @time 2019/5/16 12:48 PM
+ */
+public enum SmsPlatformEnum {
+
+    YunPian(1, "云片"),
+    AliYun(2, "阿里云"),
+    ;
+
+    private final Integer value;
+    private final String name;
+
+    SmsPlatformEnum(Integer code, String message) {
+        this.value = code;
+        this.name = message;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/SmsTypeEnum.java

+package cn.iocoder.mall.admin.api.constant;
+
+/**
+ * 短信审核状态
+ *
+ * @author Sin
+ * @time 2019/5/16 12:48 PM
+ */
+public enum SmsTypeEnum {
+
+    VERIFICATION_CODE(1, "验证码"),
+    NOTICE(1, "通知"),
+    MARKETING(2, "营销"),
+    ;
+
+    private final Integer value;
+    private final String name;
+
+    SmsTypeEnum(Integer code, String message) {
+        this.value = code;
+        this.name = message;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

system/system-service-impl/pom.xml

@@ -31,7 +31,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
@@ -72,12 +71,22 @@
             <artifactId>yunpian-java-sdk</artifactId>
             <version>1.2.7</version>
         </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.1.0</version>
+        </dependency>
 
         <!--  test  -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.4.0</version>
+        </dependency>
     </dependencies>
 
     <build>

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java

+package cn.iocoder.mall.admin.client;
+
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 短信 AliYun client
+ *
+ * @author Sin
+ * @time 2019/5/25 12:28 PM
+ */
+@Component
+public class SmsAliYunClient implements SmsClient {
+
+    @Value("sms.aliYun.accessKeyId")
+    private String accessKeyId;
+    @Value("sms.aliYun.accessSecret")
+    private String accessSecret;
+
+    private static final String DOMAIN = "dysmsapi.aliyuncs.com";
+
+    @Override
+    public SendResult singleSend(String mobile, String sign, String template, Map<String, String> params) {
+        IAcsClient client = getClient();
+        CommonRequest request = new CommonRequest();
+        request.setMethod(MethodType.POST);
+        request.setDomain(DOMAIN);
+        request.setVersion("2017-05-25");
+        request.setAction("SendSms");
+
+        try {
+            CommonResponse response = client.getCommonResponse(request);
+            System.out.println(response.getData());
+        } catch (ClientException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public SendResult batchSend(List<String> mobileList, String sign, String template, Map<String, String> params) {
+
+        // 获取 client
+        IAcsClient client = getClient();
+
+        // params
+        CommonRequest request = new CommonRequest();
+        request.setMethod(MethodType.POST);
+        request.setDomain(DOMAIN);
+        request.setVersion("2017-05-25");
+        request.setAction("SendBatchSms");
+
+        try {
+            CommonResponse response = client.getCommonResponse(request);
+            System.out.println(response.getData());
+        } catch (ServerException e) {
+            e.printStackTrace();
+        } catch (ClientException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取 client
+     *
+     * @return
+     */
+    private IAcsClient getClient() {
+        return new DefaultAcsClient(DefaultProfile.getProfile("default", accessKeyId, accessSecret));
+    }
+}

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsClient.java

+package cn.iocoder.mall.admin.client;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 短信平台
+ *
+ * @author Sin
+ * @time 2019/5/16 6:33 PM
+ */
+public interface SmsClient {
+
+    @Data
+    @Accessors(chain = true)
+    class SendResult {
+
+        private Boolean isSuccess;
+
+        private Integer code;
+
+        private String message;
+    }
+
+    /**
+     * 短信发送 - 单个
+     *
+     * @return
+     */
+    SendResult singleSend(String mobile, String sign, String template, Map<String, String> params);
+
+    /**
+     * 短信发送 - 批量
+     *
+     * @return
+     */
+    SendResult batchSend(List<String> mobileList, String sign, String template, Map<String, String> params);
+}

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsClientLog.java

+package cn.iocoder.mall.admin.dataobject;
+
+import cn.iocoder.common.framework.dataobject.BaseDO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 短信 client log
+ *
+ * @author Sin
+ * @time 2019/5/25 12:36 PM
+ */
+@Data
+@Accessors(chain = true)
+public class SmsClientLog extends BaseDO {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+    /**
+     * 短信模板
+     */
+    private Integer templateId;
+    /**
+     * 短信
+     */
+    private String template;
+    /**
+     * 发送信息
+     */
+    private String message;
+}

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSignDO.java

@@ -22,14 +22,17 @@ public class SmsSignDO extends DeletableDO {
      * 编号
      */
     private Integer id;
-    /**
-     * 签名id 这个是第三方的
-     */
-    private String platformId;
     /**
      * 签名名称
      */
     private String sign;
+    /**
+     * 平台
+     *
+     * 1、云片
+     * 2、阿里云
+     */
+    private Integer platform;
     /**
      * 审核状态
      *

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsTemplateDO.java

@@ -28,11 +28,19 @@ public class SmsTemplateDO extends DeletableDO {
     /**
      * 短信签名 id
      */
-    private String platformId;
+    private Integer platform;
     /**
      * 短信模板
      */
     private String template;
+    /**
+     * 短信类型
+     *
+     * - 验证码类
+     * - 通知类
+     * - 营销类
+     */
+    private Integer smsType;
     /**
      * 审核状态
      *

system/system-service-impl/src/main/resources/config/application.yaml

@@ -26,7 +26,13 @@ mybatis-plus:
 
 # sms
 sms:
-  apiKey: d4705399e71e822fe3a90f801ed95bd9
+  yunPian:
+    apiKey: d4705399e71e822fe3a90f801ed95bd9
+  aliYun:
+    accessKeyId: d4705399e71e822fe3a90f801ed95bd9
+    accessSecret: d4705399e71e822fe3a90f801ed95bd9
+
+
 
 # dubbo
 dubbo:

system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsYunPianClientTest.java

+package cn.iocoder.mall.admin.client;
+
+import cn.iocoder.mall.admin.SystemApplicationTest;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.google.common.collect.ImmutableMap;
+import org.assertj.core.util.Lists;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Map;
+
+/**
+ * 短信 sms client test
+ *
+ * @author Sin
+ * @time 2019/5/25 12:46 PM
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SystemApplicationTest.class)
+public class SmsYunPianClientTest {
+
+    @Autowired
+    private SmsYunPianClient smsYunPianClient;
+
+    private String sign = null;
+
+    @Before
+    public void setup() {
+        sign = "悦跑运动";
+    }
+
+    @Test
+    public void sendMobileTest() {
+        String mobile = "13302926050";
+        String template = "您的验证码是#code#，打死也不告诉别人哦。";
+        smsYunPianClient.singleSend(mobile, sign, template, ImmutableMap.of("code", "1111"));
+    }
+
+    @Test
+    public void batchSendTest() {
+        String mobile = "13302926050";
+        String template = "您的验证码是#code#，打死也不告诉别人哦。";
+        smsYunPianClient.batchSend(Lists.newArrayList(mobile), sign, template, ImmutableMap.of("code", "2222"));
+    }
+}

system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SmsServiceImplTest.java

 package cn.iocoder.mall.admin.service;
 
+import cn.iocoder.common.framework.exception.ServiceException;
 import cn.iocoder.mall.admin.SystemApplicationTest;
+import cn.iocoder.mall.admin.api.SmsService;
 import cn.iocoder.mall.admin.api.bo.sms.SmsSignBO;
-import cn.iocoder.mall.admin.api.bo.sms.SmsTemplateBO;
+import cn.iocoder.mall.admin.api.constant.SmsPlatformEnum;
+import cn.iocoder.mall.admin.api.constant.SmsTypeEnum;
+import com.google.common.collect.ImmutableMap;
+import org.assertj.core.util.Lists;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -21,55 +27,57 @@ import org.springframework.test.context.junit4.SpringRunner;
 public class SmsServiceImplTest {
 
     @Autowired
-    private SmsServiceImpl smsService;
+    private SmsService smsService;
 
     @Test
     public void createSignTest() {
-        smsService.createSign("测试签名1");
-//        smsService.createSign("悦跑会");
+        smsService.createSign("悦跑运动", SmsPlatformEnum.YunPian.getValue());
+
     }
 
     @Test
     public void getSignTest() {
-        SmsSignBO smsSignBO = smsService.getSign("悦跑会");
-        Assert.assertNotNull(smsSignBO);
+        SmsSignBO smsSignBO =  smsService.getSign(3);
+        Assert.assertNotNull("不能为空!", smsSignBO);
     }
 
     @Test
     public void updateSignTest() {
-        smsService.updateSign("测试签名2", "测试签名3");
-        SmsSignBO newSmsSignBO = smsService.getSign("测试签名3");
-        Assert.assertNotNull(newSmsSignBO);
+        String oldSign = "悦跑运动2";
+        String newSign = "悦跑运动";
+        smsService.updateSign(3, newSign, SmsPlatformEnum.YunPian.getValue());
+        SmsSignBO smsSignBO =  smsService.getSign(3);
+        Assert.assertTrue("更新不成功!", smsSignBO.getSign().equals(newSign));
     }
 
 
-    ///
-    /// template
-
-    @Test
-    public void createTemplateTest() {
-        smsService.createTemplate(1, "打死也不要告诉别人哦002 #code# ", 1);
-    }
-
     @Test
-    public void getTemplateTest() {
-        SmsTemplateBO smsTemplateBO = smsService.getTemplate(3);
-        Assert.assertNotNull(smsTemplateBO);
+    public void deletedSignTest() {
+        smsService.deleteSign(3);
+        Assertions.assertThrows(ServiceException.class, () -> {
+            smsService.getSign(3);
+        });
     }
 
     @Test
-    public void updateTemplateTest() {
-        smsService.updateTemplate(3, "打死也不要告诉别人哦444 #code# ", 1);
+    public void createTemplateTest() {
+        String template = "您的验证码是#code#，打死也不告诉别人哦。";
+        smsService.createTemplate(3, template,
+                SmsPlatformEnum.YunPian.getValue(),
+                SmsTypeEnum.VERIFICATION_CODE.getValue());
     }
 
     @Test
-    public void deleteTemplateTest() {
-        smsService.deleteTemplate(3);
+    public void singleSendTest() {
+        String mobile = "13302926050";
+        Integer templateId = 5;
+        smsService.singleSend(mobile, templateId, ImmutableMap.of("code", "8888"));
     }
 
     @Test
-    public void singleSendTest() {
+    public void batchSendTest() {
         String mobile = "13302926050";
-        smsService.singleSend(mobile, 1);
+        Integer templateId = 5;
+        smsService.batchSend(Lists.newArrayList(mobile), templateId, ImmutableMap.of("code", "8888"));
     }
 }