This commit is contained in:
2026-01-18 01:57:11 +08:00
parent ad120687b3
commit c39a01c4c0
3 changed files with 60 additions and 13 deletions

37
run.py
View File

@@ -392,19 +392,46 @@ def process_accounts(accounts: list, team_name: str) -> list:
# CPA 模式: codex_data 为 None授权成功后直接标记完成
# CRS 模式: 需要 codex_data手动添加到 CRS
if AUTH_PROVIDER in ("cpa", "s2a"):
# CPA/S2A 模式: 授权成功即完成 (后台自动处理账号)
# codex_data 为 None 表示授权成功
if AUTH_PROVIDER == "s2a":
# S2A 模式: 授权成功后验证账号是否入库
from s2a_service import s2a_verify_account_in_pool
update_account_status(_tracker, team_name, email, "authorized")
save_team_tracker(_tracker)
# 验证账号是否成功入库
log.step("正在验证 S2A 账号入库状态...")
progress_update(step="验证入库...")
verified, account_data = s2a_verify_account_in_pool(email)
if verified:
account_id = account_data.get("id", "")
account_name = account_data.get("name", "")
result["status"] = "success"
result["crs_id"] = f"S2A-{account_id}"
update_account_status(_tracker, team_name, email, "completed")
save_team_tracker(_tracker)
log.success(f"✅ S2A 账号入库成功 (ID: {account_id}, 名称: {account_name})")
else:
log.warning("⚠️ S2A 授权成功但入库验证失败")
result["status"] = "partial"
update_account_status(_tracker, team_name, email, "partial")
save_team_tracker(_tracker)
elif AUTH_PROVIDER == "cpa":
# CPA 模式: 授权成功即完成 (后台自动处理账号)
update_account_status(_tracker, team_name, email, "authorized")
save_team_tracker(_tracker)
result["status"] = "success"
result["crs_id"] = f"{AUTH_PROVIDER.upper()}-AUTO" # 标记为自动处理
result["crs_id"] = "CPA-AUTO"
update_account_status(_tracker, team_name, email, "completed")
save_team_tracker(_tracker)
log.success(f"{AUTH_PROVIDER.upper()} 账号处理完成: {email}")
log.success(f"CPA 账号处理完成: {email}")
else:
# CRS 模式: 原有逻辑
if codex_data: