From c8adb2f5bc83e5bf0a5a78e0458f7fd71b2e55e0 Mon Sep 17 00:00:00 2001 From: wind Date: Tue, 1 Aug 2023 18:11:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BC=83=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms4j/comm/annotation/Restricted.java | 19 ------------------- .../sms4j/aliyun/service/AlibabaSmsImpl.java | 5 ----- .../sms4j/cloopen/service/CloopenSmsImpl.java | 5 ----- .../sms4j/ctyun/service/CtyunSmsImpl.java | 5 ----- .../sms4j/emay/service/EmaySmsImpl.java | 5 ----- .../sms4j/huawei/service/HuaweiSmsImpl.java | 13 ++----------- .../sms4j/jdcloud/service/JdCloudSmsImpl.java | 5 ----- .../sms4j/netease/service/NeteaseSmsImpl.java | 11 +---------- .../provider/service/AbstractSmsBlend.java | 11 +---------- .../sms4j/tencent/service/TencentSmsImpl.java | 5 ----- .../sms4j/unisms/service/UniSmsImpl.java | 11 +---------- .../sms4j/yunpian/service/YunPianSmsImpl.java | 5 ----- .../sms4j/zhutong/service/ZhutongSmsImpl.java | 5 ----- 13 files changed, 5 insertions(+), 100 deletions(-) delete mode 100644 sms4j-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java deleted file mode 100644 index 9a5966bc..00000000 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.dromara.sms4j.comm.annotation; - - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - *

类名: Restricted - *

