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

feat: restructure token usage routes and enhance token retrieval logic

Browse Source
This commit is contained in:
CaIon
2025-08-23 15:45:43 +08:00
parent df1ec4832c
commit 93ce48aca8
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controller/token.go
View File

@@ -103,7 +103,7 @@ func GetTokenUsage(c *gin.Context) {
} }
tokenKey := parts[1] tokenKey := parts[1]
token, err := model.GetTokenByKey(tokenKey, true) token, err := model.GetTokenByKey(strings.TrimPrefix(tokenKey, "sk-"), false)
if err != nil { if err != nil {
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"success": false, "success": false,
@@ -122,12 +122,13 @@ func GetTokenUsage(c *gin.Context) {
"message": "ok", "message": "ok",
"data": gin.H{ "data": gin.H{
"object": "token_usage", "object": "token_usage",
"id": token.Id,
"name": token.Name, "name": token.Name,
"total_granted": token.RemainQuota + token.UsedQuota, "total_granted": token.RemainQuota + token.UsedQuota,
"total_used": token.UsedQuota, "total_used": token.UsedQuota,
"total_available": token.RemainQuota, "total_available": token.RemainQuota,
"unlimited_quota": token.UnlimitedQuota, "unlimited_quota": token.UnlimitedQuota,
"model_limits": token.GetModelLimitsMap(),
"model_limits_enabled": token.ModelLimitsEnabled,
"expires_at": expiredAt, "expires_at": expiredAt,
}, },
}) })

12
router/api-router.go
View File

@@ -139,13 +139,23 @@ func SetApiRouter(router *gin.Engine) {
{ {
tokenRoute.GET("/", controller.GetAllTokens) tokenRoute.GET("/", controller.GetAllTokens)
tokenRoute.GET("/search", controller.SearchTokens) tokenRoute.GET("/search", controller.SearchTokens)
tokenRoute.GET("/usage", controller.GetTokenUsage)
tokenRoute.GET("/:id", controller.GetToken) tokenRoute.GET("/:id", controller.GetToken)
tokenRoute.POST("/", controller.AddToken) tokenRoute.POST("/", controller.AddToken)
tokenRoute.PUT("/", controller.UpdateToken) tokenRoute.PUT("/", controller.UpdateToken)
tokenRoute.DELETE("/:id", controller.DeleteToken) tokenRoute.DELETE("/:id", controller.DeleteToken)
tokenRoute.POST("/batch", controller.DeleteTokenBatch) tokenRoute.POST("/batch", controller.DeleteTokenBatch)
} }
usageRoute := apiRouter.Group("/usage")
usageRoute.Use(middleware.CriticalRateLimit())
{
tokenUsageRoute := usageRoute.Group("/token")
tokenUsageRoute.Use(middleware.TokenAuth())
{
tokenUsageRoute.GET("/", controller.GetTokenUsage)
}
}
redemptionRoute := apiRouter.Group("/redemption") redemptionRoute := apiRouter.Group("/redemption")
redemptionRoute.Use(middleware.AdminAuth()) redemptionRoute.Use(middleware.AdminAuth())
{ {