github/claude-relay-service
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/claude-relay-service.git synced 2026-01-23 17:44:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'f3n9/codex/fix-comments-in-unifiedopenaischeduler.js' into um-5

Browse Source
This commit is contained in:
Feng Yue
2025-09-02 10:55:57 +08:00
parent e00872f9db 9f3fff1f27
commit 85196911ce
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/unifiedOpenAIScheduler.js
View File

@@ -34,7 +34,11 @@ class UnifiedOpenAIScheduler {
// 普通专属账户 // 普通专属账户
const boundAccount = await openaiAccountService.getAccount(apiKeyData.openaiAccountId) const boundAccount = await openaiAccountService.getAccount(apiKeyData.openaiAccountId)
if (boundAccount && boundAccount.isActive === 'true' && boundAccount.status !== 'error') { if (
boundAccount &&
(boundAccount.isActive === true || boundAccount.isActive === 'true') &&
boundAccount.status !== 'error'
) {
// 检查是否被限流 // 检查是否被限流
const isRateLimited = await this.isAccountRateLimited(boundAccount.id) const isRateLimited = await this.isAccountRateLimited(boundAccount.id)
if (isRateLimited) { if (isRateLimited) {
@@ -165,7 +169,7 @@ class UnifiedOpenAIScheduler {
const openaiAccounts = await openaiAccountService.getAllAccounts() const openaiAccounts = await openaiAccountService.getAllAccounts()
for (const account of openaiAccounts) { for (const account of openaiAccounts) {
if ( if (
account.isActive === 'true' && account.isActive &&
account.status !== 'error' && account.status !== 'error' &&
(account.accountType === 'shared' || !account.accountType) && // 兼容旧数据 (account.accountType === 'shared' || !account.accountType) && // 兼容旧数据
this._isSchedulable(account.schedulable) this._isSchedulable(account.schedulable)
@@ -233,7 +237,7 @@ class UnifiedOpenAIScheduler {
try { try {
if (accountType === 'openai') { if (accountType === 'openai') {
const account = await openaiAccountService.getAccount(accountId) const account = await openaiAccountService.getAccount(accountId)
if (!account || account.isActive !== 'true' || account.status === 'error') { if (!account || !account.isActive || account.status === 'error') {
return false return false
} }
// 检查是否可调度 // 检查是否可调度
@@ -395,7 +399,7 @@ class UnifiedOpenAIScheduler {
const account = await openaiAccountService.getAccount(memberId) const account = await openaiAccountService.getAccount(memberId)
if ( if (
account && account &&
account.isActive === 'true' && account.isActive &&
account.status !== 'error' && account.status !== 'error' &&
this._isSchedulable(account.schedulable) this._isSchedulable(account.schedulable)
) { ) {