From 264795afbe30bfc1d714d86cdb122ff6afeefcd7 Mon Sep 17 00:00:00 2001 From: handy Date: Tue, 12 Mar 2024 17:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=EF=BC=8C=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BAfinal=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E6=B3=9B=E5=9E=8B=EF=BC=8C=E6=B3=A8=E9=87=8A=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=8D=E4=BD=BF=E7=94=A8=E5=B0=BE=E8=A1=8C=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../email/comm/config/MailSmtpConfig.java | 8 ++++---- .../email/core/service/MailService.java | 10 ++++++---- .../dromara/sms4j/api/proxy/SmsProcessor.java | 1 - .../dromara/sms4j/comm/delayedTime/Task.java | 13 ++++++++---- .../comm/exception/SmsBlendException.java | 2 +- .../core/proxy/SmsInvocationHandler.java | 3 +-- .../BlackListRecordingProcessor.java | 20 ++++++++++++++++--- .../proxy/processor/RestrictedProcessor.java | 12 +++++++---- .../jakarta/comm/config/MailSmtpConfig.java | 8 ++++---- .../jakarta/core/service/MailService.java | 10 ++++++---- .../core/byteTalk/service/ByteTalkOaImpl.java | 2 +- .../oa/core/config/OaBlendsInitializer.java | 2 +- .../core/dingTalk/service/DingTalkOaImpl.java | 2 +- .../oa/core/support/HttpClientImpl.java | 1 - .../oa/core/weTalk/service/WeTalkOaImpl.java | 2 +- .../sms4j/aliyun/service/AlibabaSmsImpl.java | 4 ++-- .../sms4j/cloopen/service/CloopenSmsImpl.java | 4 ++-- .../sms4j/ctyun/service/CtyunSmsImpl.java | 4 ++-- .../dingzhong/service/DingZhongSmsImpl.java | 2 +- .../sms4j/emay/service/EmaySmsImpl.java | 2 +- .../sms4j/huawei/service/HuaweiSmsImpl.java | 4 ++-- .../sms4j/huawei/utils/HuaweiBuilder.java | 7 ++++--- .../sms4j/jdcloud/service/JdCloudSmsImpl.java | 2 +- .../sms4j/lianlu/service/LianLuSmsImpl.java | 2 +- .../sms4j/netease/service/NeteaseSmsImpl.java | 4 ++-- .../provider/service/AbstractSmsBlend.java | 8 ++------ .../sms4j/qiniu/config/QiNiuFactory.java | 4 ---- .../dromara/sms4j/qiniu/util/QiNiuUtils.java | 12 +++++------ .../sms4j/tencent/service/TencentSmsImpl.java | 4 ++-- .../org/dromara/sms4j/unisms/core/Uni.java | 2 +- .../dromara/sms4j/unisms/core/UniClient.java | 2 +- .../solon/config/SmsBlendsInitializer.java | 2 +- .../sms4j/example/Sms4jApplication.java | 6 ------ .../starter/config/SmsBlendsInitializer.java | 2 +- 34 files changed, 92 insertions(+), 81 deletions(-) diff --git a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java index 2b1e87b4..32ec548e 100644 --- a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java +++ b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java @@ -50,23 +50,23 @@ public class MailSmtpConfig { * 是否开启ssl 默认开启 * */ @Builder.Default - private String isSSL = "true"; + private final String isSSL = "true"; /** * 是否开启验证 默认开启 * */ @Builder.Default - private String isAuth = "true"; + private final String isAuth = "true"; /** * 重试间隔（单位：秒），默认为5秒 */ @Builder.Default - private int retryInterval = 5; + private final int retryInterval = 5; /** * 重试次数，默认为1次 */ @Builder.Default - private int maxRetries = 1; + private final int maxRetries = 1; } diff --git a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java index bf861913..4b8abc21 100644 --- a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java +++ b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java @@ -34,8 +34,8 @@ import java.util.logging.Logger; public class MailService implements MailClient { - private static Logger logger = Logger.getLogger("mailLog"); - private MailBuild mailBuild; + private static final Logger logger = Logger.getLogger("mailLog"); + private final MailBuild mailBuild; private MailService(MailBuild mailBuild) { this.mailBuild = mailBuild; @@ -137,7 +137,8 @@ public class MailService implements MailClient { List cc, List bcc) { int maxRetries = mailBuild.getMaxRetries(); - int retryCount = 1; // 初始值为1；则while循环中少发送一次，最后一次发送在判断 retryCount >= maxRetries 这里。 + // 初始值为1；则while循环中少发送一次，最后一次发送在判断 retryCount >= maxRetries 这里。 + int retryCount = 1; boolean retryOnFailure = true; while (retryOnFailure && retryCount < maxRetries) { @@ -150,7 +151,8 @@ public class MailService implements MailClient { message = messageBuild(mailAddress, title, body, null, null, zipName, cc, bcc, files); } Transport.send(message); - retryOnFailure = false; // 发送成功，停止重试 + // 发送成功，停止重试 + retryOnFailure = false; } catch (MessagingException | IOException e) { retryCount++; try { diff --git a/sms4j-api/src/main/java/org/dromara/sms4j/api/proxy/SmsProcessor.java b/sms4j-api/src/main/java/org/dromara/sms4j/api/proxy/SmsProcessor.java index e505a874..e4c26572 100644 --- a/sms4j-api/src/main/java/org/dromara/sms4j/api/proxy/SmsProcessor.java +++ b/sms4j-api/src/main/java/org/dromara/sms4j/api/proxy/SmsProcessor.java @@ -1,7 +1,6 @@ package org.dromara.sms4j.api.proxy; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; /** * 执行器接口 diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java index 6e1d9142..ba6783b6 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java @@ -5,9 +5,14 @@ import lombok.Data; import java.util.TimerTask; @Data -public class Task{ - - private TimerTask runnable;//描述要执行的任务 - private Long time;//什么时间执行,用时间戳来表示 +public class Task { + /** + * 描述要执行的任务 + */ + private TimerTask runnable; + /** + * 什么时间执行,用时间戳来表示 + */ + private Long time; } diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java index 111a1672..f49f1028 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java @@ -2,7 +2,7 @@ package org.dromara.sms4j.comm.exception; public class SmsBlendException extends RuntimeException{ public String code; - public String message; + public final String message; public String requestId; public SmsBlendException(String message) { diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsInvocationHandler.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsInvocationHandler.java index 0545e039..dde9bda3 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsInvocationHandler.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsInvocationHandler.java @@ -5,7 +5,6 @@ import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.proxy.SmsProcessor; import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; @@ -28,7 +27,7 @@ public class SmsInvocationHandler implements InvocationHandler { } @Override - public Object invoke(Object o, Method method, Object[] objects) throws Throwable { + public Object invoke(Object o, Method method, Object[] objects) { Object result = null; //前置执行器 objects = doPreProcess(smsBlend, method, objects); diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/BlackListRecordingProcessor.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/BlackListRecordingProcessor.java index bc79d361..dd3c3701 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/BlackListRecordingProcessor.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/BlackListRecordingProcessor.java @@ -62,12 +62,21 @@ public class BlackListRecordingProcessor implements SmsProcessor, SmsDaoAware, S return param; } - //构建cachekey + /** + * 构建CacheKey + * + * @return CacheKey + */ public String getCacheKey(){ return "sms:blacklist:global"; } - //获取黑名单，没有就新建 + /** + * 获取黑名单，没有就新建 + * + * @param cacheKey 缓存key + * @return 黑名单 + */ public ArrayList getBlackList(String cacheKey) { ArrayList blackList; Object cache = smsDao.get(cacheKey); @@ -80,7 +89,12 @@ public class BlackListRecordingProcessor implements SmsProcessor, SmsDaoAware, S return blackList; } - //让黑名单生效 + /** + * 让黑名单生效 + * + * @param cacheKey 缓存key + * @param blackList 黑命令 + */ public void flushBlackList(String cacheKey ,ArrayList blackList) { smsDao.set(cacheKey, blackList); } diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/RestrictedProcessor.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/RestrictedProcessor.java index d07fb1dc..d7eb50e2 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/RestrictedProcessor.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/RestrictedProcessor.java @@ -68,10 +68,13 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware { if (!config.getRestricted()){ return; } - Integer accountMax = config.getAccountMax(); // 每日最大发送量 - Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量 + // 每日最大发送量 + Integer accountMax = config.getAccountMax(); + // 每分钟最大发送量 + Integer minuteMax = config.getMinuteMax(); for (String phone : phones) { - if (SmsUtils.isNotEmpty(accountMax)) { // 是否配置了每日限制 + // 是否配置了每日限制 + if (SmsUtils.isNotEmpty(accountMax)) { Integer i = (Integer) smsDao.get(REDIS_KEY + phone + "max"); if (SmsUtils.isEmpty(i)) { smsDao.set(REDIS_KEY + phone + "max", 1, accTimer / 1000); @@ -82,7 +85,8 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware { smsDao.set(REDIS_KEY + phone + "max", i + 1, accTimer / 1000); } } - if (SmsUtils.isNotEmpty(minuteMax)) { // 是否配置了每分钟最大限制 + // 是否配置了每分钟最大限制 + if (SmsUtils.isNotEmpty(minuteMax)) { Integer o = (Integer) smsDao.get(REDIS_KEY + phone); if (SmsUtils.isNotEmpty(o)) { if (o < minuteMax) { diff --git a/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java b/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java index fce2a1fb..36826bcc 100644 --- a/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java +++ b/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java @@ -50,23 +50,23 @@ public class MailSmtpConfig { * 是否开启ssl 默认开启 * */ @Builder.Default - private String isSSL = "true"; + private final String isSSL = "true"; /** * 是否开启验证 默认开启 * */ @Builder.Default - private String isAuth = "true"; + private final String isAuth = "true"; /** * 重试间隔（单位：秒），默认为5秒 */ @Builder.Default - private int retryInterval = 5; + private final int retryInterval = 5; /** * 重试次数，默认为1次 */ @Builder.Default - private int maxRetries = 1; + private final int maxRetries = 1; } diff --git a/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailService.java b/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailService.java index 7dadd668..d7fbd3b4 100644 --- a/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailService.java +++ b/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailService.java @@ -33,8 +33,8 @@ import java.util.logging.Logger; public class MailService implements MailClient { - private static Logger logger = Logger.getLogger("mailLog"); - private MailBuild mailBuild; + private static final Logger logger = Logger.getLogger("mailLog"); + private final MailBuild mailBuild; private MailService(MailBuild mailBuild) { this.mailBuild = mailBuild; @@ -130,7 +130,8 @@ public class MailService implements MailClient { List cc, List bcc) { int maxRetries = mailBuild.getMaxRetries(); - int retryCount = 1; // 初始值为1；则while循环中少发送一次，最后一次发送在判断 retryCount >= maxRetries 这里。 + // 初始值为1；则while循环中少发送一次，最后一次发送在判断 retryCount >= maxRetries 这里。 + int retryCount = 1; boolean retryOnFailure = true; while (retryOnFailure && retryCount < maxRetries) { @@ -143,7 +144,8 @@ public class MailService implements MailClient { message = messageBuild(mailAddress, title, body, null, null, zipName, cc, bcc, files); } Transport.send(message); - retryOnFailure = false; // 发送成功，停止重试 + // 发送成功，停止重试 + retryOnFailure = false; } catch (MessagingException | IOException e) { retryCount++; try { diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java index 77b06135..d25dd153 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/byteTalk/service/ByteTalkOaImpl.java @@ -25,7 +25,7 @@ import static org.dromara.oa.comm.enums.OaType.BYTETALK; @Slf4j public class ByteTalkOaImpl extends AbstractOaBlend { - private HttpClientImpl httpClient = new HttpClientImpl(); + private final HttpClientImpl httpClient = new HttpClientImpl(); public ByteTalkOaImpl(ByteTalkConfig config) { super(config); diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java index db7edf1d..0d5124a4 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaBlendsInitializer.java @@ -26,7 +26,7 @@ import java.util.Map; @Slf4j public class OaBlendsInitializer { - private List> factoryList; + private final List> factoryList; private final OaConfig oaConfig; private final Map> blends; diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java index 42d124ec..1a1f3324 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/dingTalk/service/DingTalkOaImpl.java @@ -25,7 +25,7 @@ import static org.dromara.oa.comm.enums.OaType.DINGTALK; @Slf4j public class DingTalkOaImpl extends AbstractOaBlend { - private HttpClientImpl httpClient = new HttpClientImpl(); + private final HttpClientImpl httpClient = new HttpClientImpl(); /** * 建造一个微信通知对象服务 diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/support/HttpClientImpl.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/support/HttpClientImpl.java index 1cceab59..3b0957c8 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/support/HttpClientImpl.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/support/HttpClientImpl.java @@ -2,7 +2,6 @@ package org.dromara.oa.core.support; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; import java.util.Map; diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java index a173c2d6..8bb0d047 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/weTalk/service/WeTalkOaImpl.java @@ -25,7 +25,7 @@ import static org.dromara.oa.comm.enums.OaType.WETALK; @Slf4j public class WeTalkOaImpl extends AbstractOaBlend { - private HttpClientImpl httpClient = new HttpClientImpl(); + private final HttpClientImpl httpClient = new HttpClientImpl(); public WeTalkOaImpl(WeTalkConfig config) { super(config); 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 16dab084..0174dd7c 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 @@ -73,7 +73,7 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(phone, messageStr, templateId); @@ -89,7 +89,7 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(SmsUtils.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 a31060a2..4993832c 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 @@ -55,7 +55,7 @@ public class CloopenSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } return massTexting(Collections.singletonList(phone), templateId, messages); } @@ -70,7 +70,7 @@ public class CloopenSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } CloopenHelper helper = new CloopenHelper(getConfig(), http); Map paramMap = MapUtil.newHashMap(4, true); 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 53464199..038b0498 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 @@ -60,7 +60,7 @@ public class CtyunSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(phone, messageStr, templateId); @@ -76,7 +76,7 @@ public class CtyunSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } String messageStr = JSONUtil.toJsonStr(messages); return getSmsResponse(SmsUtils.arrayToString(phones), messageStr, templateId); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java index 9c102163..604e9605 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java @@ -70,7 +70,7 @@ public class DingZhongSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } DingZhongHelper helper = new DingZhongHelper(getConfig(), http); Map paramMap = MapUtil.newHashMap(5, true); 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 96c757fd..3f5a293d 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 @@ -83,7 +83,7 @@ public class EmaySmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } List list = new ArrayList<>(); for (Map.Entry entry : messages.entrySet()) { 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 2419abd5..7bb860da 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 @@ -59,7 +59,7 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } String url = getConfig().getUrl() + Constant.HUAWEI_REQUEST_URL; List list = new ArrayList<>(); @@ -103,7 +103,7 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } return sendMessage(CollUtil.join(phones, ","), templateId, messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java index e290e0da..97aba3ec 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java @@ -35,7 +35,8 @@ public class HuaweiBuilder { return null; } String time = dateFormat(new Date()); - String nonce = UUID.randomUUID().toString().replace("-", ""); //Nonce + // Nonce + String nonce = UUID.randomUUID().toString().replace("-", ""); MessageDigest md; byte[] passwordDigest = null; @@ -46,8 +47,8 @@ public class HuaweiBuilder { } catch (NoSuchAlgorithmException e) { e.printStackTrace(); } - - String passwordDigestBase64Str = Base64.encode(passwordDigest); //PasswordDigest + // PasswordDigest + String passwordDigestBase64Str = Base64.encode(passwordDigest); //若passwordDigestBase64Str中包含换行符,请执行如下代码进行修正 //passwordDigestBase64Str = passwordDigestBase64Str.replaceAll("[\\s*\t\n\r]", ""); return String.format(Constant.HUAWEI_WSSE_HEADER_FORMAT, appKey, passwordDigestBase64Str, nonce, time); 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 7ababb9a..b37b875e 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 @@ -75,7 +75,7 @@ public class JdCloudSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } BatchSendRequest request; try { 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 dc8209a3..9c0b7c16 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 @@ -84,7 +84,7 @@ public class LianLuSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } LianLuRequest req = getRequest(); req.setType(TEMPLATE_MSG) 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 09f84b4c..513b74d7 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 @@ -79,7 +79,7 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } Optional.ofNullable(phone).orElseThrow(() -> new SmsBlendException("手机号不能为空")); Optional.ofNullable(getConfig().getTemplateId()).orElseThrow(() -> new SmsBlendException("模板ID不能为空")); @@ -102,7 +102,7 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } 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 0807eda0..2c64451c 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 @@ -133,9 +133,7 @@ public abstract class AbstractSmsBlend implements SmsB */ @Override public final void sendMessageAsync(String phone, String message){ - pool.execute(() -> { - sendMessage(phone, message); - }); + pool.execute(() -> sendMessage(phone, message)); } /** @@ -164,9 +162,7 @@ public abstract class AbstractSmsBlend implements SmsB */ @Override public final void sendMessageAsync(String phone, String templateId, LinkedHashMap messages){ - pool.execute(() -> { - sendMessage(phone, templateId, messages); - }); + pool.execute(() -> sendMessage(phone, templateId, messages)); } /** diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/config/QiNiuFactory.java b/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/config/QiNiuFactory.java index 01c7ac45..bfd673bb 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/config/QiNiuFactory.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/config/QiNiuFactory.java @@ -1,12 +1,8 @@ package org.dromara.sms4j.qiniu.config; import lombok.AccessLevel; -import lombok.Data; import lombok.NoArgsConstructor; import org.dromara.sms4j.comm.constant.SupplierConstant; -import org.dromara.sms4j.netease.config.NeteaseConfig; -import org.dromara.sms4j.netease.config.NeteaseFactory; -import org.dromara.sms4j.netease.service.NeteaseSmsImpl; import org.dromara.sms4j.provider.factory.AbstractProviderFactory; import org.dromara.sms4j.qiniu.service.QiNiuSmsImpl; diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/util/QiNiuUtils.java b/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/util/QiNiuUtils.java index 15d174b5..e48df1b0 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/util/QiNiuUtils.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/util/QiNiuUtils.java @@ -10,14 +10,14 @@ import org.dromara.sms4j.comm.constant.Constant; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.qiniu.config.QiNiuConfig; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; import java.net.URI; import java.nio.charset.StandardCharsets; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Base64; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.TimeZone; /** * @author Administrator @@ -30,7 +30,7 @@ public class QiNiuUtils { private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1"; - public static String getSignature(String method, String url, QiNiuConfig qiNiuConfig, String body, String signDate) throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException, MalformedURLException { + public static String getSignature(String method, String url, QiNiuConfig qiNiuConfig, String body, String signDate) { URI reqUrl = URI.create(url); StringBuilder dataToSign = new StringBuilder(); dataToSign.append(method.toUpperCase()).append(" ").append(reqUrl.getPath()); 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 72b379b4..79d2d474 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 @@ -60,7 +60,7 @@ public class TencentSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } List list = new ArrayList<>(); for (Map.Entry entry : messages.entrySet()) { @@ -83,7 +83,7 @@ public class TencentSmsImpl extends AbstractSmsBlend { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } List list = new ArrayList<>(); for (Map.Entry entry : messages.entrySet()) { diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java index 1b0a670c..235c8125 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java @@ -8,7 +8,7 @@ public class Uni { /** 模仿SDK版本*/ public static final String VERSION = "0.0.4"; - public static String signingAlgorithm = "hmac-sha256"; + public static final String signingAlgorithm = "hmac-sha256"; public static String endpoint = System.getenv().getOrDefault("UNI_ENDPOINT", "https://uni.apistd.com"); public static String accessKeyId = System.getenv("UNI_ACCESS_KEY_ID"); 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 0e3380ef..f60b46e5 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 @@ -118,7 +118,7 @@ public class UniClient { } public static class Builder { - private String accessKeyId; + private final String accessKeyId; private String accessKeySecret; private String endpoint; private String signingAlgorithm; diff --git a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsBlendsInitializer.java b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsBlendsInitializer.java index 3ca39275..983ce80d 100644 --- a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsBlendsInitializer.java +++ b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsBlendsInitializer.java @@ -41,7 +41,7 @@ import java.util.Map; @Slf4j public class SmsBlendsInitializer { - private List> factoryList; + private final List> factoryList; private final SmsConfig smsConfig; private final Map> blends; diff --git a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/Sms4jApplication.java b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/Sms4jApplication.java index 1b627bc4..4946f8c5 100644 --- a/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/Sms4jApplication.java +++ b/sms4j-spring-boot-example/src/main/java/org/dromara/sms4j/example/Sms4jApplication.java @@ -1,14 +1,8 @@ package org.dromara.sms4j.example; -import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.comm.constant.SupplierConstant; -import org.dromara.sms4j.core.factory.SmsFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import java.util.ArrayList; -import java.util.LinkedHashMap; - /** * 主类 * diff --git a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsBlendsInitializer.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsBlendsInitializer.java index 674e9135..f784546a 100644 --- a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsBlendsInitializer.java +++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsBlendsInitializer.java @@ -45,7 +45,7 @@ import java.util.Map; @Slf4j public class SmsBlendsInitializer { - private List> factoryList; + private final List> factoryList; private final SmsConfig smsConfig; private final Map> blends;