From 3edd22705ef4af58ceae756e0149cb49ff424edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Tue, 29 Jul 2025 16:04:54 +0800 Subject: [PATCH] 1 --- .../cn/van333/wxsend/aop/annotation/RateLimiter.java | 5 ++++- .../van333/wxsend/aop/aspectj/RateLimiterAspect.java | 8 ++++---- .../wxsend/business/controller/DCController.java | 5 ----- .../wxsend/business/controller/WXController.java | 10 ++++++---- .../wxsend/exception/RateLimitExceptionHandler.java | 2 -- src/main/java/cn/van333/wxsend/util/QCUtil.java | 9 +-------- .../java/cn/van333/wxsend/util/str/CharsetKit.java | 2 -- 7 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/main/java/cn/van333/wxsend/aop/annotation/RateLimiter.java b/src/main/java/cn/van333/wxsend/aop/annotation/RateLimiter.java index abe82f1..6e51782 100644 --- a/src/main/java/cn/van333/wxsend/aop/annotation/RateLimiter.java +++ b/src/main/java/cn/van333/wxsend/aop/annotation/RateLimiter.java @@ -3,7 +3,10 @@ package cn.van333.wxsend.aop.annotation; import cn.van333.wxsend.constant.CacheConstants; import cn.van333.wxsend.enums.LimitType; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * @author Leo diff --git a/src/main/java/cn/van333/wxsend/aop/aspectj/RateLimiterAspect.java b/src/main/java/cn/van333/wxsend/aop/aspectj/RateLimiterAspect.java index 3cb8044..30a9b90 100644 --- a/src/main/java/cn/van333/wxsend/aop/aspectj/RateLimiterAspect.java +++ b/src/main/java/cn/van333/wxsend/aop/aspectj/RateLimiterAspect.java @@ -1,9 +1,5 @@ package cn.van333.wxsend.aop.aspectj; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.List; - import cn.van333.wxsend.aop.annotation.RateLimiter; import cn.van333.wxsend.enums.LimitType; import cn.van333.wxsend.exception.ServiceException; @@ -20,6 +16,10 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.List; + /** * 限流处理 diff --git a/src/main/java/cn/van333/wxsend/business/controller/DCController.java b/src/main/java/cn/van333/wxsend/business/controller/DCController.java index 7402156..37672e3 100644 --- a/src/main/java/cn/van333/wxsend/business/controller/DCController.java +++ b/src/main/java/cn/van333/wxsend/business/controller/DCController.java @@ -1,16 +1,13 @@ package cn.van333.wxsend.business.controller; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.van333.wxsend.aop.annotation.RateLimiter; import cn.van333.wxsend.business.model.R; import cn.van333.wxsend.business.service.LogService; import cn.van333.wxsend.enums.WXMessageType; -import cn.van333.wxsend.util.SourceForQLUtil; import cn.van333.wxsend.util.TokenUtil; import cn.van333.wxsend.util.WxSendUtil; import cn.van333.wxsend.util.request.MessageRequest; -import com.alibaba.fastjson2.JSON; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestBody; @@ -18,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; - /** * @author Leo * @version 1.0 diff --git a/src/main/java/cn/van333/wxsend/business/controller/WXController.java b/src/main/java/cn/van333/wxsend/business/controller/WXController.java index cb3fb3e..b6b05ad 100644 --- a/src/main/java/cn/van333/wxsend/business/controller/WXController.java +++ b/src/main/java/cn/van333/wxsend/business/controller/WXController.java @@ -5,17 +5,19 @@ import cn.hutool.core.util.StrUtil; import cn.van333.wxsend.aop.annotation.RateLimiter; import cn.van333.wxsend.business.model.R; import cn.van333.wxsend.business.service.LogService; -import cn.van333.wxsend.util.TokenUtil; import cn.van333.wxsend.enums.WXMessageType; +import cn.van333.wxsend.util.SourceForQLUtil; +import cn.van333.wxsend.util.TokenUtil; import cn.van333.wxsend.util.WxSendUtil; import cn.van333.wxsend.util.request.MessageRequest; -import cn.van333.wxsend.util.SourceForQLUtil; import com.alibaba.fastjson2.JSON; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -import javax.rmi.CORBA.Util; import javax.servlet.http.HttpServletRequest; /** diff --git a/src/main/java/cn/van333/wxsend/exception/RateLimitExceptionHandler.java b/src/main/java/cn/van333/wxsend/exception/RateLimitExceptionHandler.java index 94b5a87..ce54951 100644 --- a/src/main/java/cn/van333/wxsend/exception/RateLimitExceptionHandler.java +++ b/src/main/java/cn/van333/wxsend/exception/RateLimitExceptionHandler.java @@ -1,8 +1,6 @@ package cn.van333.wxsend.exception; import cn.van333.wxsend.business.model.R; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/src/main/java/cn/van333/wxsend/util/QCUtil.java b/src/main/java/cn/van333/wxsend/util/QCUtil.java index 3635eb5..5582f78 100644 --- a/src/main/java/cn/van333/wxsend/util/QCUtil.java +++ b/src/main/java/cn/van333/wxsend/util/QCUtil.java @@ -1,16 +1,9 @@ package cn.van333.wxsend.util; -import cn.hutool.extra.template.Template; -import cn.hutool.extra.template.engine.velocity.VelocityEngine; -import org.apache.ibatis.jdbc.SQL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.web.util.HtmlUtils; import javax.activation.DataSource; @@ -55,7 +48,7 @@ public class QCUtil { * @param msg */ public static final void consume(long start, long end, String msg) { - System.err.println(String.format("%s consume times: %s=%s-%s", msg, (end - start), end, start)); + System.err.printf("%s consume times: %s=%s-%s%n", msg, (end - start), end, start); } /** diff --git a/src/main/java/cn/van333/wxsend/util/str/CharsetKit.java b/src/main/java/cn/van333/wxsend/util/str/CharsetKit.java index 967bd2d..108f177 100644 --- a/src/main/java/cn/van333/wxsend/util/str/CharsetKit.java +++ b/src/main/java/cn/van333/wxsend/util/str/CharsetKit.java @@ -1,7 +1,5 @@ package cn.van333.wxsend.util.str; -import cn.van333.wxsend.util.str.StringUtils; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets;