-
-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #290 from Jzow/master
Fix bug in frequent SMS sending
- Loading branch information
Showing
16 changed files
with
252 additions
and
9 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
core/api/src/main/java/com/wansenai/api/RateLimitException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance | ||
| * with the License. A copy of the License is located at | ||
| * | ||
| * http://opensource.wansenai.com/apache2.0/ | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES | ||
| * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions | ||
| * and limitations under the License. | ||
| */ | ||
| package com.wansenai.api; | ||
|
|
||
|
|
||
| public class RateLimitException extends RuntimeException { | ||
| private String errorCode; | ||
| private String errorMessage; | ||
|
|
||
| public RateLimitException(String errorCode, String errorMessage) { | ||
| super(errorMessage); | ||
| this.errorCode = errorCode; | ||
| this.errorMessage = errorMessage; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
core/api/src/main/java/com/wansenai/api/config/RateLimiter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package com.wansenai.api.config; | ||
|
|
||
| import com.wansenai.utils.enums.LimitType; | ||
|
|
||
| import java.lang.annotation.*; | ||
|
|
||
| @Target(ElementType.METHOD) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @Documented | ||
| public @interface RateLimiter { | ||
| /** | ||
| * 限流key | ||
| */ | ||
| String key() default "rate_limit:"; | ||
|
|
||
| /** | ||
| * 限流时间,单位秒 | ||
| */ | ||
| int time() default 60; | ||
|
|
||
| /** | ||
| * 限流次数 | ||
| */ | ||
| int count() default 100; | ||
|
|
||
| /** | ||
| * 限流类型 | ||
| */ | ||
| LimitType limitType() default LimitType.DEFAULT; | ||
| } |
88 changes: 88 additions & 0 deletions
88
core/api/src/main/java/com/wansenai/api/config/RateLimiterAspect.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance | ||
| * with the License. A copy of the License is located at | ||
| * | ||
| * http://opensource.wansenai.com/apache2.0/ | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES | ||
| * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions | ||
| * and limitations under the License. | ||
| */ | ||
| package com.wansenai.api.config; | ||
|
|
||
| import com.wansenai.api.RateLimitException; | ||
| import com.wansenai.utils.IpUtils; | ||
| import com.wansenai.utils.enums.BaseCodeEnum; | ||
| import com.wansenai.utils.enums.LimitType; | ||
| import com.wansenai.utils.redis.RedisUtil; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.aspectj.lang.JoinPoint; | ||
| import org.aspectj.lang.annotation.Aspect; | ||
| import org.aspectj.lang.annotation.Before; | ||
| import org.aspectj.lang.reflect.MethodSignature; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.web.context.request.RequestContextHolder; | ||
| import org.springframework.web.context.request.ServletRequestAttributes; | ||
|
|
||
| import java.lang.reflect.Method; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| @Component | ||
| @Aspect | ||
| @Slf4j | ||
| public class RateLimiterAspect { | ||
|
|
||
| private final RedisUtil redisUtil; | ||
|
|
||
| public RateLimiterAspect(RedisUtil redisUtil) { | ||
| this.redisUtil = redisUtil; | ||
| } | ||
|
|
||
|
|
||
| @Before("@annotation(rateLimiter)") | ||
| public void doBefore(JoinPoint point, RateLimiter rateLimiter) { | ||
| String key = rateLimiter.key(); | ||
| int time = rateLimiter.time(); | ||
| int count = rateLimiter.count(); | ||
|
|
||
| String combineKey = getCombineKey(rateLimiter, point); | ||
| List<String> keys = Collections.singletonList(combineKey); | ||
| try { | ||
| if (redisUtil.get(keys.get(0)) != null) { | ||
| long number = redisUtil.incr(keys.get(0), 1); | ||
| if ((int) number > count) { | ||
| throw new RateLimitException(BaseCodeEnum.FREQUENT_SYSTEM_ACCESS.getCode(), BaseCodeEnum.FREQUENT_SYSTEM_ACCESS.getMsg()); | ||
| } | ||
| log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, (int) number, keys.get(0)); | ||
| } else { | ||
| redisUtil.set(keys.get(0), 1, time); | ||
| } | ||
| } catch (Exception e) { | ||
| throw new RateLimitException(BaseCodeEnum.SYSTEM_BUSY.getCode(), BaseCodeEnum.SYSTEM_BUSY.getMsg()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 获取ip为key | ||
| * @param rateLimiter | ||
| * @param point | ||
| * @return | ||
| */ | ||
| public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) { | ||
| StringBuilder stringBuffer = new StringBuilder(rateLimiter.key()); | ||
| if (rateLimiter.limitType() == LimitType.IP) { | ||
| stringBuffer.append( | ||
| IpUtils.getIpAddr(((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()) | ||
| .getRequest())) | ||
| .append("-"); | ||
| } | ||
| MethodSignature signature = (MethodSignature) point.getSignature(); | ||
| Method method = signature.getMethod(); | ||
| Class<?> targetClass = method.getDeclaringClass(); | ||
| stringBuffer.append(targetClass.getName()).append("-").append(method.getName()); | ||
| return stringBuffer.toString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance | ||
| * with the License. A copy of the License is located at | ||
| * | ||
| * http://opensource.wansenai.com/apache2.0/ | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES | ||
| * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions | ||
| * and limitations under the License. | ||
| */ | ||
| package com.wansenai.utils; | ||
|
|
||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.net.UnknownHostException; | ||
|
|
||
| @Slf4j | ||
| public class IpUtils { | ||
| public static String getIpAddr(HttpServletRequest request) { | ||
| String ipAddress = null; | ||
| try { | ||
| ipAddress = request.getHeader("x-forwarded-for"); | ||
| if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) { | ||
| ipAddress = request.getHeader("Proxy-Client-IP"); | ||
| } | ||
| if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) { | ||
| ipAddress = request.getHeader("WL-Proxy-Client-IP"); | ||
| } | ||
| if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) { | ||
| ipAddress = request.getRemoteAddr(); | ||
| if (ipAddress.equals("127.0.0.1")) { | ||
| // 根据网卡取本机配置的IP | ||
| try { | ||
| ipAddress = InetAddress.getLocalHost().getHostAddress(); | ||
| } catch (UnknownHostException e) { | ||
| log.error("获取IP地址异常:" + e.getMessage()); | ||
| } | ||
| } | ||
| } | ||
| // 通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 | ||
| if (ipAddress != null) { | ||
| if (ipAddress.contains(",")) { | ||
| return ipAddress.split(",")[0]; | ||
| } else { | ||
| return ipAddress; | ||
| } | ||
| } else { | ||
| return ""; | ||
| } | ||
| } catch (Exception e) { | ||
| log.error("获取IP地址异常:" + e.getMessage()); | ||
| return ""; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
core/utils/src/main/java/com/wansenai/utils/enums/LimitType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance | ||
| * with the License. A copy of the License is located at | ||
| * | ||
| * http://opensource.wansenai.com/apache2.0/ | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES | ||
| * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions | ||
| * and limitations under the License. | ||
| */ | ||
| package com.wansenai.utils.enums; | ||
|
|
||
| public enum LimitType { | ||
| /** | ||
| * 默认策略全局限流 | ||
| */ | ||
| DEFAULT, | ||
| /** | ||
| * 根据请求者IP进行限流 | ||
| */ | ||
| IP | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters