diff --git a/pom.xml b/pom.xml
index 790d7347..2db6d522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,7 @@
com.jdcloud.sdk
sms
${jdcloud.version}
+ provided
diff --git a/sms4j-provider/pom.xml b/sms4j-provider/pom.xml
index 0569c4d6..b4dd6907 100644
--- a/sms4j-provider/pom.xml
+++ b/sms4j-provider/pom.xml
@@ -24,6 +24,7 @@
com.jdcloud.sdk
sms
+ provided
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java
index ca327f03..8babe8f5 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java
@@ -13,11 +13,8 @@ import org.dromara.sms4j.provider.config.BaseConfig;
/**
* @author Wind
*/
-@Data
-@SuperBuilder
-@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
+@Data
public class AlibabaConfig extends BaseConfig {
/**
@@ -28,25 +25,21 @@ public class AlibabaConfig extends BaseConfig {
/**
* 请求地址
*/
- @Builder.Default
private String requestUrl = "dysmsapi.aliyuncs.com";
/**
* 接口名称
*/
- @Builder.Default
private String action = "SendSms";
/**
* 接口版本号
*/
- @Builder.Default
private String version = "2017-05-25";
/**
* 地域信息默认为 cn-hangzhou
*/
- @Builder.Default
private String regionId = "cn-hangzhou";
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java
index 729a20a3..ce62962a 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java
@@ -16,10 +16,7 @@ import org.dromara.sms4j.provider.config.BaseConfig;
* @since 2023/4/10 22:10
*/
@Data
-@SuperBuilder
-@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
public class CloopenConfig extends BaseConfig {
/**
@@ -30,7 +27,6 @@ public class CloopenConfig extends BaseConfig {
/**
* REST API Base URL
*/
- @Builder.Default
private String baseUrl = "https://app.cloopen.com:8883/2013-12-26";
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/config/CtyunConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/config/CtyunConfig.java
index 3e72630f..ea0ffe1b 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/config/CtyunConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/config/CtyunConfig.java
@@ -17,10 +17,7 @@ import org.dromara.sms4j.provider.config.BaseConfig;
* 2023/5/12 15:06
**/
@Data
-@SuperBuilder
-@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
public class CtyunConfig extends BaseConfig {
/**
@@ -31,13 +28,11 @@ public class CtyunConfig extends BaseConfig {
/**
* 请求地址
*/
- @Builder.Default
private String requestUrl = "https://sms-global.ctapi.ctyun.cn/sms/api/v1";
/**
* 接口名称
*/
- @Builder.Default
private String action = "SendSms";
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java
index 7c59b302..7bd62b5a 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java
@@ -7,32 +7,19 @@ import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.dromara.sms4j.api.universal.SupplierConfig;
import org.dromara.sms4j.emay.service.EmaySmsImpl;
+import org.dromara.sms4j.provider.config.BaseConfig;
/**
* @author Richard
* @date 2023-04-11 12:00
*/
+@EqualsAndHashCode(callSuper = true)
@Data
-@SuperBuilder
-@ToString
-@EqualsAndHashCode
-@NoArgsConstructor
-public class EmayConfig implements SupplierConfig {
+public class EmayConfig extends BaseConfig {
- /** appKey*/
- private String appId ;
- /** appSecret */
- private String secretKey ;
/** APP接入地址*/
private String requestUrl;
- /**
- * 配置标识名 如未配置取对应渠道名例如 Alibaba
- *
- * @since 3.0.0
- */
- private String configId;
-
/**
* 获取供应商
*
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayFactory.java b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayFactory.java
index 7a75733b..acdc8a21 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayFactory.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/config/EmayFactory.java
@@ -40,6 +40,11 @@ public class EmayFactory implements BaseProviderFactory
return new EmaySmsImpl(emayConfig);
}
+ @Override
+ public EmayConfig createConfig() {
+ return null;
+ }
+
/**
* 获取供应商
* @return 供应商
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java
index 186f69de..c13fc1f7 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java
@@ -48,7 +48,7 @@ public class EmaySmsImpl extends AbstractSmsBlend {
String url = getConfig().getRequestUrl();
Map params;
try {
- params = EmayBuilder.buildRequestBody(getConfig().getAppId(), getConfig().getSecretKey(), phone, message);
+ params = EmayBuilder.buildRequestBody(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret(), phone, message);
} catch (SmsBlendException e) {
SmsResponse smsResponse = new SmsResponse();
smsResponse.setSuccess(false);
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java
index 82f1aa86..3e396493 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java
@@ -7,36 +7,18 @@ import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.dromara.sms4j.api.universal.SupplierConfig;
import org.dromara.sms4j.huawei.service.HuaweiSmsImpl;
+import org.dromara.sms4j.provider.config.BaseConfig;
@Data
-@SuperBuilder
-@ToString
-@EqualsAndHashCode
-@NoArgsConstructor
-public class HuaweiConfig implements SupplierConfig {
-
- /** appKey*/
- private String appKey ;
- /** appSecret */
- private String appSecret ;
- /** 短信签名*/
- private String signature;
+@EqualsAndHashCode(callSuper = true)
+public class HuaweiConfig extends BaseConfig {
/** 国内短信签名通道号*/
private String sender;
- /** 模板Id*/
- private String templateId;
/** 短信状态报告接收地*/
private String statusCallBack;
/** APP接入地址*/
private String url;
- /**
- * 配置标识名 如未配置取对应渠道名例如 Alibaba
- *
- * @since 3.0.0
- */
- private String configId;
-
/**
* 获取供应商
*
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java
index 5784a6ed..3b1a47a7 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java
@@ -16,16 +16,12 @@ import org.dromara.sms4j.provider.config.BaseConfig;
* @since 2023/4/10 20:01
*/
@Data
-@SuperBuilder
-@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
public class JdCloudConfig extends BaseConfig {
/**
* 地域信息
*/
- @Builder.Default
private String region = "cn-north-1";
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/netease/config/NeteaseConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/netease/config/NeteaseConfig.java
index ee4380dd..7b06efc6 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/netease/config/NeteaseConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/netease/config/NeteaseConfig.java
@@ -13,8 +13,6 @@ import org.dromara.sms4j.provider.config.BaseConfig;
*/
@EqualsAndHashCode(callSuper = true)
@Data
-@SuperBuilder
-@NoArgsConstructor
public class NeteaseConfig extends BaseConfig {
/**
@@ -25,20 +23,17 @@ public class NeteaseConfig extends BaseConfig {
/**
* 模板短信请求地址
*/
- @Builder.Default
private String templateUrl = "https://api.netease.im/sms/sendtemplate.action";
/**
* 验证码短信请求地址
*/
- @Builder.Default
private String codeUrl = "https://api.netease.im/sms/sendcode.action";
/**
* 验证码验证请求地址
*/
- @Builder.Default
private String verifyUrl = "https://api.netease.im/sms/verifycode.action";
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/BaseConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/BaseConfig.java
index c89861ee..6bb4eb3e 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/BaseConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/BaseConfig.java
@@ -13,8 +13,6 @@ import org.dromara.sms4j.api.universal.SupplierConfig;
* @since 2023/4/20 23:03
*/
@Data
-@SuperBuilder
-@NoArgsConstructor
public abstract class BaseConfig implements SupplierConfig {
/**
@@ -41,7 +39,6 @@ public abstract class BaseConfig implements SupplierConfig {
* 权重
* @since 3.0.0
*/
- @Builder.Default
private Integer weight = 1;
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java
index f1e49ae8..ebbe6612 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java
@@ -10,10 +10,7 @@ import org.dromara.sms4j.provider.config.BaseConfig;
import org.dromara.sms4j.tencent.service.TencentSmsImpl;
@Data
-@SuperBuilder
-@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
public class TencentConfig extends BaseConfig {
/**
@@ -24,33 +21,27 @@ public class TencentConfig extends BaseConfig {
/**
* 地域信息默认为 ap-guangzhou
*/
- @Builder.Default
private String territory = "ap-guangzhou";
/**
* 请求超时时间
*/
- @Builder.Default
private Integer connTimeout = 60;
/** 请求地址*/
- @Builder.Default
private String requestUrl = "sms.tencentcloudapi.com";
/**
* 接口名称
*/
- @Builder.Default
private String action = "SendSms";
/**
* 接口版本
*/
- @Builder.Default
private String version = "2021-01-11";
/**
* 服务名
*/
- @Builder.Default
private String service = "sms";
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java
index 86102d61..c5645bf5 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java
@@ -10,16 +10,12 @@ import org.dromara.sms4j.provider.config.BaseConfig;
import org.dromara.sms4j.unisms.service.UniSmsImpl;
@Data
-@SuperBuilder
-@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
public class UniConfig extends BaseConfig {
/**
* 是否为简易模式
*/
- @Builder.Default
private Boolean isSimple = true;
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java
index eca6db41..6c619134 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java
@@ -9,10 +9,7 @@ import org.dromara.sms4j.provider.config.BaseConfig;
import org.dromara.sms4j.yunpian.service.YunPianSmsImpl;
@Data
-@SuperBuilder
-@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
public class YunpianConfig extends BaseConfig {
/**
diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/config/ZhutongConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/config/ZhutongConfig.java
index 6a7c0c87..1b1ca6ce 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/config/ZhutongConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/config/ZhutongConfig.java
@@ -1,10 +1,6 @@
package org.dromara.sms4j.zhutong.config;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
import lombok.experimental.SuperBuilder;
import org.dromara.sms4j.provider.config.BaseConfig;
import org.dromara.sms4j.zhutong.service.ZhutongSmsImpl;
@@ -19,11 +15,8 @@ import org.dromara.sms4j.zhutong.service.ZhutongSmsImpl;
* 说明4:templateId ====> 模板id可以为空,为空发送【自定义短信】无需要提前创建短信模板; 不为空发送:【模板短信】
* 说明4:templateName ====> 模板变量名称可以为空,为空发送【自定义短信】无需要提前创建短信模板; 不为空发送:【模板短信】
*/
-@Getter
-@Setter
-@SuperBuilder
-@ToString(callSuper = true)
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Data
public class ZhutongConfig extends BaseConfig {
/**
* 模板变量名称
@@ -35,7 +28,6 @@ public class ZhutongConfig extends BaseConfig {
* 默认请求地址
* 不同区域,可切换请求地址,也可以不修改,请参考官方文档:https://doc.zthysms.com/web/#/1/236
*/
- @Builder.Default
private String requestUrl = "https://api.mix2.zthysms.com/";
/**