虎牙支持先导入账号密码再登录

2026-07-05 20:47:16 +08:00
parent 552eb9fa82
commit 2203420146
9 changed files with 493 additions and 73 deletions
@@ -27,7 +27,9 @@ from ..schemas import (
    HuyaConfigUpdate,
    HuyaCookieImport,
    HuyaGoodsOut,
+    HuyaPasswordAccountImport,
    HuyaPasswordLoginRequest,
+    HuyaPasswordLoginSelectedRequest,
    HuyaRechargeGoodsOut,
    HuyaTaskBatchRequest,
    HuyaTaskOut,
@@ -40,6 +42,8 @@ from ..services.huya_service import (
    ensure_huya_config,
    huya_config_value,
    import_huya_cookies,
+    import_huya_password_accounts,
+    save_huya_login_cookie_to_account,
    upsert_huya_cookie,
 )
 from ..services.huya_runner import HuyaBatchRunner, huya_batch_registry
@@ -93,6 +97,7 @@ def _account_out(account: HuyaAccount, include_cookie: bool = True) -> HuyaAccou
        uid=account.uid or "",
        yyuid=account.yyuid or "",
        username=account.username or "",
+        has_password=bool(account.account_password),
        nickname=account.nickname or "",
        cookie=cookie if include_cookie else "",
        cookie_preview=_fmt_cookie_preview(cookie) if include_cookie else "***",
@@ -200,6 +205,23 @@ def import_cookies(
    }


+@router.post("/accounts/import-passwords")
+def import_password_accounts(
+    req: HuyaPasswordAccountImport,
+    db: Session = Depends(get_db),
+    current: User = Depends(get_current_user),
+):
+    """导入虎牙账号密码，只入库不立即登录。"""
+    _require_huya_perm(current, "huya:import")
+    count, skipped = import_huya_password_accounts(db, req.text, req.tag)
+    return {
+        "message": f"导入/更新 {count} 个虎牙账号，跳过 {skipped} 条",
+        "success": True,
+        "count": count,
+        "skipped": skipped,
+    }
+
+
@router.post("/accounts/password-login")
 def password_login_account(
    req: HuyaPasswordLoginRequest,
@@ -236,6 +258,136 @@ def password_login_account(
    }


+@router.post("/accounts/password-login/selected")
+def password_login_selected_accounts(
+    req: HuyaPasswordLoginSelectedRequest,
+    db: Session = Depends(get_db),
+    current: User = Depends(get_current_user),
+):
+    """对已导入的虎牙账号执行密码登录。"""
+    _require_huya_perm(current, "huya:import")
+    if not req.account_ids:
+        raise HTTPException(status_code=400, detail="请选择虎牙账号")
+
+    accounts = (
+        _visible_huya_accounts_query(db, current)
+        .filter(HuyaAccount.id.in_(req.account_ids))
+        .all()
+    )
+    account_map = {account.id: account for account in accounts}
+    results = []
+    success_count = 0
+    failed_count = 0
+    include_cookie = _can_view_huya_cookie(current)
+
+    for account_id in req.account_ids:
+        account = account_map.get(account_id)
+        if account is None:
+            failed_count += 1
+            results.append({
+                "line": account_id,
+                "username": "",
+                "success": False,
+                "message": "账号不存在或无权登录",
+            })
+            continue
+
+        username = (account.username or "").strip()
+        password = (account.account_password or "").strip()
+        if not username or not password:
+            failed_count += 1
+            results.append({
+                "line": account.id,
+                "username": username,
+                "success": False,
+                "message": "该账号未导入密码",
+                "account": _account_out(account, include_cookie=include_cookie),
+            })
+            continue
+
+        try:
+            result = login_huya_password(
+                username=username,
+                password=password,
+                cookie=account.cookie or None,
+            )
+            if not result.success or not result.cookie:
+                account.status = "login_failed"
+                account.updated_at = datetime.now(timezone.utc)
+                db.commit()
+                failed_count += 1
+                results.append({
+                    "line": account.id,
+                    "username": username,
+                    "success": False,
+                    "message": result.message or "虎牙密码登录失败",
+                    "account": _account_out(account, include_cookie=include_cookie),
+                    "sdid": result.sdid,
+                })
+                continue
+
+            saved = save_huya_login_cookie_to_account(
+                db,
+                account,
+                result.cookie,
+                tag=account.tag or "",
+                username_hint=username,
+            )
+            success_count += 1
+            results.append({
+                "line": account.id,
+                "username": username,
+                "success": True,
+                "message": "登录成功，Cookie 已保存",
+                "account": _account_out(saved, include_cookie=include_cookie),
+                "sdid": result.sdid,
+            })
+        except HuyaCredentialError as exc:
+            account.status = "login_failed"
+            account.updated_at = datetime.now(timezone.utc)
+            db.commit()
+            failed_count += 1
+            results.append({
+                "line": account.id,
+                "username": username,
+                "success": False,
+                "message": str(exc),
+                "account": _account_out(account, include_cookie=include_cookie),
+            })
+        except (HuyaLoginError, ValueError) as exc:
+            account.status = "login_failed"
+            account.updated_at = datetime.now(timezone.utc)
+            db.commit()
+            failed_count += 1
+            results.append({
+                "line": account.id,
+                "username": username,
+                "success": False,
+                "message": str(exc),
+                "account": _account_out(account, include_cookie=include_cookie),
+            })
+        except Exception as exc:
+            account.status = "login_failed"
+            account.updated_at = datetime.now(timezone.utc)
+            db.commit()
+            failed_count += 1
+            results.append({
+                "line": account.id,
+                "username": username,
+                "success": False,
+                "message": f"虎牙密码登录失败: {exc}",
+                "account": _account_out(account, include_cookie=include_cookie),
+            })
+
+    return {
+        "message": f"登录完成：成功 {success_count} 条，失败 {failed_count} 条",
+        "success": True,
+        "count": success_count,
+        "failed": failed_count,
+        "results": results,
+    }
+
+
@router.delete("/accounts/batch")
 def delete_accounts_batch(
    account_ids: str = Query(..., description="逗号分隔的虎牙账号ID"),