From 9307d7e99ed0c31cbe4d63829142f986fcac8ed8 Mon Sep 17 00:00:00 2001 From: wind Date: Mon, 11 Sep 2023 21:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/sms4j/cloopen/config/CloopenConfig.java | 5 ----- .../org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java | 2 +- .../org/dromara/sms4j/netease/config/NeteaseConfig.java | 7 ++----- .../org/dromara/sms4j/tencent/config/TencentConfig.java | 5 ----- .../org/dromara/sms4j/tencent/service/TencentSmsImpl.java | 2 +- .../java/org/dromara/sms4j/tencent/utils/TencentUtils.java | 2 +- .../org/dromara/sms4j/yunpian/config/YunpianConfig.java | 4 ---- .../org/dromara/sms4j/zhutong/config/ZhutongConfig.java | 5 ++--- 8 files changed, 7 insertions(+), 25 deletions(-) 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 bd53965f..fe477206 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 @@ -20,11 +20,6 @@ import org.dromara.sms4j.provider.config.BaseConfig; @EqualsAndHashCode(callSuper = true) public class CloopenConfig extends BaseConfig { - /** - * 应用 ID - */ - private String appId; - /** * REST API Base URL */ diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java index 69d2dd2f..1085c3a0 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java @@ -59,7 +59,7 @@ public class CloopenSmsImpl extends AbstractSmsBlend { CloopenHelper helper = new CloopenHelper(getConfig(), http); Map paramMap = new LinkedHashMap<>(4); paramMap.put("to", String.join(",", phones)); - paramMap.put("appId", getConfig().getAppId()); + paramMap.put("appId", getConfig().getAccessKeyId()); paramMap.put("templateId", templateId); paramMap.put("datas", messages.keySet().stream().map(messages::get).toArray(String[]::new)); return helper.smsResponse(paramMap); 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 a0c649f3..09f35e4a 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 @@ -1,15 +1,12 @@ package org.dromara.sms4j.netease.config; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; import org.dromara.sms4j.comm.constant.SupplierConstant; -import org.dromara.sms4j.netease.service.NeteaseSmsImpl; import org.dromara.sms4j.provider.config.BaseConfig; /** + * 网易云信 * @author adam */ @EqualsAndHashCode(callSuper = true) @@ -41,7 +38,7 @@ public class NeteaseConfig extends BaseConfig { * 是否需要支持短信上行。true:需要，false:不需要 * 说明：如果开通了短信上行抄送功能，该参数需要设置为true，其它情况设置无效 */ - private Boolean needUp; + private Boolean needUp = false; /** * 获取供应商 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 ce818c39..23e1e630 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 @@ -14,11 +14,6 @@ import org.dromara.sms4j.tencent.service.TencentSmsImpl; @EqualsAndHashCode(callSuper = true) public class TencentConfig extends BaseConfig { - /** - * 短信sdkAppId - */ - private String sdkAppId; - /** * 地域信息默认为 ap-guangzhou */ diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java index a95e9898..8e59c0e6 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java @@ -91,7 +91,7 @@ public class TencentSmsImpl extends AbstractSmsBlend { } Map headsMap = TencentUtils.generateHeadsMap(signature, timestamp, getConfig().getAction(), getConfig().getVersion(), getConfig().getTerritory(), getConfig().getRequestUrl()); - Map requestBody = TencentUtils.generateRequestBody(phones, getConfig().getSdkAppId(), + Map requestBody = TencentUtils.generateRequestBody(phones, getConfig().getAccessKeyId(), getConfig().getSignature(), templateId, messages); String url = Constant.HTTPS_PREFIX + getConfig().getRequestUrl(); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/utils/TencentUtils.java b/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/utils/TencentUtils.java index 1fdbd79b..318803e0 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/utils/TencentUtils.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/tencent/utils/TencentUtils.java @@ -65,7 +65,7 @@ public class TencentUtils { String signedHeaders = "content-type;host"; Map params = new HashMap<>(); params.put("PhoneNumberSet", phones); - params.put("SmsSdkAppId", tencentConfig.getSdkAppId()); + params.put("SmsSdkAppId", tencentConfig.getAccessKeyId()); params.put("SignName", tencentConfig.getSignature()); params.put("TemplateId", templateId); params.put("TemplateParamSet", messages); 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 ea816006..c0d83f76 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 @@ -2,12 +2,8 @@ package org.dromara.sms4j.yunpian.config; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; -import lombok.experimental.SuperBuilder; import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.provider.config.BaseConfig; -import org.dromara.sms4j.yunpian.service.YunPianSmsImpl; @Data @EqualsAndHashCode(callSuper = true) 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 ed35a3bf..90af3779 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,9 @@ package org.dromara.sms4j.zhutong.config; -import lombok.*; -import lombok.experimental.SuperBuilder; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.provider.config.BaseConfig; -import org.dromara.sms4j.zhutong.service.ZhutongSmsImpl; /** * 助通-自定义短信发送-配置