From b21a48e772b5ac949eab2ffdf02a1e86d376beee Mon Sep 17 00:00:00 2001 From: wind Date: Wed, 27 Dec 2023 12:11:08 +0800 Subject: [PATCH] =?UTF-8?q?sendMessage=E9=87=8D=E8=BD=BD=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0null=E5=88=A4=E6=96=AD=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=97=A0=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java | 4 ++++ .../org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java | 4 ++++ .../java/org/dromara/sms4j/ctyun/service/CtyunSmsImpl.java | 4 ++++ .../main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java | 4 ++++ .../java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java | 4 ++++ .../org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java | 4 ++++ .../java/org/dromara/sms4j/lianlu/service/LianLuSmsImpl.java | 3 +++ .../org/dromara/sms4j/netease/service/NeteaseSmsImpl.java | 4 ++++ .../org/dromara/sms4j/tencent/service/TencentSmsImpl.java | 4 ++++ .../java/org/dromara/sms4j/unisms/service/UniSmsImpl.java | 4 ++++ .../org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java | 4 ++++ .../org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java | 4 ++++ 12 files changed, 47 insertions(+) diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java index d412f6b0..6d53d093 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java @@ -16,6 +16,7 @@ import org.dromara.sms4j.provider.service.AbstractSmsBlend; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -62,6 +63,9 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } 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 7bf03e0e..fc8bc30a 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 @@ -13,6 +13,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -44,6 +45,9 @@ public class CloopenSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/service/CtyunSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/service/CtyunSmsImpl.java index 9c57de9b..00b3ee11 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/service/CtyunSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/ctyun/service/CtyunSmsImpl.java @@ -14,6 +14,7 @@ import org.dromara.sms4j.provider.service.AbstractSmsBlend; import java.util.LinkedHashMap; import java.util.List; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -50,6 +51,9 @@ public class CtyunSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } 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 ecf4065a..a0e8e644 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 @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -64,6 +65,9 @@ public class EmaySmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java index e5d80267..9c5f8d69 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.UUID; import java.util.concurrent.Executor; @@ -48,6 +49,9 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java index 783c670f..e420c448 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java @@ -15,6 +15,7 @@ import org.dromara.sms4j.provider.service.AbstractSmsBlend; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; +import java.util.Objects; import java.util.concurrent.Executor; import java.util.stream.Collectors; @@ -53,6 +54,9 @@ public class JdCloudSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/lianlu/service/LianLuSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/lianlu/service/LianLuSmsImpl.java index 848c2c47..a0273c52 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/lianlu/service/LianLuSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/lianlu/service/LianLuSmsImpl.java @@ -47,6 +47,9 @@ public class LianLuSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java index ba7d8034..85630caa 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java @@ -19,6 +19,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.Executor; @@ -61,6 +62,9 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } 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 9208f694..c0ec9894 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 @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -53,6 +54,9 @@ public class TencentSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java index ed48b1f6..cb19c1c8 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java @@ -14,6 +14,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -56,6 +57,9 @@ public class UniSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } Map data = new LinkedHashMap<>(4); data.put("to", Collections.singletonList(phone)); data.put("signature", getConfig().getSignature()); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java index 50024960..8ebabd51 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -72,6 +73,9 @@ public class YunPianSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java index 4aeda0dc..662766df 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Executor; /** @@ -68,6 +69,9 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, LinkedHashMap messages) { + if (Objects.isNull(messages)){ + messages = new LinkedHashMap(); + } return sendMessage(phone, getConfig().getTemplateId(), messages); }