删除弃用的注解

This commit is contained in:
wind 2023-08-01 18:11:13 +08:00
parent 76dcb1988f
commit c8adb2f5bc
13 changed files with 5 additions and 100 deletions

View File

@ -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;
/**
* <p>类名: Restricted
* <p>说明 发送短信限制
*
* @author :Wind
* 2023/3/26 17:12
**/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface Restricted {
}

View File

@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.aliyun.config.AlibabaConfig; import org.dromara.sms4j.aliyun.config.AlibabaConfig;
import org.dromara.sms4j.aliyun.utils.AliyunUtils; import org.dromara.sms4j.aliyun.utils.AliyunUtils;
import org.dromara.sms4j.api.entity.SmsResponse; 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.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.comm.utils.SmsUtil; import org.dromara.sms4j.comm.utils.SmsUtil;
@ -54,7 +53,6 @@ public class AlibabaSmsImpl extends AbstractSmsBlend<AlibabaConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
map.put(getConfig().getTemplateName(), message); map.put(getConfig().getTemplateName(), message);
@ -62,14 +60,12 @@ public class AlibabaSmsImpl extends AbstractSmsBlend<AlibabaConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
String messageStr = JSONUtil.toJsonStr(messages); String messageStr = JSONUtil.toJsonStr(messages);
return getSmsResponse(phone, messageStr, templateId); return getSmsResponse(phone, messageStr, templateId);
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
map.put(getConfig().getTemplateName(), message); map.put(getConfig().getTemplateName(), message);
@ -77,7 +73,6 @@ public class AlibabaSmsImpl extends AbstractSmsBlend<AlibabaConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
String messageStr = JSONUtil.toJsonStr(messages); String messageStr = JSONUtil.toJsonStr(messages);
return getSmsResponse(SmsUtil.arrayToString(phones), messageStr, templateId); return getSmsResponse(SmsUtil.arrayToString(phones), messageStr, templateId);

View File

@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.cloopen.config.CloopenConfig; import org.dromara.sms4j.cloopen.config.CloopenConfig;
import org.dromara.sms4j.cloopen.util.CloopenHelper; 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.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.provider.service.AbstractSmsBlend; import org.dromara.sms4j.provider.service.AbstractSmsBlend;
@ -41,19 +40,16 @@ public class CloopenSmsImpl extends AbstractSmsBlend<CloopenConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
return massTexting(Collections.singletonList(phone), message); return massTexting(Collections.singletonList(phone), message);
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
return massTexting(Collections.singletonList(phone), templateId, messages); return massTexting(Collections.singletonList(phone), templateId, messages);
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
map.put(IdUtil.fastSimpleUUID(), message); map.put(IdUtil.fastSimpleUUID(), message);
@ -61,7 +57,6 @@ public class CloopenSmsImpl extends AbstractSmsBlend<CloopenConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
CloopenHelper helper = new CloopenHelper(getConfig()); CloopenHelper helper = new CloopenHelper(getConfig());
Map<String, Object> paramMap = MapUtil.newHashMap(4); Map<String, Object> paramMap = MapUtil.newHashMap(4);

View File

@ -6,7 +6,6 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.comm.utils.SmsUtil; import org.dromara.sms4j.comm.utils.SmsUtil;
@ -44,7 +43,6 @@ public class CtyunSmsImpl extends AbstractSmsBlend<CtyunConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
map.put(getConfig().getTemplateName(), message); map.put(getConfig().getTemplateName(), message);
@ -52,14 +50,12 @@ public class CtyunSmsImpl extends AbstractSmsBlend<CtyunConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
String messageStr = JSONUtil.toJsonStr(messages); String messageStr = JSONUtil.toJsonStr(messages);
return getSmsResponse(phone, messageStr, templateId); return getSmsResponse(phone, messageStr, templateId);
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
map.put(getConfig().getTemplateName(), message); map.put(getConfig().getTemplateName(), message);
@ -67,7 +63,6 @@ public class CtyunSmsImpl extends AbstractSmsBlend<CtyunConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
String messageStr = JSONUtil.toJsonStr(messages); String messageStr = JSONUtil.toJsonStr(messages);
return getSmsResponse(SmsUtil.arrayToString(phones), messageStr, templateId); return getSmsResponse(SmsUtil.arrayToString(phones), messageStr, templateId);

View File

