xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-19 08:56:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 完善令牌预扣费逻辑

Browse Source
This commit is contained in:
CaIon 2024-01-11 14:12:38 +08:00
parent 701a28d0da
commit 64e9e9cc20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controller/relay-text.go
View File

@ -52,7 +52,7 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
tokenId := c.GetInt("token_id") tokenId := c.GetInt("token_id")
userId := c.GetInt("id") userId := c.GetInt("id")
group := c.GetString("group") group := c.GetString("group")
tokenQuota := c.GetInt("token_quota") tokenUnlimited := c.GetBool("token_unlimited_quota")
startTime := time.Now() startTime := time.Now()
var textRequest GeneralOpenAIRequest var textRequest GeneralOpenAIRequest
@ -263,8 +263,9 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
} }
if userQuota > 100*preConsumedQuota { if userQuota > 100*preConsumedQuota {
// 用户额度充足，判断令牌额度是否充足 // 用户额度充足，判断令牌额度是否充足
if tokenQuota != -1 { if !tokenUnlimited {
// 非无限令牌，判断令牌额度是否充足 // 非无限令牌，判断令牌额度是否充足
tokenQuota := c.GetInt("token_quota")
if tokenQuota > 100*preConsumedQuota { if tokenQuota > 100*preConsumedQuota {
// 令牌额度充足，信任令牌 // 令牌额度充足，信任令牌
preConsumedQuota = 0 preConsumedQuota = 0

3
middleware/auth.go
View File

@ -115,10 +115,9 @@ func TokenAuth() func(c *gin.Context) {
c.Set("id", token.UserId) c.Set("id", token.UserId)
c.Set("token_id", token.Id) c.Set("token_id", token.Id)
c.Set("token_name", token.Name) c.Set("token_name", token.Name)
c.Set("token_unlimited_quota", token.UnlimitedQuota)
if !token.UnlimitedQuota { if !token.UnlimitedQuota {
c.Set("token_quota", token.RemainQuota) c.Set("token_quota", token.RemainQuota)
} else {
c.Set("token_quota", -1)
} }
if token.ModelLimitsEnabled { if token.ModelLimitsEnabled {
c.Set("token_model_limit_enabled", true) c.Set("token_model_limit_enabled", true)