diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java index cae771cc..8a8ddcf0 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java @@ -104,7 +104,7 @@ public abstract class SmsProxyFactory { log.info("{}:加载SmsDao成功,使用{}", frameworkName,smsDao.getClass().getName()); return smsDao; } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - log.info("{}:加载SmsDao失败,尝试其他框架加载......", frameworkName); + log.debug("{}:加载SmsDao失败,尝试其他框架加载......", frameworkName); } return null; } 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 ea47059a..b9d091c4 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 @@ -72,8 +72,8 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware { if (SmsUtils.isEmpty(i)) { smsDao.set(REDIS_KEY + phone + "max", 1, accTimer / 1000); } else if (i >= accountMax) { - log.info("The phone:" + phone + ",number of short messages reached the maximum today"); - throw new SmsBlendException("The phone:" + phone + ",number of short messages reached the maximum today"); + log.info("The phone: {},number of short messages reached the maximum today", phone); + throw new SmsBlendException("The phone: {},number of short messages reached the maximum today", phone); } else { smsDao.set(REDIS_KEY + phone + "max", i + 1, accTimer / 1000); } @@ -84,8 +84,8 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware { if (o < minuteMax) { smsDao.set(REDIS_KEY + phone, o + 1, minTimer / 1000); } else { - log.info("The phone:" + phone + ",number of short messages reached the maximum today"); - throw new SmsBlendException("The phone:", phone + " Text messages are sent too often!"); + log.info("The phone: {},number of short messages reached the maximum today", phone); + throw new SmsBlendException("The phone: {} Text messages are sent too often!", phone); } } else { smsDao.set(REDIS_KEY + phone, 1, minTimer / 1000); diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/SingleBlendRestrictedProcessor.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/SingleBlendRestrictedProcessor.java index fea1e41a..96679fb7 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/SingleBlendRestrictedProcessor.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/SingleBlendRestrictedProcessor.java @@ -66,8 +66,8 @@ public class SingleBlendRestrictedProcessor implements SmsProcessor, SmsDaoAware if (SmsUtils.isEmpty(i)) { smsDao.set(REDIS_KEY + configId + "maximum", 1); } else if (i >= maximum) { - log.info("The channel:" + configId + ",messages reached the maximum"); - throw new SmsBlendException("The channel:" + configId + ",messages reached the maximum"); + log.info("The channel: {},messages reached the maximum", configId); + throw new SmsBlendException("The channel: {},messages reached the maximum", configId); } else { smsDao.set(REDIS_KEY + configId + "maximum", i + 1); } 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 852e69a4..5c069b7a 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 @@ -121,7 +121,7 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String phone, String message, String templateId) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return getSmsResponse(phone, message, templateId); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java index f1e11224..6b5674ac 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java @@ -65,7 +65,7 @@ public class CloopenHelper { private SmsResponse requestRetry(Map paramMap) { http.safeSleep(config.getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return smsResponse(paramMap); } 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 d8dd4657..c44227f7 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 @@ -107,7 +107,7 @@ public class CtyunSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String phone, String message, String templateId) { http.safeSleep(getConfig().getRetryInterval()); retry ++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return getSmsResponse(phone, message, templateId); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java index 49cf7d0c..628a3c40 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java @@ -54,7 +54,7 @@ public class DingZhongHelper { private SmsResponse requestRetry(Map paramMap) { http.safeSleep(config.getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return smsResponse(paramMap); } 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 2257c506..71424566 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 @@ -75,7 +75,7 @@ public class EmaySmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String phone, String message) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return sendMessage(phone, 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 052a4216..4502fdca 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 @@ -88,7 +88,7 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String phone, String templateId, LinkedHashMap messages) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return sendMessage(phone, templateId, messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java index 976494de..e2a947ab 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 @@ -107,7 +107,7 @@ public class JdCloudSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(List phones, String templateId, LinkedHashMap messages) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return massTexting(phones, templateId, 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 a2a8fbb4..cdd77a0c 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 @@ -142,7 +142,7 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String requestUrl, List phones, String message, String templateId) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return getSmsResponse(requestUrl, phones, message, templateId); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/service/QiNiuSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/service/QiNiuSmsImpl.java index 7d1cbca9..36e565a4 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/service/QiNiuSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/qiniu/service/QiNiuSmsImpl.java @@ -92,7 +92,7 @@ public class QiNiuSmsImpl extends AbstractSmsBlend { } http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return handleRes(url, params); } 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 fe8a115c..8d54793d 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 @@ -123,7 +123,7 @@ public class TencentSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String[] phones, String[] messages, String templateId) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return getSmsResponse(phones, messages, 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 b5b72585..0e3380ef 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 @@ -113,7 +113,7 @@ public class UniClient { private UniResponse requestRetry(String action, Map data) { http.safeSleep(retryInterval); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return request(action, data); } 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 52b463ae..706a7f17 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 @@ -82,7 +82,7 @@ public class YunPianSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String phone, String message) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return sendMessage(phone, message); } @@ -107,7 +107,7 @@ public class YunPianSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String phone, String templateId, LinkedHashMap messages) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return sendMessage(phone, templateId, messages); } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java index 9aa401dd..e2180e7d 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 @@ -160,7 +160,7 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(List phones, String content) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return getSmsResponse(phones, content); } @@ -248,7 +248,7 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String templateId, List phones, LinkedHashMap messages) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return getSmsResponseTemplate(templateId, phones, messages); } 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 a68f3b4c..55f9192b 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 @@ -104,7 +104,7 @@ public class ZhangJunSmsImpl extends AbstractSmsBlend { private SmsResponse requestRetry(String phone, String message, String templateId) { http.safeSleep(getConfig().getRetryInterval()); retry++; - log.warn("短信第 {" + retry + "} 次重新发送"); + log.warn("短信第 {} 次重新发送", retry); return getSmsResponse(phone, message, templateId); }