diff --git a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/HtmlUtil.java b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/HtmlUtil.java index 47d7af0e..4e0962bd 100644 --- a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/HtmlUtil.java +++ b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/HtmlUtil.java @@ -81,7 +81,7 @@ public final class HtmlUtil { try { inputStream.close(); } catch (IOException e) { - System.out.println(e); + e.printStackTrace(); } } return data; diff --git a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/ZipUtils.java b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/ZipUtils.java index a94a9a8e..5aa0359c 100644 --- a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/ZipUtils.java +++ b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/utils/ZipUtils.java @@ -10,7 +10,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; -import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.FileChannel; diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsHttpUtils.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsHttpUtils.java index 29645e69..778a3b1d 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsHttpUtils.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsHttpUtils.java @@ -1,6 +1,5 @@ package org.dromara.sms4j.comm.utils; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.http.HttpRequest; @@ -9,8 +8,6 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import org.dromara.sms4j.comm.exception.SmsBlendException; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; import java.util.Map; public class SmsHttpUtils { diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java index 478c5715..b6286a74 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java @@ -81,7 +81,7 @@ public abstract class SmsFactory { public static void createSmsBlend(SmsReadConfig smsReadConfig) { List supplierConfigList = smsReadConfig.getSupplierConfigList(); supplierConfigList.forEach(supplierConfig -> { - SmsBlend smsBlend = create((SupplierConfig)supplierConfig); + SmsBlend smsBlend = create(supplierConfig); register(smsBlend); }); } 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 1418825d..1302a877 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 @@ -90,18 +90,22 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { throw new SmsBlendException(e.getMessage()); } log.debug("requestUrl {}", requestUrl); + + Map headers = new LinkedHashMap<>(1); + headers.put("Content-Type", Constant.FROM_URLENCODED); + SmsResponse smsResponse; try { - Map headers = new LinkedHashMap<>(1); - headers.put("Content-Type", Constant.FROM_URLENCODED); - SmsResponse smsResponse = getResponse(http.postJson(requestUrl, headers, paramStr)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phone, message, templateId); - }catch (SmsBlendException e){ - return requestRetry(phone, message, templateId); + smsResponse = getResponse(http.postJson(requestUrl, headers, paramStr)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phone, message, templateId); } private SmsResponse requestRetry(String phone, String message, String templateId) { 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 914dfa0c..823e0d11 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 @@ -78,18 +78,21 @@ public class CtyunSmsImpl extends AbstractSmsBlend { throw new SmsBlendException(e.getMessage()); } log.debug("requestUrl {}", requestUrl); + SmsResponse smsResponse; try { - SmsResponse smsResponse = getResponse(http.postJson(requestUrl, + smsResponse = getResponse(http.postJson(requestUrl, CtyunUtils.signHeader(paramStr, getConfig().getAccessKeyId(), getConfig().getAccessKeySecret()), paramStr)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phone, message, templateId); - }catch (SmsBlendException e){ - return requestRetry(phone, message, templateId); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phone, message, templateId); } private SmsResponse requestRetry(String phone, String message, String 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 a69e8090..39994e47 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 @@ -44,18 +44,22 @@ public class EmaySmsImpl extends AbstractSmsBlend { public SmsResponse sendMessage(String phone, String message) { String url = getConfig().getRequestUrl(); Map params = EmayBuilder.buildRequestBody(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret(), phone, message); + + Map headers = new LinkedHashMap<>(1); + headers.put("Content-Type", Constant.FROM_URLENCODED); + SmsResponse smsResponse; try { - Map headers = new LinkedHashMap<>(1); - headers.put("Content-Type", Constant.FROM_URLENCODED); - SmsResponse smsResponse = getResponse(http.postUrl(url, headers, params)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phone, message); - }catch (SmsBlendException e){ - return requestRetry(phone, message); + smsResponse = getResponse(http.postUrl(url, headers, params)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phone, message); } private SmsResponse requestRetry(String phone, String message) { 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 334432fe..b0d4e12d 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 @@ -55,20 +55,24 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { } String mess = listToString(list); String requestBody = HuaweiBuilder.buildRequestBody(getConfig().getSender(), phone, templateId, mess, getConfig().getStatusCallBack(), getConfig().getSignature()); + + Map headers = new LinkedHashMap<>(3); + headers.put("Authorization", Constant.HUAWEI_AUTH_HEADER_VALUE); + headers.put("X-WSSE", HuaweiBuilder.buildWsseHeader(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret())); + headers.put("Content-Type", Constant.FROM_URLENCODED); + SmsResponse smsResponse; try { - Map headers = new LinkedHashMap<>(3); - headers.put("Authorization", Constant.HUAWEI_AUTH_HEADER_VALUE); - headers.put("X-WSSE", HuaweiBuilder.buildWsseHeader(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret())); - headers.put("Content-Type", Constant.FROM_URLENCODED); - SmsResponse smsResponse = getResponse(http.postJson(url, headers, requestBody)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phone, templateId, messages); - }catch (SmsBlendException e){ - return requestRetry(phone, templateId, messages); + smsResponse = getResponse(http.postJson(url, headers, requestBody)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phone, templateId, messages); } private SmsResponse requestRetry(String phone, String templateId, LinkedHashMap 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 31c0a0c2..47c3b4ce 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 @@ -79,17 +79,20 @@ public class JdCloudSmsImpl extends AbstractSmsBlend { throw new SmsBlendException(e.getMessage()); } + BatchSendResult result = client.batchSend(request).getResult(); + SmsResponse smsResponse; try { - BatchSendResult result = client.batchSend(request).getResult(); - SmsResponse smsResponse = getSmsResponse(result); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phones, templateId, messages); - }catch (SmsBlendException e){ - return requestRetry(phones, templateId, messages); + smsResponse = getSmsResponse(result); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phones, templateId, messages); } private SmsResponse requestRetry(List phones, String templateId, LinkedHashMap 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 e2f50c08..29402203 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 @@ -108,22 +108,25 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { body.put("params", message); body.put("needUp", getConfig().getNeedUp()); + Map headers = new LinkedHashMap<>(5); + headers.put("Content-Type", Constant.FROM_URLENCODED); + headers.put("AppKey", getConfig().getAccessKeyId()); + headers.put("Nonce", nonce); + headers.put("CurTime", curTime); + headers.put("CheckSum", checkSum); + SmsResponse smsResponse; try { - Map headers = new LinkedHashMap<>(5); - headers.put("Content-Type", Constant.FROM_URLENCODED); - headers.put("AppKey", getConfig().getAccessKeyId()); - headers.put("Nonce", nonce); - headers.put("CurTime", curTime); - headers.put("CheckSum", checkSum); - SmsResponse smsResponse = getResponse(http.postJson(requestUrl, headers, body)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(requestUrl, phones, message, templateId); - }catch (SmsBlendException e){ - return requestRetry(requestUrl, phones, message, templateId); + smsResponse = getResponse(http.postJson(requestUrl, headers, body)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(requestUrl, phones, message, templateId); } private SmsResponse requestRetry(String requestUrl, List phones, String message, String templateId) { 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 401c1e92..5d1971c0 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 @@ -96,16 +96,19 @@ public class TencentSmsImpl extends AbstractSmsBlend { getConfig().getSignature(), templateId, messages); String url = Constant.HTTPS_PREFIX + getConfig().getRequestUrl(); + SmsResponse smsResponse; try { - SmsResponse smsResponse = getResponse(http.postJson(url, headsMap, requestBody)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phones, messages, templateId); - }catch (SmsBlendException e){ - return requestRetry(phones, messages, templateId); + smsResponse = getResponse(http.postJson(url, headsMap, requestBody)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phones, messages, templateId); } private SmsResponse requestRetry(String[] phones, String[] messages, String templateId) { diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniClient.java b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniClient.java index 02002769..1e73d4b9 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniClient.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniClient.java @@ -89,17 +89,18 @@ public class UniClient { headers.put("Accept", Constant.ACCEPT); String url = this.endpoint + "?action=" + action + "&accessKeyId=" + this.accessKeyId; - + UniResponse smsResponse; try { - UniResponse smsResponse = new UniResponse(http.postJson(url, headers, data)); - if("Success".equals(smsResponse.message) || retry == maxRetries){ - retry = 0; - return smsResponse; - } - return requestRetry(action, data); - }catch (SmsBlendException e){ - return requestRetry(action, data); + smsResponse = new UniResponse(http.postJson(url, headers, data)); + } catch (SmsBlendException e) { + smsResponse = new UniResponse(); + smsResponse.message = "Error"; } + if ("Success".equals(smsResponse.message) || retry == maxRetries) { + retry = 0; + return smsResponse; + } + return requestRetry(action, data); } private UniResponse requestRetry(String action, Map data) { diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniResponse.java b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniResponse.java index 8f8a1e18..33f1c415 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniResponse.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/UniResponse.java @@ -14,6 +14,8 @@ public class UniResponse { public JSONObject data = null; public Object raw; + public UniResponse(){} + /** * Create a new Uni Response. * 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 4812d218..f163cf03 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 @@ -55,16 +55,19 @@ public class YunPianSmsImpl extends AbstractSmsBlend { Map body = setBody(phone, message, null, getConfig().getTemplateId()); Map headers = getHeaders(); + SmsResponse smsResponse; try { - SmsResponse smsResponse = getResponse(http.postFrom(Constant.YUNPIAN_URL + "/sms/tpl_single_send.json", headers, body)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phone, message); - }catch (SmsBlendException e){ - return requestRetry(phone, message); + smsResponse = getResponse(http.postFrom(Constant.YUNPIAN_URL + "/sms/tpl_single_send.json", headers, body)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phone, message); } private SmsResponse requestRetry(String phone, String message) { @@ -79,16 +82,17 @@ public class YunPianSmsImpl extends AbstractSmsBlend { Map body = setBody(phone, "", messages, templateId); Map headers = getHeaders(); + SmsResponse smsResponse; try { - SmsResponse smsResponse = getResponse(http.postFrom(Constant.YUNPIAN_URL + "/sms/tpl_single_send.json", headers, body)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phone, templateId, messages); - }catch (SmsBlendException e){ + smsResponse = getResponse(http.postFrom(Constant.YUNPIAN_URL + "/sms/tpl_single_send.json", headers, body)); + } catch (SmsBlendException e) { return requestRetry(phone, templateId, messages); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phone, templateId, messages); } private SmsResponse requestRetry(String phone, String templateId, LinkedHashMap messages) { @@ -138,9 +142,9 @@ public class YunPianSmsImpl extends AbstractSmsBlend { body.put("apikey", getConfig().getAccessKeyId()); body.put("mobile", phone); body.put("tpl_id", tplId); - if (message!=null && !message.isEmpty()){ + if (message != null && !message.isEmpty()) { body.put("tpl_value", formattingMap(message)); - }else { + } else { body.put("tpl_value", ""); } if (getConfig().getCallbackUrl() != null && !getConfig().getCallbackUrl().isEmpty()) { 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 2a09870e..f4ed052a 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 @@ -130,18 +130,21 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { //内容 json.put("content", content); + Map headers = new LinkedHashMap<>(1); + headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); + SmsResponse smsResponse; try { - Map headers = new LinkedHashMap<>(1); - headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); - SmsResponse smsResponse = getResponse(http.postJson(requestUrl, headers, json)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phones, content); - }catch (SmsBlendException e){ - return requestRetry(phones, content); + smsResponse = getResponse(http.postJson(requestUrl, headers, json)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phones, content); } private SmsResponse requestRetry(List phones, String content) { @@ -215,18 +218,21 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { } requestJson.set("records", records); + Map headers = new LinkedHashMap<>(1); + headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); + SmsResponse smsResponse; try { - Map headers = new LinkedHashMap<>(1); - headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); - SmsResponse smsResponse = getResponse(http.postJson(requestUrl, headers, requestJson.toString())); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(templateId, phones, messages); - }catch (SmsBlendException e){ - return requestRetry(templateId, phones, messages); + smsResponse = getResponse(http.postJson(requestUrl, headers, requestJson.toString())); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(templateId, phones, messages); } private SmsResponse requestRetry(String templateId, List phones, LinkedHashMap messages) { diff --git a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SupplierConfig.java b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SupplierConfig.java index 9dc33295..d39793e4 100644 --- a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SupplierConfig.java +++ b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SupplierConfig.java @@ -1,18 +1,8 @@ package org.dromara.sms4j.solon.config; -import org.dromara.sms4j.aliyun.config.AlibabaConfig; import org.dromara.sms4j.api.SmsBlend; -import org.dromara.sms4j.cloopen.config.CloopenConfig; -import org.dromara.sms4j.ctyun.config.CtyunConfig; -import org.dromara.sms4j.emay.config.EmayConfig; -import org.dromara.sms4j.huawei.config.HuaweiConfig; -import org.dromara.sms4j.jdcloud.config.JdCloudConfig; import org.dromara.sms4j.provider.config.SmsConfig; import org.dromara.sms4j.provider.factory.BaseProviderFactory; -import org.dromara.sms4j.provider.factory.BeanFactory; -import org.dromara.sms4j.tencent.config.TencentConfig; -import org.dromara.sms4j.unisms.config.UniConfig; -import org.dromara.sms4j.yunpian.config.YunpianConfig; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Condition; import org.noear.solon.annotation.Configuration; diff --git a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunConfig.java b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunConfig.java index 18106009..ecef072c 100644 --- a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunConfig.java +++ b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunConfig.java @@ -2,7 +2,6 @@ package org.dromara.sms4j.example.zhangjun; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.provider.config.BaseConfig; /** diff --git a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunFactory.java b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunFactory.java index 51c5ef13..b982d70b 100644 --- a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunFactory.java +++ b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunFactory.java @@ -1,6 +1,5 @@ package org.dromara.sms4j.example.zhangjun; -import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.dromara.sms4j.provider.factory.AbstractProviderFactory; diff --git a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunSmsImpl.java b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunSmsImpl.java index f65eaff9..2b89c812 100644 --- a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunSmsImpl.java +++ b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/zhangjun/ZhangJunSmsImpl.java @@ -81,16 +81,19 @@ public class ZhangJunSmsImpl extends AbstractSmsBlend { } private SmsResponse getSmsResponse(String phone, String message, String templateId) { + SmsResponse smsResponse; try { - SmsResponse smsResponse = getResponse(http.postJson(getConfig().getUrl(), null, message)); - if(smsResponse.isSuccess() || retry == getConfig().getMaxRetries()){ - retry = 0; - return smsResponse; - } - return requestRetry(phone, message, templateId); - }catch (SmsBlendException e){ - return requestRetry(phone, message, templateId); + smsResponse = getResponse(http.postJson(getConfig().getUrl(), null, message)); + } catch (SmsBlendException e) { + smsResponse = new SmsResponse(); + smsResponse.setSuccess(false); + smsResponse.setData(e.getMessage()); } + if (smsResponse.isSuccess() || retry == getConfig().getMaxRetries()) { + retry = 0; + return smsResponse; + } + return requestRetry(phone, message, templateId); } private SmsResponse requestRetry(String phone, String message, String templateId) { diff --git a/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java index 4c63c96b..40a64d51 100644 --- a/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java +++ b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java @@ -6,7 +6,6 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.comm.utils.SmsUtils;