From 74985fa877b4a85decdf31044b2435cf688af395 Mon Sep 17 00:00:00 2001 From: CaIon Date: Tue, 26 May 2026 21:17:25 +0800 Subject: [PATCH] fix: keep token log filters exact --- model/log.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/model/log.go b/model/log.go index f467bd9f..3db19f7e 100644 --- a/model/log.go +++ b/model/log.go @@ -329,8 +329,8 @@ func GetAllLogs(logType int, startTimestamp int64, endTimestamp int64, modelName if tx, err = applyExplicitLogTextFilter(tx, "logs.username", username); err != nil { return nil, 0, err } - if tx, err = applyExplicitLogTextFilter(tx, "logs.token_name", tokenName); err != nil { - return nil, 0, err + if tokenName != "" { + tx = tx.Where("logs.token_name = ?", tokenName) } if requestId != "" { tx = tx.Where("logs.request_id = ?", requestId) @@ -415,8 +415,8 @@ func GetUserLogs(userId int, logType int, startTimestamp int64, endTimestamp int if tx, err = applyExplicitLogTextFilter(tx, "logs.model_name", modelName); err != nil { return nil, 0, err } - if tx, err = applyExplicitLogTextFilter(tx, "logs.token_name", tokenName); err != nil { - return nil, 0, err + if tokenName != "" { + tx = tx.Where("logs.token_name = ?", tokenName) } if requestId != "" { tx = tx.Where("logs.request_id = ?", requestId) @@ -466,11 +466,9 @@ func SumUsedQuota(logType int, startTimestamp int64, endTimestamp int64, modelNa if rpmTpmQuery, err = applyExplicitLogTextFilter(rpmTpmQuery, "username", username); err != nil { return stat, err } - if tx, err = applyExplicitLogTextFilter(tx, "token_name", tokenName); err != nil { - return stat, err - } - if rpmTpmQuery, err = applyExplicitLogTextFilter(rpmTpmQuery, "token_name", tokenName); err != nil { - return stat, err + if tokenName != "" { + tx = tx.Where("token_name = ?", tokenName) + rpmTpmQuery = rpmTpmQuery.Where("token_name = ?", tokenName) } if startTimestamp != 0 { tx = tx.Where("created_at >= ?", startTimestamp)