diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/CoreMethodParamValidateProcessor.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/CoreMethodParamValidateProcessor.java index 97938b91..ec490b28 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/CoreMethodParamValidateProcessor.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/CoreMethodParamValidateProcessor.java @@ -1,14 +1,13 @@ package org.dromara.sms4j.core.proxy.processor; import cn.hutool.core.util.StrUtil; -import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.proxy.CoreMethodProcessor; import org.dromara.sms4j.comm.exception.SmsBlendException; import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; +import java.util.Objects; /** 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 b9d091c4..d07fb1dc 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 @@ -61,9 +61,13 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware { public void doRestricted(List phones) { if (Objects.isNull(smsDao)) { - throw new SmsBlendException("The dao tool could not be found"); + throw new SmsBlendException("The smsDao tool could not be found"); } SmsConfig config = BeanFactory.getSmsConfig(); + // 如果未开始限制则不做处理 + if (!config.getRestricted()){ + return; + } Integer accountMax = config.getAccountMax(); // 每日最大发送量 Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量 for (String phone : phones) { 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 5a4db2c0..445e1f46 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 @@ -48,10 +48,6 @@ public class SingleBlendRestrictedProcessor implements SmsProcessor, SmsDaoAware String configId = smsBlend.getConfigId(); Map targetConfig = (Map) smsBlendsConfig.get(configId); Object maximumObj = targetConfig.get("maximum"); - if (null == maximumObj) { - log.info("配置信息未能加载到本拦截器,跳过渠道级上限前置拦截执行器"); - return param; - } if (SmsUtils.isEmpty(maximumObj)) { return param; }