From 4e3c826b6cb59a8985915fac3e38bc0ce20f8d05 Mon Sep 17 00:00:00 2001 From: shaw Date: Mon, 4 Aug 2025 10:54:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DAPI=20Keys=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=97=B6=E9=97=B4=E7=AA=97=E5=8F=A3=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9D=A1=E5=92=8CToken=E6=95=B0=E5=80=BC=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复时间窗口限制的请求次数和Token使用量进度条不更新的问题 - 在apiKeyService.getAllApiKeys()中添加获取当前窗口统计数据的逻辑 - 从Redis读取rate_limit:requests和rate_limit:tokens键的值 - 优化Token数值展示，添加K/M单位格式化 - UsageDetailModal组件中5处Token数值改用formatTokenCount - ApiKeysView模型统计中5处Token数值改用formatTokenCount - 统一使用K/M单位简化大数字显示 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- src/services/apiKeyService.js | 14 ++++++++++++++ .../src/components/apikeys/UsageDetailModal.vue | 12 ++++++------ web/admin-spa/src/views/ApiKeysView.vue | 12 ++++++------ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/services/apiKeyService.js b/src/services/apiKeyService.js index 8656c5e9..930fccc8 100644 --- a/src/services/apiKeyService.js +++ b/src/services/apiKeyService.js @@ -192,6 +192,7 @@ class ApiKeyService { async getAllApiKeys() { try { const apiKeys = await redis.getAllApiKeys(); + const client = redis.getClientSafe(); // 为每个key添加使用统计和当前并发数 for (const key of apiKeys) { @@ -207,6 +208,19 @@ class ApiKeyService { key.permissions = key.permissions || 'all'; // 兼容旧数据 key.dailyCostLimit = parseFloat(key.dailyCostLimit || 0); key.dailyCost = await redis.getDailyCost(key.id) || 0; + + // 获取当前时间窗口的请求次数和Token使用量 + if (key.rateLimitWindow > 0) { + const requestCountKey = `rate_limit:requests:${key.id}`; + const tokenCountKey = `rate_limit:tokens:${key.id}`; + + key.currentWindowRequests = parseInt(await client.get(requestCountKey) || '0'); + key.currentWindowTokens = parseInt(await client.get(tokenCountKey) || '0'); + } else { + key.currentWindowRequests = 0; + key.currentWindowTokens = 0; + } + try { key.restrictedModels = key.restrictedModels ? JSON.parse(key.restrictedModels) : []; } catch (e) { diff --git a/web/admin-spa/src/components/apikeys/UsageDetailModal.vue b/web/admin-spa/src/components/apikeys/UsageDetailModal.vue index 749f2550..f9c4b64d 100644 --- a/web/admin-spa/src/components/apikeys/UsageDetailModal.vue +++ b/web/admin-spa/src/components/apikeys/UsageDetailModal.vue @@ -46,10 +46,10 @@
- {{ formatNumber(totalTokens) }} + {{ formatTokenCount(totalTokens) }}
- 今日: {{ formatNumber(dailyTokens) }} + 今日: {{ formatTokenCount(dailyTokens) }}
@@ -99,7 +99,7 @@ 输入 Token - {{ formatNumber(inputTokens) }} + {{ formatTokenCount(inputTokens) }}
@@ -108,7 +108,7 @@ 输出 Token
- {{ formatNumber(outputTokens) }} + {{ formatTokenCount(outputTokens) }}
缓存创建 Token
- {{ formatNumber(cacheCreateTokens) }} + {{ formatTokenCount(cacheCreateTokens) }}
缓存读取 Token
- {{ formatNumber(cacheReadTokens) }} + {{ formatTokenCount(cacheReadTokens) }} diff --git a/web/admin-spa/src/views/ApiKeysView.vue b/web/admin-spa/src/views/ApiKeysView.vue index 97e2accb..217180bd 100644 --- a/web/admin-spa/src/views/ApiKeysView.vue +++ b/web/admin-spa/src/views/ApiKeysView.vue @@ -546,7 +546,7 @@ 总Token: - {{ formatNumber(stat.allTokens) }} + {{ formatTokenCount(stat.allTokens) }}
@@ -561,14 +561,14 @@ 输入: - {{ formatNumber(stat.inputTokens) }} + {{ formatTokenCount(stat.inputTokens) }}
输出: - {{ formatNumber(stat.outputTokens) }} + {{ formatTokenCount(stat.outputTokens) }}
缓存创建: - {{ formatNumber(stat.cacheCreateTokens) }} + {{ formatTokenCount(stat.cacheCreateTokens) }}
缓存读取: - {{ formatNumber(stat.cacheReadTokens) }} + {{ formatTokenCount(stat.cacheReadTokens) }}
@@ -623,7 +623,7 @@ 总请求: {{ apiKeyModelStats[key.id].reduce((sum, stat) => sum + stat.requests, 0) }} - 总Token: {{ formatNumber(apiKeyModelStats[key.id].reduce((sum, stat) => sum + stat.allTokens, 0)) }} + 总Token: {{ formatTokenCount(apiKeyModelStats[key.id].reduce((sum, stat) => sum + stat.allTokens, 0)) }}