-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
23 changed files
with
2,291 additions
and
22 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package org.rx.redis; | ||
|
|
||
| public interface RateLimiterAdapter { | ||
| boolean tryAcquire(); | ||
| } |
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,55 @@ | ||
| package org.rx.redis; | ||
|
|
||
| import lombok.NonNull; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.redisson.api.RRateLimiter; | ||
| import org.redisson.api.RateIntervalUnit; | ||
| import org.redisson.api.RateLimiterConfig; | ||
| import org.redisson.api.RateType; | ||
| import org.rx.core.Constants; | ||
|
|
||
| @Slf4j | ||
| public class RedisRateLimiter implements RateLimiterAdapter { | ||
| final RedisCache<?, ?> rCache; | ||
| final RRateLimiter limiter; | ||
|
|
||
| public int getPermitsPerSecond() { | ||
| return limiter.getConfig().getRate().intValue(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean tryAcquire() { | ||
| return limiter.tryAcquire(); | ||
| } | ||
|
|
||
| public RedisRateLimiter(@NonNull RedisCache<?, ?> rCache, String acquireKey) { | ||
| this(rCache, acquireKey, Constants.CPU_THREADS); | ||
| } | ||
|
|
||
| public RedisRateLimiter(@NonNull RedisCache<?, ?> rCache, String acquireKey, int permitsPerSecond) { | ||
| this.rCache = rCache; | ||
| limiter = createLimiter(acquireKey, permitsPerSecond, 1); | ||
| } | ||
|
|
||
| RRateLimiter createLimiter(String key, long rate, long rateInterval) { | ||
| RRateLimiter limiter = rCache.getClient().getRateLimiter(key); | ||
| if (limiter.isExists()) { | ||
| RateLimiterConfig config = limiter.getConfig(); | ||
| if (config.getRate() == rate && config.getRateInterval() == RateIntervalUnit.SECONDS.toMillis(rateInterval)) { | ||
| return limiter; | ||
| } | ||
| } | ||
|
|
||
| log.info("trySetRate start, {} {}", key, rate); | ||
| int retry = 4; | ||
| // 循环直到重新配置成功 | ||
| while (--retry > 0 && !limiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.SECONDS)) { | ||
| limiter.delete(); | ||
| limiter = rCache.getClient().getRateLimiter(key); | ||
| } | ||
| if (retry == 0) { | ||
| log.warn("trySetRate fail, {} {}", key, rate); | ||
| } | ||
| return limiter; | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -1,30 +1,53 @@ | ||
| package org.rx.spring; | ||
|
|
||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.rx.core.Cache; | ||
| import org.rx.core.IOC; | ||
| import org.rx.core.Strings; | ||
| import org.rx.core.*; | ||
| import org.rx.exception.InvalidException; | ||
| import org.rx.redis.RateLimiterAdapter; | ||
| import org.rx.redis.RedisCache; | ||
| import org.rx.redis.RedisRateLimiter; | ||
| import org.rx.redis.RedisUtil; | ||
| import org.rx.util.Servlets; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import static org.rx.core.Extends.ifNull; | ||
|
|
||
| @Configuration | ||
| @Slf4j | ||
| public class BeanRegister { | ||
| public static final String REDIS_PROP_NAME = "app.redisUrl"; | ||
|
|
||
| @Bean | ||
| @ConditionalOnProperty(name = REDIS_PROP_NAME) | ||
| public <TK, TV> Cache<TK, TV> redisCache(MiddlewareConfig redisConfig) { | ||
| if (Strings.isEmpty(redisConfig.getRedisUrl())) { | ||
| public <TK, TV> RedisCache<TK, TV> redisCache(MiddlewareConfig conf) { | ||
| if (Strings.isEmpty(conf.getRedisUrl())) { | ||
| throw new InvalidException("app.redisUrl is null"); | ||
| } | ||
|
|
||
| Cache<TK, TV> cache = RedisUtil.wrapCache(redisConfig.getRedisUrl()); | ||
| IOC.register(Cache.class, cache); | ||
| RedisCache<TK, TV> cache = new RedisCache<>(conf.getRedisUrl()); | ||
| IOC.register(Cache.class, RedisUtil.wrapCache(cache)); | ||
| log.info("register RedisCache ok"); | ||
| return cache; | ||
| } | ||
|
|
||
| @Bean | ||
| @ConditionalOnProperty(name = REDIS_PROP_NAME) | ||
| public RateLimiterAdapter httpRateLimiterAdapter(RedisCache<?, ?> rCache, MiddlewareConfig conf) { | ||
| String[] acquireWhiteList = conf.getLimiterWhiteList(); | ||
| return () -> { | ||
| String clientIp = ifNull(Servlets.requestIp(), "ALL"); | ||
|
|
||
| if (!Arrays.isEmpty(acquireWhiteList) | ||
| && Linq.from(acquireWhiteList).any(p -> Strings.startsWith(clientIp, p))) { | ||
| return true; | ||
| } | ||
|
|
||
| String rk = "RateLimiter:" + clientIp; | ||
| RateLimiterAdapter adapter = IOC.<String, RateLimiterAdapter>weakMap(false) | ||
| .computeIfAbsent(rk, k -> RedisUtil.wrapRateLimiter(new RedisRateLimiter(rCache, k, conf.getLimiterPermits()))); | ||
| return adapter.tryAcquire(); | ||
| }; | ||
| } | ||
| } |
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
Oops, something went wrong.