@ -6,7 +6,6 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.comm.utils.SmsUtil; import org.dromara.sms4j.comm.utils.SmsUtil;
@ -43,7 +42,6 @@ public class EmaySmsImpl extends AbstractSmsBlend<EmayConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
String url = getConfig().getRequestUrl(); String url = getConfig().getRequestUrl();
Map<String, Object> params; Map<String, Object> params;
@ -58,7 +56,6 @@ public class EmaySmsImpl extends AbstractSmsBlend<EmayConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (Map.Entry<String, String> entry : messages.entrySet()) { for (Map.Entry<String, String> entry : messages.entrySet()) {
@ -68,7 +65,6 @@ public class EmaySmsImpl extends AbstractSmsBlend<EmayConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
if (phones.size() > 500) { if (phones.size() > 500) {
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于500"); throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于500");
@ -77,7 +73,6 @@ public class EmaySmsImpl extends AbstractSmsBlend<EmayConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
if (phones.size() > 500) { if (phones.size() > 500) {
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于500"); throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于500");

View File

@ -6,18 +6,13 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.constant.Constant;
import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.huawei.config.HuaweiConfig; import org.dromara.sms4j.huawei.config.HuaweiConfig;
import org.dromara.sms4j.huawei.utils.HuaweiBuilder; import org.dromara.sms4j.huawei.utils.HuaweiBuilder;
import org.dromara.sms4j.provider.service.AbstractSmsBlend; import org.dromara.sms4j.provider.service.AbstractSmsBlend;
import java.util.ArrayList; import java.util.*;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString; import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString;
@ -41,7 +36,6 @@ public class HuaweiSmsImpl extends AbstractSmsBlend<HuaweiConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
LinkedHashMap<String, String> mes = new LinkedHashMap<>(); LinkedHashMap<String, String> mes = new LinkedHashMap<>();
mes.put(UUID.randomUUID().toString().replaceAll("-", ""), message); mes.put(UUID.randomUUID().toString().replaceAll("-", ""), message);
@ -49,7 +43,6 @@ public class HuaweiSmsImpl extends AbstractSmsBlend<HuaweiConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
String url = getConfig().getUrl() + Constant.HUAWEI_REQUEST_URL; String url = getConfig().getUrl() + Constant.HUAWEI_REQUEST_URL;
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
@ -60,7 +53,7 @@ public class HuaweiSmsImpl extends AbstractSmsBlend<HuaweiConfig> {
String requestBody = HuaweiBuilder.buildRequestBody(getConfig().getSender(), phone, templateId, mess, getConfig().getStatusCallBack(), getConfig().getSignature()); String requestBody = HuaweiBuilder.buildRequestBody(getConfig().getSender(), phone, templateId, mess, getConfig().getStatusCallBack(), getConfig().getSignature());
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
headers.put("Authorization", Constant.HUAWEI_AUTH_HEADER_VALUE); 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); headers.put("Content-Type", Constant.FROM_URLENCODED);
try(HttpResponse response = HttpRequest.post(url) try(HttpResponse response = HttpRequest.post(url)
.addHeaders(headers) .addHeaders(headers)
@ -72,13 +65,11 @@ public class HuaweiSmsImpl extends AbstractSmsBlend<HuaweiConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
return sendMessage(listToString(phones), message); return sendMessage(listToString(phones), message);
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
return sendMessage(listToString(phones), templateId, messages); return sendMessage(listToString(phones), templateId, messages);
} }

View File

@ -6,7 +6,6 @@ import com.jdcloud.sdk.service.sms.model.BatchSendRequest;
import com.jdcloud.sdk.service.sms.model.BatchSendResult; import com.jdcloud.sdk.service.sms.model.BatchSendResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.jdcloud.config.JdCloudConfig; import org.dromara.sms4j.jdcloud.config.JdCloudConfig;
@ -47,19 +46,16 @@ public class JdCloudSmsImpl extends AbstractSmsBlend<JdCloudConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
return massTexting(Collections.singletonList(phone), message); return massTexting(Collections.singletonList(phone), message);
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
return massTexting(Collections.singletonList(phone), templateId, messages); return massTexting(Collections.singletonList(phone), templateId, messages);
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
map.put(IdUtil.fastSimpleUUID(), message); map.put(IdUtil.fastSimpleUUID(), message);
@ -67,7 +63,6 @@ public class JdCloudSmsImpl extends AbstractSmsBlend<JdCloudConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
try { try {
BatchSendRequest request = new BatchSendRequest(); BatchSendRequest request = new BatchSendRequest();

View File

@ -9,18 +9,13 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.netease.config.NeteaseConfig; import org.dromara.sms4j.netease.config.NeteaseConfig;
import org.dromara.sms4j.netease.utils.NeteaseUtils; import org.dromara.sms4j.netease.utils.NeteaseUtils;
import org.dromara.sms4j.provider.service.AbstractSmsBlend; import org.dromara.sms4j.provider.service.AbstractSmsBlend;
import java.util.Collections; import java.util.*;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
/** /**
@ -54,7 +49,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend<NeteaseConfig> {
* @return * @return
*/ */
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
Optional.ofNullable(phone).orElseThrow(() -> new SmsBlendException("手机号不能为空")); Optional.ofNullable(phone).orElseThrow(() -> new SmsBlendException("手机号不能为空"));
Optional.ofNullable(getConfig().getTemplateId()).orElseThrow(() -> new SmsBlendException("模板ID不能为空")); Optional.ofNullable(getConfig().getTemplateId()).orElseThrow(() -> new SmsBlendException("模板ID不能为空"));
@ -69,7 +63,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend<NeteaseConfig> {
* @return * @return
*/ */
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
Optional.ofNullable(phone).orElseThrow(() -> new SmsBlendException("手机号不能为空")); Optional.ofNullable(phone).orElseThrow(() -> new SmsBlendException("手机号不能为空"));
Optional.ofNullable(getConfig().getTemplateId()).orElseThrow(() -> new SmsBlendException("模板ID不能为空")); Optional.ofNullable(getConfig().getTemplateId()).orElseThrow(() -> new SmsBlendException("模板ID不能为空"));
@ -78,7 +71,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend<NeteaseConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
if (phones.size() < 1) { if (phones.size() < 1) {
throw new SmsBlendException("手机号不能为空"); throw new SmsBlendException("手机号不能为空");
@ -91,7 +83,6 @@ public class NeteaseSmsImpl extends AbstractSmsBlend<NeteaseConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
if (phones.size() > 100) { if (phones.size() > 100) {
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于100"); throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于100");

View File

@ -6,10 +6,8 @@ import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.api.universal.SupplierConfig; 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.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import org.dromara.sms4j.provider.config.BaseConfig;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@ -25,6 +23,7 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
private final C config; private final C config;
protected final Executor pool; protected final Executor pool;
protected final DelayedTime delayed; protected final DelayedTime delayed;
protected AbstractSmsBlend(C config, Executor pool, DelayedTime delayed) { protected AbstractSmsBlend(C config, Executor pool, DelayedTime delayed) {
@ -97,7 +96,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @param callBack 回调 * @param callBack 回调
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void sendMessageAsync(String phone, String message, CallBack callBack){ public final void sendMessageAsync(String phone, String message, CallBack callBack){
CompletableFuture<SmsResponse> smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone, message), pool); CompletableFuture<SmsResponse> smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone, message), pool);
smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack); smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack);
@ -111,7 +109,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @param message 发送内容 * @param message 发送内容
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void sendMessageAsync(String phone, String message){ public final void sendMessageAsync(String phone, String message){
pool.execute(() -> { pool.execute(() -> {
sendMessage(phone, message); sendMessage(phone, message);
@ -128,7 +125,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack){ public final void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack){
CompletableFuture<SmsResponse> smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone,templateId, messages), pool); CompletableFuture<SmsResponse> smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone,templateId, messages), pool);
smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack); smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack);
@ -142,7 +138,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @param messages key为模板变量名称 value为模板变量值 * @param messages key为模板变量名称 value为模板变量值
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages){ public final void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages){
pool.execute(() -> { pool.execute(() -> {
sendMessage(phone, templateId, messages); sendMessage(phone, templateId, messages);
@ -158,7 +153,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @param delayedTime 延迟时间 * @param delayedTime 延迟时间
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void delayedMessage(String phone, String message, Long delayedTime){ public final void delayedMessage(String phone, String message, Long delayedTime){
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override
@ -178,7 +172,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @param delayedTime 延迟的时间 * @param delayedTime 延迟的时间
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void delayedMessage(String phone, String templateId, LinkedHashMap<String, String> messages, Long delayedTime){ public final void delayedMessage(String phone, String templateId, LinkedHashMap<String, String> messages, Long delayedTime){
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override
@ -195,7 +188,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @param phones 要群体发送的手机号码 * @param phones 要群体发送的手机号码
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void delayMassTexting(List<String> phones, String message, Long delayedTime){ public final void delayMassTexting(List<String> phones, String message, Long delayedTime){
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override
@ -215,7 +207,6 @@ public abstract class AbstractSmsBlend<C extends SupplierConfig> implements SmsB
* @param delayedTime 延迟的时间 * @param delayedTime 延迟的时间
* @author :Wind * @author :Wind
*/ */
@Restricted
public final void delayMassTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages, Long delayedTime){ public final void delayMassTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages, Long delayedTime){
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override

View File

@ -7,7 +7,6 @@ import cn.hutool.json.JSONUtil;
import com.jdcloud.sdk.utils.StringUtils; import com.jdcloud.sdk.utils.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.constant.Constant;
import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
@ -44,7 +43,6 @@ public class TencentSmsImpl extends AbstractSmsBlend<TencentConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
String[] split = message.split("&"); String[] split = message.split("&");
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
@ -55,7 +53,6 @@ public class TencentSmsImpl extends AbstractSmsBlend<TencentConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (Map.Entry<String, String> entry : messages.entrySet()) { for (Map.Entry<String, String> entry : messages.entrySet()) {
@ -66,7 +63,6 @@ public class TencentSmsImpl extends AbstractSmsBlend<TencentConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
String[] split = message.split("&"); String[] split = message.split("&");
LinkedHashMap<String, String> map = new LinkedHashMap<>(); LinkedHashMap<String, String> map = new LinkedHashMap<>();
@ -77,7 +73,6 @@ public class TencentSmsImpl extends AbstractSmsBlend<TencentConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (Map.Entry<String, String> entry : messages.entrySet()) { for (Map.Entry<String, String> entry : messages.entrySet()) {

View File

@ -2,7 +2,6 @@ package org.dromara.sms4j.unisms.service;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.provider.service.AbstractSmsBlend; 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.Uni;
import org.dromara.sms4j.unisms.core.UniResponse; import org.dromara.sms4j.unisms.core.UniResponse;
import java.util.Collections; import java.util.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
/** /**
@ -43,7 +38,6 @@ public class UniSmsImpl extends AbstractSmsBlend<UniConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
if ("".equals(getConfig().getTemplateId()) && "".equals(getConfig().getTemplateName())) { if ("".equals(getConfig().getTemplateId()) && "".equals(getConfig().getTemplateName())) {
throw new SmsBlendException("配置文件模板id和模板变量不能为空"); throw new SmsBlendException("配置文件模板id和模板变量不能为空");
@ -54,7 +48,6 @@ public class UniSmsImpl extends AbstractSmsBlend<UniConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
data.put("to", Collections.singletonList(phone)); data.put("to", Collections.singletonList(phone));
@ -65,7 +58,6 @@ public class UniSmsImpl extends AbstractSmsBlend<UniConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
if ("".equals(getConfig().getTemplateId()) && "".equals(getConfig().getTemplateName())) { if ("".equals(getConfig().getTemplateId()) && "".equals(getConfig().getTemplateName())) {
throw new SmsBlendException("配置文件模板id和模板变量不能为空"); throw new SmsBlendException("配置文件模板id和模板变量不能为空");
@ -76,7 +68,6 @@ public class UniSmsImpl extends AbstractSmsBlend<UniConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
if (phones.size() > 1000) { if (phones.size() > 1000) {
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000"); throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000");

View File

@ -5,7 +5,6 @@ import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import org.dromara.sms4j.api.entity.SmsResponse; 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.constant.Constant;
import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
@ -52,21 +51,18 @@ public class YunPianSmsImpl extends AbstractSmsBlend<YunpianConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
Map<String, String> body = setBody(phone, message, null, getConfig().getTemplateId()); Map<String, String> body = setBody(phone, message, null, getConfig().getTemplateId());
return getSendResponse(body); return getSendResponse(body);
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
Map<String, String> body = setBody(phone, "", messages, templateId); Map<String, String> body = setBody(phone, "", messages, templateId);
return getSendResponse(body); return getSendResponse(body);
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
if (phones.size() > 1000) { if (phones.size() > 1000) {
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000"); throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000");
@ -75,7 +71,6 @@ public class YunPianSmsImpl extends AbstractSmsBlend<YunpianConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
if (phones.size() > 1000) { if (phones.size() > 1000) {
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000"); throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000");

View File

@ -12,7 +12,6 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; 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.constant.Constant;
import org.dromara.sms4j.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
@ -57,7 +56,6 @@ public class ZhutongSmsImpl extends AbstractSmsBlend<ZhutongConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
ZhutongConfig config = getConfig(); ZhutongConfig config = getConfig();
//如果模板id为空 or 模板变量名称为空使用无模板的自定义短信发送 //如果模板id为空 or 模板变量名称为空使用无模板的自定义短信发送
@ -71,13 +69,11 @@ public class ZhutongSmsImpl extends AbstractSmsBlend<ZhutongConfig> {
} }
@Override @Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
return getSmsResponseTemplate(templateId, phone, messages); return getSmsResponseTemplate(templateId, phone, messages);
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
ZhutongConfig config = getConfig(); ZhutongConfig config = getConfig();
//如果模板id为空 or 模板变量名称为空使用无模板的自定义短信发送 //如果模板id为空 or 模板变量名称为空使用无模板的自定义短信发送
@ -91,7 +87,6 @@ public class ZhutongSmsImpl extends AbstractSmsBlend<ZhutongConfig> {
} }
@Override @Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
return getSmsResponseTemplate(templateId, phones, messages); return getSmsResponseTemplate(templateId, phones, messages);
} }