fix:修复限流后未自动恢复调度的问题

This commit is contained in:
shaw
2025-09-13 22:24:56 +08:00
parent 4a568f75bb
commit aabf909c61
2 changed files with 19 additions and 7 deletions

View File

@@ -1200,6 +1200,9 @@ class ClaudeAccountService {
accountData.schedulable = 'true'
delete accountData.rateLimitAutoStopped
logger.info(`✅ Auto-resuming scheduling for account ${accountId} after rate limit cleared`)
logger.info(`📊 Account ${accountId} state after recovery: schedulable=${accountData.schedulable}`)
} else {
logger.info(` Account ${accountId} did not need auto-resume: autoStopped=${accountData.rateLimitAutoStopped}, schedulable=${accountData.schedulable}`)
}
await redis.setClaudeAccount(accountId, accountData)
@@ -1220,10 +1223,13 @@ class ClaudeAccountService {
return false
}
// 检查是否有限流状态
if (accountData.rateLimitStatus === 'limited' && accountData.rateLimitedAt) {
const now = new Date()
const now = new Date()
// 检查是否有限流状态(包括字段缺失但有自动停止标记的情况)
if (
(accountData.rateLimitStatus === 'limited' && accountData.rateLimitedAt) ||
(accountData.rateLimitAutoStopped === 'true' && accountData.rateLimitEndAt)
) {
// 优先使用 rateLimitEndAt基于会话窗口
if (accountData.rateLimitEndAt) {
const rateLimitEndAt = new Date(accountData.rateLimitEndAt)
@@ -1235,7 +1241,7 @@ class ClaudeAccountService {
}
return true
} else {
} else if (accountData.rateLimitedAt) {
// 兼容旧数据使用1小时限流
const rateLimitedAt = new Date(accountData.rateLimitedAt)
const hoursSinceRateLimit = (now - rateLimitedAt) / (1000 * 60 * 60)

View File

@@ -180,11 +180,17 @@ class RateLimitCleanupService {
*/
async cleanupClaudeAccounts(result) {
try {
const accounts = await claudeAccountService.getAllAccounts()
// 使用原始数据而不是处理过的数据,避免字段被转换
const redis = require('../models/redis')
const accounts = await redis.getAllClaudeAccounts()
for (const account of accounts) {
// 检查标记为限流的账号
if (account.rateLimitStatus === 'limited' || account.rateLimitedAt) {
// 检查所有可能处于限流状态的账号,包括自动停止的账号
if (
account.rateLimitStatus === 'limited' ||
account.rateLimitedAt ||
account.rateLimitAutoStopped === 'true'
) {
result.checked++
try {