S1 加好了列,本提交把**读与写一起切**过去。这是设计里「同一份数据的读与写必须
在同一个提交里切」的要求:先切读或先切写都会出现「写账号、读记录」的中间态,
跑起来不报错,只是默默用错数据。
## 核心改动
**判定「谁有 CK」不再借道登录记录**
- `cookie_holding_filter()` / `cookie_operable_filter()` / `cookie_holding_account_ids_query()`
/ `visible_douyu_task_accounts()` 全部改为作用于 `Account`;
- `cookie_operable_filter()` 的「在途排除」仍查 `login_tasks`(那是**某次尝试**的属性),
用 `NOT EXISTS` 子查询 + 迁移 0042 新增的 `(account_id, attempt_status)` 索引;
- 删除死代码 `latest_cookie_login_task()`;`latest_cookie()` 改为直接读账号。
**CK 写入**
- `_write_login_success()` 写 `Account.cookie / cookie_updated_at / cookie_source`;
- `_mark_attempt_failed()` 改看**账号**有没有 CK(决定是否沿用旧的失败语义);
- 检测模式的 `task.cookie = ""` **不再清空账号的 CK**(见下「行为变更」)。
**自动化作业按账号调度**
- `ck_health`:`_select_tasks` → `_select_accounts`,`db.query(Account)`;新增
`count_remaining()`(刻意不带 LIMIT,否则积压数恒等于批次上限);
- `ck_relogin`:同样按账号选行;结算改为「账号 + 本轮尝试记录」,
退避进度写账号;`settle_fresh_results(batch_id)` 按 `attempt_batch_id` 配对,
`run_ck_relogin` 把 **account_ids** 交给 runner;
- 顺带让**没有任何登录历史的账号**也能被巡检/重登(以前它们永远进不了队列)。
**登录批次**
- `LoginBatchRunner` 去掉 `relogin_task_ids`,重登与登录统一走 `account_ids`;
- 批次行复用逻辑重写:只保证「同一账号不并发两行」,不再关心「哪一行持有 CK」。
失败行复用同时看 `attempt_status`(账号有 CK 时 `_mark_attempt_failed` 刻意不动
`status`,只看 status 会永远命不中 → 每次失败刷一行)。
**删除护栏语义变更(用户可感知)**
- 去掉「持有 CK 的记录不可删」——CK 在账号上,删历史不再影响登录态,历史终于可清理;
- **保留**「在途尝试不可删」(批次线程正拿着那条记录)。
## 行为变更(需评审)
1. **账号检测不再清空 CK**。旧代码在 check 模式写 `task.cookie = ""`,而那时记录的
cookie 就是账号唯一凭证 —— 一次「批量检测」会把账号登录态删掉。解耦后
「检测账号凭据」与「CK 是否有效」本就是两件事(后者归 `ck_health` 判),
继续清空等于凭空制造不可逆的数据丢失(重登当前成功率极低)。
2. **Cookie 页的记录单位从「登录记录」变成「账号」**,所有接口的 id 入参/出参
变成 `account_id`;`DELETE /cookies/{id}` 清的是该账号的 CK,**必写审计**。
3. 重复检测从「同一账号多行持 CK」改为「**同一个 CK 出现在多个账号上**」——
后者才是真风险(两个账号共用一个登录态)。用 sha256 指纹分组:
CK 是 AES-GCM + 随机 nonce 加密,**同一明文每次密文都不同**,比密文永远比不出重复。
## 修掉一个真实并发缺陷
`_write_login_success` 原先被传入 `self.db`(runner 主会话),而它是在**工作线程**里
用 `worker_db` 执行的。`emit()` 会往 `account_events` 插一行,其 `account_id` 外键对
`accounts` 那一行加**共享锁**;这把锁加在另一个会话上,紧接着本会话的
`UPDATE accounts SET cookie=...` 就被自己人挡住 —— 实测 **50 秒后
`Lock wait timeout exceeded`,登录明明成功却写不回 CK**(改造前 UPDATE 打在
`login_tasks` 上所以没撞上)。改为传 `worker_db`:事件本就该和状态变更同事务提交,
顺带修掉跨线程共用一个 Session 的隐患。
## 验证
- 全量 pytest **368 passed / 6 skipped**;迁移链 3 passed;
- 前端 `tsc -b && vite build` 通过;
- `ruff check` / `ruff format --check` 全绿(顺带修掉 main 上遗留的 F821);
- 新增/改写的关键回归:**删掉全部登录历史后账号的 CK 与健康状态仍在**、
**无登录历史的账号也能进巡检队列**、结算不碰 CK、删除护栏改为在途语义。
仍未做(设计里排期的后续阶段):`account_lifecycle` 状态收口(S3)、事件发射点补齐(S4)、
业务事实直发事件(S5)、账号页重构(S6)。注意 `status` 目前只有模型默认值与迁移回填,
所以 `disabled/archived` 还没有任何写入方——S3 落地时要把自动化选行的状态过滤一起补上。
285 lines
11 KiB
Python
285 lines
11 KiB
Python
"""斗鱼鱼翅充值渠道分流测试。"""
|
|
|
|
import asyncio
|
|
import os
|
|
from unittest.mock import ANY, AsyncMock, Mock, patch
|
|
|
|
from core.douyu import FishFinRechargeClient, FishFinRechargeConfig
|
|
from tests.support.db import get_test_engine, make_test_session
|
|
from web.backend.models import Account, AuditLog, DouyuTask, User
|
|
from web.backend.routers.douyu import get_recharge_channel, supplier_recharge_callback
|
|
from web.backend.services.audit_service import record_audit
|
|
from web.backend.services.douyu_runner import DouyuBatchRunner
|
|
from web.backend.services.douyu_service import ensure_douyu_config
|
|
|
|
|
|
class TestDouyuGoldRechargeChannel:
|
|
def setup_method(self):
|
|
self.engine = get_test_engine()
|
|
self.session = make_test_session(self.engine)
|
|
user = User(username="operator", password_hash="hash", role="super_admin")
|
|
self.session.add(user)
|
|
self.session.commit()
|
|
self.account = Account(
|
|
username="douyu-user",
|
|
password="password",
|
|
email="mail@example.com",
|
|
email_password="mail-password",
|
|
uid="10001",
|
|
nickname="罗炅729",
|
|
)
|
|
self.session.add(self.account)
|
|
self.session.commit()
|
|
self.task = DouyuTask(
|
|
batch_id="batch",
|
|
account_id=self.account.id,
|
|
task_type="create_gold_qr",
|
|
handbook_scope="elite",
|
|
status="running",
|
|
created_by=user.id,
|
|
)
|
|
self.session.add(self.task)
|
|
self.session.commit()
|
|
self.runner = DouyuBatchRunner(self.session, "batch", "create_gold_qr")
|
|
os.environ["FISH_FIN_RECHARGE_BASE_URL"] = "https://supplier.example"
|
|
os.environ["FISH_FIN_RECHARGE_APP_ID"] = "test-app"
|
|
os.environ["FISH_FIN_RECHARGE_APP_SECRET"] = "test-secret"
|
|
|
|
def teardown_method(self):
|
|
self.session.close()
|
|
|
|
@patch("web.backend.services.douyu_runner_gold.FishFinRechargeClient")
|
|
def test_supplier_channel_creates_order_using_nickname_and_finishes_on_success(
|
|
self, client_class
|
|
):
|
|
supplier = Mock()
|
|
supplier.create_order.return_value = {
|
|
"code": 200,
|
|
"result": {"order_status": 2, "order_id": "supplier-001"},
|
|
"sign": "not-stored",
|
|
}
|
|
client_class.return_value = supplier
|
|
config = {
|
|
"gold_recharge_channel": "supplier_api",
|
|
"gold_api_product_id": "gold-product",
|
|
"gold_api_account_template_name": "斗鱼账号",
|
|
}
|
|
|
|
self.task.result = {"payload": {"amount": 10}}
|
|
self.session.commit()
|
|
self.runner._execute_create_gold_qr(
|
|
self.session,
|
|
self.task,
|
|
self.account,
|
|
"acf_uid=10001",
|
|
config,
|
|
)
|
|
|
|
expected_order_id = self.runner._supplier_out_order_id(self.task)
|
|
supplier.create_order.assert_called_once_with(
|
|
buy_num=10,
|
|
pay_amount=ANY,
|
|
out_order_id=expected_order_id,
|
|
product_id="gold-product",
|
|
recharge_arg=[{"templateName": "斗鱼账号", "templateVal": "罗炅729"}],
|
|
order_type=0,
|
|
notify_url=ANY,
|
|
)
|
|
assert str(supplier.create_order.call_args.kwargs["pay_amount"]) == "10"
|
|
self.session.refresh(self.task)
|
|
assert self.task.status == "success"
|
|
task_result = self.task.result
|
|
assert isinstance(task_result, dict)
|
|
assert task_result["recharge_channel"] == "supplier_api"
|
|
assert task_result["supplier_order_status"] == 2
|
|
assert task_result["buy_num"] == 10
|
|
assert task_result["out_order_id"] == expected_order_id
|
|
assert task_result["recharge_account"] == "罗炅729"
|
|
assert task_result["douyu_uid"] == "10001"
|
|
assert task_result["order_id"] == "supplier-001"
|
|
assert task_result["pay_amount"] == "10"
|
|
assert "pay_url" not in task_result
|
|
assert "sign" not in task_result["supplier_order"]
|
|
|
|
@patch("web.backend.services.douyu_runner_gold.FishFinRechargeClient")
|
|
def test_supplier_channel_rejects_account_without_nickname(self, client_class):
|
|
self.account.nickname = ""
|
|
self.session.commit()
|
|
config = {
|
|
"gold_recharge_channel": "supplier_api",
|
|
"gold_api_product_id": "gold-product",
|
|
"gold_api_account_template_name": "斗鱼昵称",
|
|
}
|
|
|
|
self.runner._execute_create_gold_qr(
|
|
self.session,
|
|
self.task,
|
|
self.account,
|
|
"acf_uid=10001",
|
|
config,
|
|
)
|
|
|
|
client_class.assert_not_called()
|
|
self.session.refresh(self.task)
|
|
assert self.task.status == "failed"
|
|
assert "斗鱼昵称" in self.task.message
|
|
|
|
def test_supplier_out_order_id_reuses_persisted_value(self):
|
|
self.task.supplier_out_order_id = "DYGFHISTORICAL-001"
|
|
assert self.runner._supplier_out_order_id(self.task) == "DYGFHISTORICAL-001"
|
|
|
|
def test_recharge_channel_can_be_read_without_full_config(self):
|
|
config = ensure_douyu_config(self.session)
|
|
config.gold_recharge_channel = "supplier_api"
|
|
self.session.commit()
|
|
|
|
channel = get_recharge_channel(
|
|
db=self.session,
|
|
current=self.session.get(User, self.task.created_by),
|
|
)
|
|
|
|
assert channel == {"gold_recharge_channel": "supplier_api"}
|
|
|
|
def test_recharge_audit_detail_includes_safe_account_identity(self):
|
|
record_audit(
|
|
self.session,
|
|
self.session.get(User, self.task.created_by),
|
|
action="recharge:douyu:create",
|
|
detail={
|
|
"recharge_accounts": [
|
|
{
|
|
"username": self.account.username,
|
|
"douyu_uid": self.account.uid,
|
|
"douyu_nickname": self.account.nickname,
|
|
}
|
|
],
|
|
},
|
|
)
|
|
self.session.commit()
|
|
|
|
audit = self.session.query(AuditLog).one()
|
|
assert "douyu_uid" in audit.detail
|
|
assert "10001" in audit.detail
|
|
assert "password" not in audit.detail
|
|
|
|
@patch("web.backend.services.douyu_runner_gold.FishFinRechargeClient")
|
|
def test_supplier_channel_marks_non_200_create_response_as_failed(
|
|
self, client_class
|
|
):
|
|
supplier = Mock()
|
|
supplier.create_order.return_value = {"code": 400, "msg": "商品已下架"}
|
|
client_class.return_value = supplier
|
|
config = {
|
|
"gold_recharge_channel": "supplier_api",
|
|
"gold_api_product_id": "gold-product",
|
|
"gold_api_account_template_name": "斗鱼UID",
|
|
}
|
|
|
|
self.runner._execute_create_gold_qr(
|
|
self.session,
|
|
self.task,
|
|
self.account,
|
|
"acf_uid=10001",
|
|
config,
|
|
)
|
|
|
|
self.session.refresh(self.task)
|
|
assert self.task.status == "failed"
|
|
assert self.task.message == "商品已下架"
|
|
|
|
@patch("web.backend.services.douyu_runner.check_douyu_cookie")
|
|
@patch("web.backend.services.douyu_runner.SessionLocal")
|
|
def test_invalid_cookie_skips_activity_and_marks_relogin_required(
|
|
self, session_local, check_cookie
|
|
):
|
|
# CK 挂在账号上(2026-10-04 CK 解耦)
|
|
self.account.cookie = "acf_uid=10001"
|
|
self.task.status = "planned"
|
|
self.session.commit()
|
|
task_id = self.task.id
|
|
account_id = self.account.id
|
|
session_local.return_value = self.session
|
|
check_cookie.return_value = {
|
|
"valid": False,
|
|
"message": "鱼丸接口: 未登录;等级接口: 未登录",
|
|
"fish_ball": None,
|
|
"nickname": None,
|
|
"level": None,
|
|
"checked_at": None,
|
|
}
|
|
self.runner._execute_create_gold_qr = Mock()
|
|
|
|
self.runner._execute_one(task_id, {}, 1)
|
|
|
|
self.runner._execute_create_gold_qr.assert_not_called()
|
|
verify_session = make_test_session(self.engine)
|
|
try:
|
|
task = verify_session.get(DouyuTask, task_id)
|
|
checked_account = verify_session.get(Account, account_id)
|
|
assert task is not None
|
|
assert checked_account is not None
|
|
assert task.status == "failed"
|
|
assert "Cookie 已失效,请重新登录" in task.message
|
|
# 检测结论写在**账号**上,CK 本体不动
|
|
assert checked_account.ck_check_status == "invalid"
|
|
check_result = checked_account.ck_check_result
|
|
assert isinstance(check_result, dict)
|
|
assert check_result["message"] == "鱼丸接口: 未登录;等级接口: 未登录"
|
|
assert checked_account.cookie == "acf_uid=10001"
|
|
finally:
|
|
verify_session.close()
|
|
|
|
def test_supplier_callback_verifies_signature_and_updates_terminal_task(self):
|
|
self.task.supplier_out_order_id = f"DYGFBATCHT{self.task.id}"
|
|
self.task.result = {
|
|
"recharge_channel": "supplier_api",
|
|
"out_order_id": self.task.supplier_out_order_id,
|
|
}
|
|
self.session.commit()
|
|
client = FishFinRechargeClient(
|
|
FishFinRechargeConfig(
|
|
base_url="https://supplier.example",
|
|
app_id="test-app",
|
|
app_secret="test-secret",
|
|
)
|
|
)
|
|
payload = {
|
|
"app_id": "test-app",
|
|
"timestamp": 1786629000,
|
|
"out_order_id": self.task.supplier_out_order_id,
|
|
"order_id": "supplier-001",
|
|
"order_type": 0,
|
|
"order_status": 2,
|
|
"create_time": "2026/8/13 21:30",
|
|
}
|
|
payload["sign"] = client.sign(payload, "POST")
|
|
request = Mock()
|
|
request.json = AsyncMock(return_value=payload)
|
|
|
|
response = asyncio.run(supplier_recharge_callback(request, self.session))
|
|
|
|
assert response["code"] == 200
|
|
assert response["message"] == "success"
|
|
assert client.verify_response_sign(response, "POST")
|
|
self.session.refresh(self.task)
|
|
assert self.task.status == "success"
|
|
assert self.task.message == "供应商直充成功(异步通知)"
|
|
self.session.refresh(self.account)
|
|
assert self.account.bind_status == "gold_recharged"
|
|
task_result = self.task.result
|
|
assert isinstance(task_result, dict)
|
|
assert task_result["order_id"] == "supplier-001"
|
|
assert task_result["supplier_order_status"] == 2
|
|
audit = (
|
|
self.session.query(AuditLog)
|
|
.filter(AuditLog.action == "recharge:douyu:callback")
|
|
.one()
|
|
)
|
|
assert audit.username == "supplier"
|
|
assert audit.success
|
|
assert "sign" not in audit.detail
|
|
# 同一终态回调可重复投递,不会改写已结束任务。
|
|
asyncio.run(supplier_recharge_callback(request, self.session))
|
|
self.session.refresh(self.task)
|
|
assert self.task.status == "success"
|