oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1026 from tbphp/tbphp_fix_redis_limit

Browse Source 
fix: Redis limit ignoring max eq 0
This commit is contained in:
IcedTangerine
2025-05-06 22:36:13 +08:00
committed by GitHub
parent 27e3aa828c b7fd1e4a20
commit dc9e3b4139
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
middleware/model-rate-limit.go
View File

@@ -93,6 +93,7 @@ func redisRateLimitHandler(duration int64, totalMaxCount, successMaxCount int) g
} }
//2.检查总请求数限制并记录总请求（当totalMaxCount为0时会自动跳过，使用令牌桶限流器 //2.检查总请求数限制并记录总请求（当totalMaxCount为0时会自动跳过，使用令牌桶限流器
if totalMaxCount > 0 {
totalKey := fmt.Sprintf("rateLimit:%s", userId) totalKey := fmt.Sprintf("rateLimit:%s", userId)
// 初始化 // 初始化
tb := limiter.New(ctx, rdb) tb := limiter.New(ctx, rdb)
@@ -113,6 +114,7 @@ func redisRateLimitHandler(duration int64, totalMaxCount, successMaxCount int) g
if !allowed { if !allowed {
abortWithOpenAiMessage(c, http.StatusTooManyRequests, fmt.Sprintf("您已达到总请求数限制：%d分钟内最多请求%d次，包括失败次数，请检查您的请求是否正确", setting.ModelRequestRateLimitDurationMinutes, totalMaxCount)) abortWithOpenAiMessage(c, http.StatusTooManyRequests, fmt.Sprintf("您已达到总请求数限制：%d分钟内最多请求%d次，包括失败次数，请检查您的请求是否正确", setting.ModelRequestRateLimitDurationMinutes, totalMaxCount))
} }
}
// 4. 处理请求 // 4. 处理请求
c.Next() c.Next()