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

fix: Redis limit ignoring max eq 0

Browse Source
This commit is contained in:
tbphp
2025-05-05 12:55:48 +08:00
parent bae57c05c1
commit b7fd1e4a20
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,25 +93,27 @@ func redisRateLimitHandler(duration int64, totalMaxCount, successMaxCount int) g
} }
//2.检查总请求数限制并记录总请求（当totalMaxCount为0时会自动跳过，使用令牌桶限流器 //2.检查总请求数限制并记录总请求（当totalMaxCount为0时会自动跳过，使用令牌桶限流器
totalKey := fmt.Sprintf("rateLimit:%s", userId) if totalMaxCount > 0 {
// 初始化 totalKey := fmt.Sprintf("rateLimit:%s", userId)
tb := limiter.New(ctx, rdb) // 初始化
allowed, err = tb.Allow( tb := limiter.New(ctx, rdb)
ctx, allowed, err = tb.Allow(
totalKey, ctx,
limiter.WithCapacity(int64(totalMaxCount)*duration), totalKey,
limiter.WithRate(int64(totalMaxCount)), limiter.WithCapacity(int64(totalMaxCount)*duration),
limiter.WithRequested(duration), limiter.WithRate(int64(totalMaxCount)),
) limiter.WithRequested(duration),
)
if err != nil { if err != nil {
fmt.Println("检查总请求数限制失败:", err.Error()) fmt.Println("检查总请求数限制失败:", err.Error())
abortWithOpenAiMessage(c, http.StatusInternalServerError, "rate_limit_check_failed") abortWithOpenAiMessage(c, http.StatusInternalServerError, "rate_limit_check_failed")
return return
} }
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. 处理请求