diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java deleted file mode 100644 index b8a15b3b..00000000 --- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java +++ /dev/null @@ -1,134 +0,0 @@ -package org.dromara.sms4j.autoimmit.aop; - - -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.dromara.sms4j.autoimmit.utils.RedisUtils; -import org.dromara.sms4j.autoimmit.utils.SpringUtil; -import org.dromara.sms4j.comm.config.SmsConfig; -import org.dromara.sms4j.comm.exception.SmsBlendException; -import org.dromara.sms4j.comm.utils.SmsUtil; -import org.dromara.sms4j.comm.utils.TimeExpiredPoolCache; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; - -@Aspect -@Slf4j -public class AopAdvice { - - private static final Long minTimer = 60 * 1000L; - private static final Long accTimer = 24 * 60 * 60 * 1000L; - - private static final String REDIS_KEY = "sms:restricted:"; - - @Autowired - private SmsConfig config; - - @Autowired - private SpringUtil springUtil; - - @Pointcut("@annotation(org.dromara.sms4j.comm.annotation.Restricted)") - public void restricted() { - } - - @Around("restricted()") - public Object restrictedSendMessage(ProceedingJoinPoint p) throws Throwable { - - String args = ""; - ArrayList argsList = new ArrayList<>(); - try { - args = (String) p.getArgs()[0]; - } catch (Exception e) { - for (Object o : (ArrayList) p.getArgs()[0]) { - argsList.add((String) o); - } - } - SmsBlendException process = redisProcess(args); - if (process != null) { - throw process; - } - argsList.forEach(f -> { - SmsBlendException proce = null; - try { - proce = redisProcess(f); - } catch (Exception e) { - log.error(e.getMessage()); - throw new RuntimeException(e); - } - if (proce != null) { - throw proce; - } - }); - return p.proceed(); - } - - private SmsBlendException process(String args) throws Exception { - TimeExpiredPoolCache instance = TimeExpiredPoolCache.getInstance();//缓存实例 - Integer accountMax = config.getAccountMax();//每日最大发送量 - Integer minuteMax = config.getMinuteMax();//每分钟最大发送量 - if (SmsUtil.isNotEmpty(accountMax)) { //是否配置了每日限制 - Integer i = instance.get(args + "max"); - if (SmsUtil.isEmpty(i)) { - instance.put(args + "max", 1, accTimer); - } else if (i > accountMax) { - log.info("The phone:"+args +",number of short messages reached the maximum today"); - return new SmsBlendException("The phone:"+args +",number of short messages reached the maximum today"); - } else { - instance.put(args + "max", i + 1, accTimer); - } - } - if (SmsUtil.isNotEmpty(minuteMax)) { //是否配置了每分钟最大限制 - Integer o = instance.get(args); - if (SmsUtil.isNotEmpty(o)) { - if (o < minuteMax) { - instance.put(args, o + 1, minTimer); - } else { - log.info("The phone:"+args +",number of short messages reached the maximum today"); - return new SmsBlendException("The phone:", args + " Text messages are sent too often!"); - } - } else { - instance.put(args, 1, minTimer); - } - } - return null; - } - - private SmsBlendException redisProcess(String args) throws Exception{ - if (config.getRedisCache().equals("false")){ - return process(args); - } - RedisUtils redis = SpringUtil.getBean(RedisUtils.class); - - Integer accountMax = config.getAccountMax();//每日最大发送量 - Integer minuteMax = config.getMinuteMax();//每分钟最大发送量 - if (SmsUtil.isNotEmpty(accountMax)) { //是否配置了每日限制 - Integer i = (Integer) redis.getByKey(REDIS_KEY+args + "max"); - if (SmsUtil.isEmpty(i)) { - redis.setOrTime(REDIS_KEY+args + "max", 1,accTimer/1000); - } else if (i > accountMax) { - log.info("The phone:"+args +",number of short messages reached the maximum today"); - return new SmsBlendException("The phone:"+args +",number of short messages reached the maximum today"); - } else { - redis.setOrTime(REDIS_KEY+args + "max", i + 1,accTimer/1000); - } - } - if (SmsUtil.isNotEmpty(minuteMax)) { //是否配置了每分钟最大限制 - Integer o = (Integer) redis.getByKey(REDIS_KEY+args); - if (SmsUtil.isNotEmpty(o)) { - if (o < minuteMax) { - redis.setOrTime(REDIS_KEY+args, o + 1,minTimer/1000); - } else { - log.info("The phone:"+args +",number of short messages reached the maximum today"); - return new SmsBlendException("The phone:", args + " Text messages are sent too often!"); - } - } else { - redis.setOrTime(REDIS_KEY+args, 1,minTimer/1000); - } - } - return null; - } -} diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java index 6c3c9950..7625abff 100644 --- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java +++ b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java @@ -2,7 +2,6 @@ package org.dromara.sms4j.autoimmit.config; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.smsProxy.SmsInvocationHandler; -import org.dromara.sms4j.autoimmit.aop.AopAdvice; import org.dromara.sms4j.autoimmit.aop.RestrictedProcessImpl; import org.dromara.sms4j.autoimmit.utils.ConfigUtil; import org.dromara.sms4j.autoimmit.utils.RedisUtils; @@ -80,10 +79,10 @@ public class SmsAutowiredConfig { log.debug("The redis cache is enabled for sms4j"); } /* 如果启用了短信限制,则注入AOP组件*/ - if (BeanFactory.getSmsConfig().getRestricted()){ - springUtil.createBean(AopAdvice.class); - log.debug("SMS restriction is enabled"); - } +// if (BeanFactory.getSmsConfig().getRestricted()){ +// springUtil.createBean(AopAdvice.class); +// log.debug("SMS restriction is enabled"); +// } //打印banner if (BeanFactory.getSmsConfig().getIsPrint()){ SmsBanner.PrintBanner(Constant.VERSION);