说明： 发送短信限制 - * - * @author :Wind - * 2023/3/26 17:12 - **/ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -public @interface Restricted { -} 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 f387c8ad..98cbf371 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 @@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.aliyun.config.AlibabaConfig; import org.dromara.sms4j.aliyun.utils.AliyunUtils; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.utils.SmsUtil; @@ -54,7 +53,6 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { LinkedHashMap map = new LinkedHashMap<>(); map.put(getConfig().getTemplateName(), message); @@ -62,14 +60,12 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(phone, messageStr, templateId); } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { LinkedHashMap map = new LinkedHashMap<>(); map.put(getConfig().getTemplateName(), message); @@ -77,7 +73,6 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(SmsUtil.arrayToString(phones), messageStr, templateId); 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 6c65a985..578c5b37 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 @@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.cloopen.config.CloopenConfig; import org.dromara.sms4j.cloopen.util.CloopenHelper; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.provider.service.AbstractSmsBlend; @@ -41,19 +40,16 @@ public class CloopenSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { return massTexting(Collections.singletonList(phone), message); } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { return massTexting(Collections.singletonList(phone), templateId, messages); } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { LinkedHashMap map = new LinkedHashMap<>(); map.put(IdUtil.fastSimpleUUID(), message); @@ -61,7 +57,6 @@ public class CloopenSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { CloopenHelper helper = new CloopenHelper(getConfig()); Map paramMap = MapUtil.newHashMap(4); 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 51868fd9..11350e33 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 @@ -6,7 +6,6 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.utils.SmsUtil; @@ -44,7 +43,6 @@ public class CtyunSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { LinkedHashMap map = new LinkedHashMap<>(); map.put(getConfig().getTemplateName(), message); @@ -52,14 +50,12 @@ public class CtyunSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(phone, messageStr, templateId); } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { LinkedHashMap map = new LinkedHashMap<>(); map.put(getConfig().getTemplateName(), message); @@ -67,7 +63,6 @@ public class CtyunSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(SmsUtil.arrayToString(phones), messageStr, templateId); 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 c13fc1f7..bfd4ca6a 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 @@ -6,7 +6,6 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.utils.SmsUtil; @@ -43,7 +42,6 @@ public class EmaySmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { String url = getConfig().getRequestUrl(); Map params; @@ -58,7 +56,6 @@ public class EmaySmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { List list = new ArrayList<>(); for (Map.Entry entry : messages.entrySet()) { @@ -68,7 +65,6 @@ public class EmaySmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { if (phones.size() > 500) { throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); @@ -77,7 +73,6 @@ public class EmaySmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (phones.size() > 500) { throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); 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 a6f03d96..fce192a6 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 @@ -6,18 +6,13 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.constant.Constant; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.huawei.config.HuaweiConfig; import org.dromara.sms4j.huawei.utils.HuaweiBuilder; import org.dromara.sms4j.provider.service.AbstractSmsBlend; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.concurrent.Executor; import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString; @@ -41,7 +36,6 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { LinkedHashMap mes = new LinkedHashMap<>(); mes.put(UUID.randomUUID().toString().replaceAll("-", ""), message); @@ -49,7 +43,6 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { String url = getConfig().getUrl() + Constant.HUAWEI_REQUEST_URL; List list = new ArrayList<>(); @@ -60,7 +53,7 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { String requestBody = HuaweiBuilder.buildRequestBody(getConfig().getSender(), phone, templateId, mess, getConfig().getStatusCallBack(), getConfig().getSignature()); Map headers = new LinkedHashMap<>(); headers.put("Authorization", Constant.HUAWEI_AUTH_HEADER_VALUE); - headers.put("X-WSSE", HuaweiBuilder.buildWsseHeader(getConfig().getAppKey(), getConfig().getAppSecret())); + headers.put("X-WSSE", HuaweiBuilder.buildWsseHeader(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret())); headers.put("Content-Type", Constant.FROM_URLENCODED); try(HttpResponse response = HttpRequest.post(url) .addHeaders(headers) @@ -72,13 +65,11 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { return sendMessage(listToString(phones), message); } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { return sendMessage(listToString(phones), templateId, 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 2b126e8d..425a707e 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 @@ -6,7 +6,6 @@ import com.jdcloud.sdk.service.sms.model.BatchSendRequest; import com.jdcloud.sdk.service.sms.model.BatchSendResult; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.jdcloud.config.JdCloudConfig; @@ -47,19 +46,16 @@ public class JdCloudSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { return massTexting(Collections.singletonList(phone), message); } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { return massTexting(Collections.singletonList(phone), templateId, messages); } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { LinkedHashMap map = new LinkedHashMap<>(); map.put(IdUtil.fastSimpleUUID(), message); @@ -67,7 +63,6 @@ public class JdCloudSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { try { BatchSendRequest request = new BatchSendRequest(); 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 42896e71..1bcdca76 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 @@ -9,18 +9,13 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.netease.config.NeteaseConfig; import org.dromara.sms4j.netease.utils.NeteaseUtils; import org.dromara.sms4j.provider.service.AbstractSmsBlend; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.concurrent.Executor; /** @@ -54,7 +49,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { * @return */ @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { Optional.ofNullable(phone).orElseThrow(() -> new SmsBlendException("手机号不能为空")); Optional.ofNullable(getConfig().getTemplateId()).orElseThrow(() -> new SmsBlendException("模板ID不能为空")); @@ -69,7 +63,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { * @return */ @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { Optional.ofNullable(phone).orElseThrow(() -> new SmsBlendException("手机号不能为空")); Optional.ofNullable(getConfig().getTemplateId()).orElseThrow(() -> new SmsBlendException("模板ID不能为空")); @@ -78,7 +71,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { if (phones.size() < 1) { throw new SmsBlendException("手机号不能为空"); @@ -91,7 +83,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (phones.size() > 100) { throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于100"); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/service/AbstractSmsBlend.java b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/service/AbstractSmsBlend.java index 57f06983..e1307bb6 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/service/AbstractSmsBlend.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/service/AbstractSmsBlend.java @@ -6,10 +6,8 @@ import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.callback.CallBack; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.universal.SupplierConfig; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.factory.BeanFactory; -import org.dromara.sms4j.provider.config.BaseConfig; import java.util.LinkedHashMap; import java.util.List; @@ -25,6 +23,7 @@ public abstract class AbstractSmsBlend implements SmsB private final C config; protected final Executor pool; + protected final DelayedTime delayed; protected AbstractSmsBlend(C config, Executor pool, DelayedTime delayed) { @@ -97,7 +96,6 @@ public abstract class AbstractSmsBlend implements SmsB * @param callBack 回调 * @author :Wind */ - @Restricted public final void sendMessageAsync(String phone, String message, CallBack callBack){ CompletableFuture smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone, message), pool); smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack); @@ -111,7 +109,6 @@ public abstract class AbstractSmsBlend implements SmsB * @param message 发送内容 * @author :Wind */ - @Restricted public final void sendMessageAsync(String phone, String message){ pool.execute(() -> { sendMessage(phone, message); @@ -128,7 +125,6 @@ public abstract class AbstractSmsBlend implements SmsB * @author :Wind */ - @Restricted public final void sendMessageAsync(String phone, String templateId, LinkedHashMap messages, CallBack callBack){ CompletableFuture smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone,templateId, messages), pool); smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack); @@ -142,7 +138,6 @@ public abstract class AbstractSmsBlend implements SmsB * @param messages key为模板变量名称 value为模板变量值 * @author :Wind */ - @Restricted public final void sendMessageAsync(String phone, String templateId, LinkedHashMap messages){ pool.execute(() -> { sendMessage(phone, templateId, messages); @@ -158,7 +153,6 @@ public abstract class AbstractSmsBlend implements SmsB * @param delayedTime 延迟时间 * @author :Wind */ - @Restricted public final void delayedMessage(String phone, String message, Long delayedTime){ this.delayed.schedule(new TimerTask() { @Override @@ -178,7 +172,6 @@ public abstract class AbstractSmsBlend implements SmsB * @param delayedTime 延迟的时间 * @author :Wind */ - @Restricted public final void delayedMessage(String phone, String templateId, LinkedHashMap messages, Long delayedTime){ this.delayed.schedule(new TimerTask() { @Override @@ -195,7 +188,6 @@ public abstract class AbstractSmsBlend implements SmsB * @param phones 要群体发送的手机号码 * @author :Wind */ - @Restricted public final void delayMassTexting(List phones, String message, Long delayedTime){ this.delayed.schedule(new TimerTask() { @Override @@ -215,7 +207,6 @@ public abstract class AbstractSmsBlend implements SmsB * @param delayedTime 延迟的时间 * @author :Wind */ - @Restricted public final void delayMassTexting(List phones, String templateId, LinkedHashMap messages, Long delayedTime){ this.delayed.schedule(new TimerTask() { @Override 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 f1557483..6f4e5752 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 @@ -7,7 +7,6 @@ import cn.hutool.json.JSONUtil; import com.jdcloud.sdk.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.constant.Constant; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; @@ -44,7 +43,6 @@ public class TencentSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { String[] split = message.split("&"); LinkedHashMap map = new LinkedHashMap<>(); @@ -55,7 +53,6 @@ public class TencentSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { List list = new ArrayList<>(); for (Map.Entry entry : messages.entrySet()) { @@ -66,7 +63,6 @@ public class TencentSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { String[] split = message.split("&"); LinkedHashMap map = new LinkedHashMap<>(); @@ -77,7 +73,6 @@ public class TencentSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { List list = new ArrayList<>(); for (Map.Entry entry : messages.entrySet()) { 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 f801c422..7fd067dc 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 @@ -2,7 +2,6 @@ package org.dromara.sms4j.unisms.service; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.provider.service.AbstractSmsBlend; @@ -10,11 +9,7 @@ import org.dromara.sms4j.unisms.config.UniConfig; import org.dromara.sms4j.unisms.core.Uni; import org.dromara.sms4j.unisms.core.UniResponse; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.Executor; /** @@ -43,7 +38,6 @@ public class UniSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { if ("".equals(getConfig().getTemplateId()) && "".equals(getConfig().getTemplateName())) { throw new SmsBlendException("配置文件模板id和模板变量不能为空！"); @@ -54,7 +48,6 @@ public class UniSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { Map data = new HashMap<>(); data.put("to", Collections.singletonList(phone)); @@ -65,7 +58,6 @@ public class UniSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { if ("".equals(getConfig().getTemplateId()) && "".equals(getConfig().getTemplateName())) { throw new SmsBlendException("配置文件模板id和模板变量不能为空！"); @@ -76,7 +68,6 @@ public class UniSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (phones.size() > 1000) { throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于1000"); 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 6204660a..6060a9c2 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 @@ -5,7 +5,6 @@ import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.constant.Constant; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; @@ -52,21 +51,18 @@ public class YunPianSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { Map body = setBody(phone, message, null, getConfig().getTemplateId()); return getSendResponse(body); } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { Map body = setBody(phone, "", messages, templateId); return getSendResponse(body); } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { if (phones.size() > 1000) { throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于1000"); @@ -75,7 +71,6 @@ public class YunPianSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (phones.size() > 1000) { throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于1000"); 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 f2574994..d1510094 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 @@ -12,7 +12,6 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.annotation.Restricted; import org.dromara.sms4j.comm.constant.Constant; import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.exception.SmsBlendException; @@ -57,7 +56,6 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String message) { ZhutongConfig config = getConfig(); //如果模板id为空 or 模板变量名称为空，使用无模板的自定义短信发送 @@ -71,13 +69,11 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { return getSmsResponseTemplate(templateId, phone, messages); } @Override - @Restricted public SmsResponse massTexting(List phones, String message) { ZhutongConfig config = getConfig(); //如果模板id为空 or 模板变量名称为空，使用无模板的自定义短信发送 @@ -91,7 +87,6 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { } @Override - @Restricted public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { return getSmsResponseTemplate(templateId, phones, messages); }