From ab02acd008b22b357c740af872e8193c15841e49 Mon Sep 17 00:00:00 2001 From: wt Date: Wed, 13 Aug 2025 15:04:47 +0800 Subject: [PATCH] Prettier format --- src/routes/admin.js | 6 ++++-- src/services/claudeConsoleAccountService.js | 9 +++++++-- src/services/openaiAccountService.js | 5 ++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/routes/admin.js b/src/routes/admin.js index 397c77fe..b4a3025c 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -1548,7 +1548,8 @@ router.post('/claude-console-accounts', authenticateAdmin, async (req, res) => { priority: priority || 50, supportedModels: supportedModels || [], userAgent, - rateLimitDuration: (rateLimitDuration !== undefined && rateLimitDuration !== null) ? rateLimitDuration : 60, + rateLimitDuration: + rateLimitDuration !== undefined && rateLimitDuration !== null ? rateLimitDuration : 60, proxy, accountType: accountType || 'shared' }) @@ -4628,7 +4629,8 @@ router.post('/openai-accounts', authenticateAdmin, async (req, res) => { description: description || '', accountType: accountType || 'shared', priority: priority || 50, - rateLimitDuration: (rateLimitDuration !== undefined && rateLimitDuration !== null) ? rateLimitDuration : 60, + rateLimitDuration: + rateLimitDuration !== undefined && rateLimitDuration !== null ? rateLimitDuration : 60, openaiOauth: openaiOauth || {}, accountInfo: accountInfo || {}, proxy: proxy?.enabled diff --git a/src/services/claudeConsoleAccountService.js b/src/services/claudeConsoleAccountService.js index 67d1a23c..8c43b4b6 100644 --- a/src/services/claudeConsoleAccountService.js +++ b/src/services/claudeConsoleAccountService.js @@ -123,7 +123,9 @@ class ClaudeConsoleAccountService { priority: parseInt(accountData.priority) || 50, supportedModels: JSON.parse(accountData.supportedModels || '[]'), userAgent: accountData.userAgent, - rateLimitDuration: (Number.isNaN(parseInt(accountData.rateLimitDuration)) ? 60 : parseInt(accountData.rateLimitDuration)), + rateLimitDuration: Number.isNaN(parseInt(accountData.rateLimitDuration)) + ? 60 + : parseInt(accountData.rateLimitDuration), isActive: accountData.isActive === 'true', proxy: accountData.proxy ? JSON.parse(accountData.proxy) : null, accountType: accountData.accountType || 'shared', @@ -373,7 +375,10 @@ class ClaudeConsoleAccountService { const minutesSinceRateLimit = (now - rateLimitedAt) / (1000 * 60) // 使用账户配置的限流时间 - const rateLimitDuration = (typeof account.rateLimitDuration === 'number' && !Number.isNaN(account.rateLimitDuration)) ? account.rateLimitDuration : 60 + const rateLimitDuration = + typeof account.rateLimitDuration === 'number' && !Number.isNaN(account.rateLimitDuration) + ? account.rateLimitDuration + : 60 if (minutesSinceRateLimit >= rateLimitDuration) { await this.removeAccountRateLimit(accountId) diff --git a/src/services/openaiAccountService.js b/src/services/openaiAccountService.js index 06a6b919..5e5307ff 100644 --- a/src/services/openaiAccountService.js +++ b/src/services/openaiAccountService.js @@ -146,7 +146,10 @@ async function createAccount(accountData) { accountType: accountData.accountType || 'shared', groupId: accountData.groupId || null, priority: accountData.priority || 50, - rateLimitDuration: (accountData.rateLimitDuration !== undefined && accountData.rateLimitDuration !== null) ? accountData.rateLimitDuration : 60, + rateLimitDuration: + accountData.rateLimitDuration !== undefined && accountData.rateLimitDuration !== null + ? accountData.rateLimitDuration + : 60, // OAuth相关字段（加密存储） idToken: encrypt(oauthData.idToken || ''), accessToken: encrypt(oauthData.accessToken || ''),