diff --git a/src/routes/admin.js b/src/routes/admin.js index a57572ec..45746eb5 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -1423,13 +1423,29 @@ router.get('/gemini-accounts', authenticateAdmin, async (req, res) => { try { const accounts = await geminiAccountService.getAllAccounts(); - // 为Gemini账户添加空的使用统计(暂时) - const accountsWithStats = accounts.map(account => ({ - ...account, - usage: { - daily: { tokens: 0, requests: 0, allTokens: 0 }, - total: { tokens: 0, requests: 0, allTokens: 0 }, - averages: { rpm: 0, tpm: 0 } + // 为每个账户添加使用统计信息(与Claude账户相同的逻辑) + const accountsWithStats = await Promise.all(accounts.map(async (account) => { + try { + const usageStats = await redis.getAccountUsageStats(account.id); + return { + ...account, + usage: { + daily: usageStats.daily, + total: usageStats.total, + averages: usageStats.averages + } + }; + } catch (statsError) { + logger.warn(`⚠️ Failed to get usage stats for Gemini account ${account.id}:`, statsError.message); + // 如果获取统计失败,返回空统计 + return { + ...account, + usage: { + daily: { tokens: 0, requests: 0, allTokens: 0 }, + total: { tokens: 0, requests: 0, allTokens: 0 }, + averages: { rpm: 0, tpm: 0 } + } + }; } })); diff --git a/src/routes/geminiRoutes.js b/src/routes/geminiRoutes.js index c92b5a48..eefc48a9 100644 --- a/src/routes/geminiRoutes.js +++ b/src/routes/geminiRoutes.js @@ -66,16 +66,31 @@ router.post('/messages', authenticateApiKey, async (req, res) => { // 生成会话哈希用于粘性会话 const sessionHash = generateSessionHash(req); - // 选择可用的 Gemini 账户 - const account = await geminiAccountService.selectAvailableAccount( - apiKeyData.id, - sessionHash - ); + // 使用统一调度选择可用的 Gemini 账户(传递请求的模型) + let accountId; + try { + const schedulerResult = await unifiedGeminiScheduler.selectAccountForApiKey( + apiKeyData, + sessionHash, + model // 传递请求的模型进行过滤 + ); + accountId = schedulerResult.accountId; + } catch (error) { + logger.error('Failed to select Gemini account:', error); + return res.status(503).json({ + error: { + message: error.message || 'No available Gemini accounts', + type: 'service_unavailable' + } + }); + } + // 获取账户详情 + const account = await geminiAccountService.getAccount(accountId); if (!account) { return res.status(503).json({ error: { - message: 'No available Gemini accounts', + message: 'Selected account not found', type: 'service_unavailable' } });