fix(auth): 发码防刷改为按成功计数 + 新增每设备每日发码上限 (#136)

- 修复:发码限流原为原子「判+记」,被单号 60s 冷却挡下的重发也占设备额度
  → 正常用户连点重发可能被误锁 1 小时。改为「先判后记、只对成功发码计数」:
  check 判在真发之前(超限直接 429、不真发),record 只在 send_code 成功后调;
  被单号冷却 / 供应商失败抛 429 时直接返回、不计数。
- 新增:同一设备(device_id)+ IP 每天最多 20 次发码上限,与原每小时 5 次两道闸并存,
  均按成功计数,叠一层日封顶挡低频长时间轰炸。
- 基建:ratelimit.py 新增 RateLimitRule + check_rate_limits / record_rate_limits
  (peek/commit 拆分);原子的 enforce_rate_limit 仍保留给登录爆破(失败也计)不变。
- 测试:补 2 个用例(冷却挡下不占额度 / 每日上限)。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: zzhyyyyy <2685922758@qq.com>
Reviewed-on: #136
Co-authored-by: zhuzihao <zhuzihao@wonderable.ai>
Co-committed-by: zhuzihao <zhuzihao@wonderable.ai>

app/admin/repositories/coupon_data.py

@@ -86,12 +86,7 @@ def _success_rates(rows: list) -> dict:
     }
 
 
-def _session_to_row(
-    r,
-    phone: str | None = None,
-    nickname: str | None = None,
-    ad_revenue_yuan: float | None = None,
-) -> dict:
+def _session_to_row(r, phone: str | None = None, nickname: str | None = None, ad_revenue_yuan: float = 0.0) -> dict:
     """CouponSession ORM → 明细行 dict(主表「领券数据」与「用户全部领券」抽屉共用)。"""
     return {
         "id": r.id,
@@ -257,7 +252,7 @@ def coupon_data_report(
     items = []
     for r in page:
         phone, nickname = user_map.get(r.user_id, (None, None)) if r.user_id is not None else (None, None)
-        items.append(_session_to_row(r, phone, nickname, ad_revenue_yuan=rev_map.get(r.trace_id)))
+        items.append(_session_to_row(r, phone, nickname, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)))
 
     return {
         "summary": summary,
@@ -281,7 +276,7 @@ def coupon_user_records(db: Session, *, user_id: int, limit: int = 100) -> dict:
     ).scalar_one()
     rev_map = crud_ecpm.revenue_yuan_by_trace(db, [r.trace_id for r in rows])
     return {
-        "items": [_session_to_row(r, ad_revenue_yuan=rev_map.get(r.trace_id)) for r in rows],
+        "items": [_session_to_row(r, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)) for r in rows],
         "total": int(total),
     }
 

app/admin/repositories/stats.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 from collections import Counter
 from datetime import date, datetime, time, timedelta, timezone
-from decimal import ROUND_HALF_UP, Decimal, InvalidOperation
+from decimal import Decimal, InvalidOperation
 
 from sqlalchemy import case, func, select
 from sqlalchemy.orm import Session
@@ -109,23 +109,6 @@ def _date_range(date_from: date, date_to: date) -> list[date]:
     return [date_from + timedelta(days=i) for i in range(days + 1)]
 
 
-def _duration_percentile(sorted_values: list[int], q: float) -> int | None:
-    """Linear-interpolated percentile with the same half-up rounding as Math.round."""
-    if not sorted_values:
-        return None
-    if len(sorted_values) == 1:
-        return sorted_values[0]
-    index = (len(sorted_values) - 1) * q
-    lower = int(index)
-    upper = min(lower + 1, len(sorted_values) - 1)
-    fraction = Decimal(str(index - lower))
-    value = (
-        Decimal(sorted_values[lower]) * (Decimal(1) - fraction)
-        + Decimal(sorted_values[upper]) * fraction
-    )
-    return int(value.quantize(Decimal("1"), rounding=ROUND_HALF_UP))
-
-
 def _id_set(db: Session, stmt) -> set[int]:
     return {int(v) for v in db.execute(stmt).scalars().all() if v is not None}
 
@@ -259,46 +242,16 @@ def dashboard_overview(
         ComparisonRecord.created_at >= start_local,
         ComparisonRecord.created_at < end_local,
     )
-    period_comparison_stats = db.execute(
-        select(
-            func.count(ComparisonRecord.id),
-            func.coalesce(
-                func.sum(
-                    case(
-                        (ComparisonRecord.status.in_(("success", "failed")), 1),
-                        else_=0,
-                    )
-                ),
-                0,
-            ),
-            func.coalesce(
-                func.sum(
-                    case((ComparisonRecord.status == "cancelled", 1), else_=0)
-                ),
-                0,
-            ),
-            func.coalesce(
-                func.sum(case((ComparisonRecord.status == "success", 1), else_=0)),
-                0,
-            ),
-            func.coalesce(func.sum(ComparisonRecord.llm_cost_yuan), 0.0),
-        ).where(*period_comparison_conds)
-    ).one()
-    period_comparison_total = int(period_comparison_stats[0])
-    period_comparison_completed = int(period_comparison_stats[1])
-    period_comparison_cancelled = int(period_comparison_stats[2])
-    period_comparison_success = int(period_comparison_stats[3])
-    period_comparison_token_cost_yuan = float(period_comparison_stats[4])
-    period_comparison_success_denominator = (
-        period_comparison_total - period_comparison_cancelled
+    period_comparison_total = _count(ComparisonRecord, *period_comparison_conds)
+    period_comparison_success = _count(
+        ComparisonRecord,
+        *period_comparison_conds,
+        ComparisonRecord.status == "success",
     )
     period_comparison_success_rate = (
-        round(
-            period_comparison_success / period_comparison_success_denominator,
-            4,
-        )
-        if period_comparison_success_denominator > 0
-        else None
+        round(period_comparison_success / period_comparison_total, 4)
+        if period_comparison_total
+        else 0.0
     )
     period_saved_positive_count = _count(
         ComparisonRecord,
@@ -329,47 +282,6 @@ def dashboard_overview(
         if period_avg_duration_ms is not None
         else None
     )
-    completed_duration_conds = (
-        *period_comparison_conds,
-        ComparisonRecord.status.in_(("success", "failed")),
-        ComparisonRecord.total_ms.is_not(None),
-    )
-    if db.bind is not None and db.bind.dialect.name == "postgresql":
-        period_median_duration_ms, period_p95_duration_ms = db.execute(
-            select(
-                func.percentile_cont(0.5).within_group(ComparisonRecord.total_ms),
-                func.percentile_cont(0.95).within_group(ComparisonRecord.total_ms),
-            ).where(*completed_duration_conds)
-        ).one()
-        period_median_duration_ms = (
-            int(
-                Decimal(str(period_median_duration_ms)).quantize(
-                    Decimal("1"), rounding=ROUND_HALF_UP
-                )
-            )
-            if period_median_duration_ms is not None
-            else None
-        )
-        period_p95_duration_ms = (
-            int(
-                Decimal(str(period_p95_duration_ms)).quantize(
-                    Decimal("1"), rounding=ROUND_HALF_UP
-                )
-            )
-            if period_p95_duration_ms is not None
-            else None
-        )
-    else:
-        # SQLite 测试环境没有 percentile_cont；仅回退读取耗时单列，不加载完整记录。
-        completed_durations = list(
-            db.execute(
-                select(ComparisonRecord.total_ms)
-                .where(*completed_duration_conds)
-                .order_by(ComparisonRecord.total_ms)
-            ).scalars()
-        )
-        period_median_duration_ms = _duration_percentile(completed_durations, 0.5)
-        period_p95_duration_ms = _duration_percentile(completed_durations, 0.95)
 
     ordered_exists = (
         select(SavingsRecord.id)
@@ -710,16 +622,11 @@ def dashboard_overview(
             },
             "comparison": {
                 "total": period_comparison_total,
-                "completed": period_comparison_completed,
-                "cancelled": period_comparison_cancelled,
                 "success": period_comparison_success,
                 "success_rate": period_comparison_success_rate,
                 "ordered": period_ordered_count,
                 "average_duration_ms": period_avg_duration_ms,
-                "median_duration_ms": period_median_duration_ms,
-                "p95_duration_ms": period_p95_duration_ms,
                 "average_saved_cents": period_avg_saved_cents,
-                "token_cost_total_yuan": period_comparison_token_cost_yuan,
             },
             "coupon": {
                 "started": coupon_started,

app/admin/schemas/coupon_data.py

@@ -70,9 +70,8 @@ class CouponDataRow(BaseModel):
     started_at: datetime = Field(..., description="发起时刻(明细「时间」列)")
     claimed_count: int | None = None
     trace_url: str | None = Field(None, description="pricebot 公网 trace 链接(仅 completed 有);admin 渲染可点链接,无则显示可复制 trace_id")
-    ad_revenue_yuan: float | None = Field(
-        None,
-        description="本次领券看的信息流广告预估收益(元);按 trace_id 聚合 ad_ecpm_record;无填充记录为 null",
+    ad_revenue_yuan: float = Field(
+        0.0, description="本次领券看的信息流广告预估收益(元);按 trace_id 聚合 ad_ecpm_record"
     )
 
 

app/admin/schemas/dashboard.py

@@ -53,16 +53,11 @@ class DashboardPeriodUsers(BaseModel):
 
 class DashboardPeriodComparison(BaseModel):
     total: int
-    completed: int
-    cancelled: int
     success: int
-    success_rate: float | None = None
+    success_rate: float
     ordered: int
     average_duration_ms: int | None = None
-    median_duration_ms: int | None = None
-    p95_duration_ms: int | None = None
     average_saved_cents: int | None = None
-    token_cost_total_yuan: float = 0.0
 
 
 class DashboardPeriodCoupon(BaseModel):

app/api/v1/auth.py

@@ -12,11 +12,16 @@ from __future__ import annotations
 
 import logging
 
-from fastapi import APIRouter, HTTPException, Request, status
+from fastapi import APIRouter, HTTPException, Request
 
 from app.api.deps import CurrentUser, DbSession
 from app.core import test_account
-from app.core.ratelimit import enforce_rate_limit
+from app.core.ratelimit import (
+    RateLimitRule,
+    check_rate_limits,
+    enforce_rate_limit,
+    record_rate_limits,
+)
 from app.core.security import TokenError, decode_token, issue_token_pair
 from app.integrations.jiguang import JiguangError, mask_phone, verify_and_get_phone
 from app.integrations.sms import SmsError, send_code, verify_code
@@ -40,9 +45,10 @@ router = APIRouter(prefix="/api/v1/auth", tags=["auth"])
 
 # 手机号登录防刷:同一设备(device_id) + 同一 IP 每小时最多的登录尝试次数(成功/失败都计)。
 SMS_LOGIN_MAX_PER_HOUR = 5
-# 发码防刷:同一设备(device_id) + 同一 IP 每小时最多的发码次数。
+# 发码防刷(同一设备 device_id + 同一 IP,**只按成功发码计数**;被单号 60s 冷却挡下的重发不占额度):
 # 堵「换手机号绕开单号 60s 冷却」的洞 —— 冷却是单号维度,一机换号能绕开。
-SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5
+SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5     # 每小时上限
+SMS_SEND_MAX_PER_DAY_PER_DEVICE = 20     # 每天上限(再叠一层日封顶,挡低频长时间轰炸)
 
 
 def _login_response(
@@ -99,23 +105,26 @@ def sms_send(req: SmsSendRequest, request: Request) -> SmsSendResponse:
         logger.info("test_account sms_send short-circuit (不真发)")
         return SmsSendResponse(sent=True, mock=True, cooldown_sec=0)
 
-    # 防刷:同一设备(device_id) + 同一 IP 每小时最多 SMS_SEND_MAX_PER_HOUR_PER_DEVICE 次发码。
-    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,
-    # 挡短信轰炸/烧钱。放在真发(send_code)之前 → 超限直接拦下、不真发短信。
-    enforce_rate_limit(
-        request,
-        scope="sms-send-device",
-        subject=req.device_id,
-        limit=SMS_SEND_MAX_PER_HOUR_PER_DEVICE,
-        window_sec=3600,
-        detail="操作过于频繁,请稍后再试",
-    )
+    # 发码防刷:同一设备(device_id) + 同一 IP,每小时 / 每天两道闸,**均只按成功发码计数**。
+    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,挡短信轰炸/烧钱。
+    # 关键:被单号 60s 冷却挡下的重发是「没真发、没烧钱」→ 不该占额度。故 check(先判)放在真发之前
+    # (超限直接 429、不真发),record(计数)只在 send_code 成功后调 —— 冷却/供应商失败抛 429 时直接返回、不计数。
+    send_rules = [
+        RateLimitRule("sms-send-device", SMS_SEND_MAX_PER_HOUR_PER_DEVICE, 3600,
+                      "操作过于频繁,请稍后再试"),
+        RateLimitRule("sms-send-device-daily", SMS_SEND_MAX_PER_DAY_PER_DEVICE, 86400,
+                      "今日验证码发送次数过多,请明天再试"),
+    ]
+    check_rate_limits(request, subject=req.device_id, rules=send_rules)
 
     try:
         cooldown = send_code(req.phone)
     except SmsError as e:
         raise HTTPException(status_code=e.status_code, detail=str(e)) from e
 
+    # 发码成功 → 两道闸各 +1(被单号冷却挡下的重发走不到这里,故不占额度)
+    record_rate_limits(request, subject=req.device_id, rules=send_rules)
+
     from app.core.config import settings  # 局部 import 避免循环
 
     return SmsSendResponse(sent=True, mock=settings.SMS_MOCK, cooldown_sec=cooldown)

app/core/ratelimit.py

@@ -9,29 +9,41 @@ from __future__ import annotations
 
 import threading
 import time
+from typing import NamedTuple
 
 from fastapi import HTTPException, Request, status
 
 from app.core.config import settings
 
-# key -> (window_start_ts, count)
-_buckets: dict[str, tuple[float, int]] = {}
+# key -> (window_start_ts, count, window_sec)
+# 存每个 key 自己的 window_sec:_buckets 混着不同窗口(60s 广告 / 3600s 登录 / 86400s 日闸)的 key,
+# GC 必须按各 key 自己的窗口判过期(见 [_purge_expired]),否则短窗口调用触发的 GC 会误删长窗口 key。
+_buckets: dict[str, tuple[float, int, float]] = {}
 _lock = threading.Lock()
+_GC_THRESHOLD = 10000  # _buckets 超此阈值才顺手清过期 key(仿 sms.py;测试可 monkeypatch 调小强制每次扫)
+
+
+def _purge_expired(now: float) -> None:
+    """清过期 key(**仅在持有 _lock 时调用**)。按每个 key 自己存的 window_sec 判过期,而非调用方的窗口
+    —— _buckets 是全局共享、混着 60s(广告)/3600s(登录)/86400s(日闸)不同窗口的 key;若用调用方窗口,
+    高频的 60s 广告端点触发 GC 时会把本该活 3600s/86400s 的登录/日闸计数一并删掉,使其在规模上(超阈值才
+    触发本清理)被反复清零而失效。仅在超阈值时扫,低频、开销可忽略。"""
+    if len(_buckets) <= _GC_THRESHOLD:
+        return
+    for k in [k for k, (s, _, w) in _buckets.items() if now - s >= w]:
+        _buckets.pop(k, None)
 
 
 def _hit(key: str, limit: int, window_sec: float) -> bool:
     """记一次访问。返回 True=放行,False=超限。"""
     now = time.monotonic()
     with _lock:
-        start, count = _buckets.get(key, (now, 0))
+        start, count, _ = _buckets.get(key, (now, 0, window_sec))
         if now - start >= window_sec:  # 窗口过期,重置
             start, count = now, 0
         count += 1
-        _buckets[key] = (start, count)
-        # 顺手清理过期 key,防内存无限涨(低频访问足够)
-        if len(_buckets) > 10000:
-            for k in [k for k, (s, _) in _buckets.items() if now - s >= window_sec]:
-                _buckets.pop(k, None)
+        _buckets[key] = (start, count, window_sec)
+        _purge_expired(now)  # 顺手清过期 key(按各自窗口),防内存无限涨
     return count <= limit
 
 
@@ -83,3 +95,76 @@ def enforce_rate_limit(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=detail,
         )
+
+
+# ===================== 先判 / 后记(只按「成功」计数)=====================
+# _hit 是原子「判+记」:一调用就 +1,适合登录爆破(失败尝试也要计)。但对「短信发码」这类
+# **只想给成功动作计数**的场景不合适 —— 被单号冷却挡下的重发没真发、没烧钱,不该占额度。
+# 故拆成 _peek(只判不记)+ _commit(只记):check_rate_limits 先判 → 动作 → 成功后 record。
+
+
+class RateLimitRule(NamedTuple):
+    """一条限流规则。scope 区分不同闸(不同 key 前缀);同一 (subject, IP) 在 window_sec
+    内最多 limit 次,超限抛 429 用 detail 文案。
+
+    (scope, window_sec) 成对绑在一条规则里 —— check(先判)与 record(计数)复用同一条,
+    避免两处把窗口/scope 写歪导致 key 对不上。
+    """
+
+    scope: str
+    limit: int
+    window_sec: float
+    detail: str = "操作过于频繁,请稍后再试"
+
+
+def _peek(key: str, limit: int, window_sec: float) -> bool:
+    """只读:当前窗口内是否还没到上限(count < limit)。**不改计数**。
+    与 [_commit] 配对实现「先判后记」——只在动作成功后才 _commit。"""
+    now = time.monotonic()
+    with _lock:
+        start, count, _ = _buckets.get(key, (now, 0, window_sec))
+        if now - start >= window_sec:  # 窗口已过期 → 视作已重置(count 归零)
+            count = 0
+    return count < limit
+
+
+def _commit(key: str, window_sec: float) -> None:
+    """记一次访问(+1)。窗口过期则以本次为起点重置。仅在动作成功后调用。"""
+    now = time.monotonic()
+    with _lock:
+        start, count, _ = _buckets.get(key, (now, 0, window_sec))
+        if now - start >= window_sec:  # 窗口过期,重置
+            start, count = now, 0
+        _buckets[key] = (start, count + 1, window_sec)
+        _purge_expired(now)  # 顺手清过期 key(按各自窗口,同 [_hit])
+
+
+def check_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
+    """【先判】一组限流:任一规则已达上限即抛 429,且**不改计数**。
+
+    配合 [record_rate_limits] 实现「只按成功计数」:先 check 所有闸(全未超才继续)→ 执行动作
+    → 动作**成功后**再 record。动作被下游挡下(如短信单号冷却)、没真正发生时不 record → 不占额度。
+    key = `scope:subject:client_ip`(与 [enforce_rate_limit] 同款)。
+    """
+    if not settings.RATE_LIMIT_ENABLED:
+        return
+    ip = _client_ip(request)
+    for rule in rules:
+        if not _peek(f"{rule.scope}:{subject}:{ip}", rule.limit, rule.window_sec):
+            raise HTTPException(
+                status_code=status.HTTP_429_TOO_MANY_REQUESTS,
+                detail=rule.detail,
+            )
+
+
+def record_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
+    """【记一次】一组限流(每条规则 +1)。仅在动作成功后调用,与 [check_rate_limits] 配对。
+
+    ⚠️ check→动作→record 非原子:并发突发下计数可能略超 limit(每个在途请求各 +1)。对
+    「防脚本/防轰炸」的安全网定位可接受;要精确配额需迁 Redis(见模块 docstring)。
+    """
+    if not settings.RATE_LIMIT_ENABLED:
+        return
+    ip = _client_ip(request)
+    for rule in rules:
+        _commit(f"{rule.scope}:{subject}:{ip}", rule.window_sec)

app/integrations/sms.py

@@ -13,7 +13,8 @@ worker / 多机时内存不共享 → 冷却、校验都会失效,届时迁移
 
 防刷两层(短信花钱 + `/sms/send` 在登录前无法 JWT 鉴权):
   1. 单号 `SMS_SEND_INTERVAL_SEC` 冷却(本文件)
-  2. 单设备(device_id)每小时频控(api 层 auth.sms_send 内 enforce_rate_limit)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
+  2. 单设备(device_id)+ IP 每小时 / 每天频控(api 层 auth.sms_send 的 check/record_rate_limits,
+     **只按成功发码计数** —— 被本文件单号冷却挡下的重发不占额度)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
      ⚠️ 原「单 IP 频控(rate_limit 依赖)」2026-06-26 按产品要求删除、改设备维度;但 device_id 客户端可伪造/轮换,
         脚本轮换 id 能绕过本层 → 挡脚本狂发主要靠极光控制台侧(+ 可选 nginx 限流)。
      ⚠️ 原「单号每日上限」2026-07-03 按精简要求删除(mentor 定:登录风控只留单号冷却 + 单设备频控);

tests/test_admin_read.py

@@ -1,15 +1,12 @@
 """Admin M2 读接口测试:大盘聚合 + 用户/流水/提现/反馈列表 + 鉴权拦截。"""
 from __future__ import annotations
 
-from datetime import datetime
-
 import pytest
 from fastapi.testclient import TestClient
 
 from app.admin.main import admin_app
 from app.admin.repositories import admin_user as admin_repo
 from app.db.session import SessionLocal
-from app.models.comparison import ComparisonRecord
 from app.models.feedback import Feedback
 from app.models.wallet import CashTransaction, WithdrawOrder
 from app.repositories import user as user_repo
@@ -72,49 +69,6 @@ def test_dashboard_overview(admin_client: TestClient, admin_token: str) -> None:
     assert "jd_order_count" in data["cps"]
 
 
-def test_dashboard_period_comparison_is_aggregated_by_backend(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    created_at = datetime(2037, 1, 15, 12)
-    rows = [
-        ("dashboard-aggregate-success", "success", 101, 0.1),
-        ("dashboard-aggregate-failed", "failed", 200, 0.2),
-        ("dashboard-aggregate-cancelled", "cancelled", 300, 0.3),
-        ("dashboard-aggregate-running", "running", 400, 0.4),
-    ]
-    db = SessionLocal()
-    try:
-        for trace_id, status, total_ms, llm_cost_yuan in rows:
-            db.add(
-                ComparisonRecord(
-                    trace_id=trace_id,
-                    status=status,
-                    total_ms=total_ms,
-                    llm_cost_yuan=llm_cost_yuan,
-                    created_at=created_at,
-                )
-            )
-        db.commit()
-    finally:
-        db.close()
-
-    response = admin_client.get(
-        "/admin/api/stats/overview",
-        params={"date_from": "2037-01-15", "date_to": "2037-01-15"},
-        headers=_auth(admin_token),
-    )
-    assert response.status_code == 200, response.text
-    comparison = response.json()["period"]["comparison"]
-    assert comparison["total"] == 4
-    assert comparison["completed"] == 2
-    assert comparison["cancelled"] == 1
-    assert comparison["success"] == 1
-    assert comparison["success_rate"] == 0.3333
-    assert comparison["median_duration_ms"] == 151
-    assert comparison["p95_duration_ms"] == 195
-    assert comparison["token_cost_total_yuan"] == pytest.approx(1.0)
-
-
 def test_user_list_and_detail(admin_client: TestClient, admin_token: str) -> None:
     uid = _seed_user_with_data("13800000002")
     r = admin_client.get("/admin/api/users", headers=_auth(admin_token))

tests/test_auth.py

@@ -107,6 +107,67 @@ def test_sms_send_device_ip_rate_limit(client, monkeypatch) -> None:
     assert r.status_code == 200, r.text
 
 
+def test_sms_send_cooldown_reject_not_counted(client, monkeypatch) -> None:
+    """发码额度只算「成功发码」:被单号 60s 冷却挡下的重发(429)不占设备额度。
+    做法:同号狂发只成功 1 次、其余被冷却挡下;把小时额度设 2,证明换号后仍能再成功发 1 次
+    —— 若冷却重发也计数,额度早被那几次耗尽。"""
+    from app.api.v1 import auth
+    from app.core import ratelimit
+
+    monkeypatch.setattr(ratelimit.settings, "RATE_LIMIT_ENABLED", True)
+    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_HOUR_PER_DEVICE", 2)
+    ratelimit._buckets.clear()
+
+    device = "dev-cooldown"
+    phone_a = "13710137000"
+    # 首发成功(小时闸计 1/2)
+    assert client.post(
+        "/api/v1/auth/sms/send", json={"phone": phone_a, "device_id": device}
+    ).status_code == 200
+    # 同号连发 3 次:都被单号 60s 冷却挡下 → 429,且**不占**设备额度
+    for _ in range(3):
+        r = client.post(
+            "/api/v1/auth/sms/send", json={"phone": phone_a, "device_id": device}
+        )
+        assert r.status_code == 429, r.text
+    # 换号再发:设备额度只用了 1/2(冷却那几次没算)→ 仍放行(计到 2/2)
+    assert client.post(
+        "/api/v1/auth/sms/send", json={"phone": "13710137001", "device_id": device}
+    ).status_code == 200
+    # 又换号:此时小时闸已 2/2 → 429(反证成功发码确实各计了 1)
+    r = client.post(
+        "/api/v1/auth/sms/send", json={"phone": "13710137002", "device_id": device}
+    )
+    assert r.status_code == 429, r.text
+
+
+def test_sms_send_daily_cap(client, monkeypatch) -> None:
+    """每天发码上限(设备 + IP):成功发码累计到日上限即 429(用不同手机号绕开单号冷却)。
+    抬高小时闸单独测日闸;超限文案含「今日」以便前端提示明天再来。"""
+    from app.api.v1 import auth
+    from app.core import ratelimit
+
+    monkeypatch.setattr(ratelimit.settings, "RATE_LIMIT_ENABLED", True)
+    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_HOUR_PER_DEVICE", 100)  # 抬高小时闸,不干扰
+    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_DAY_PER_DEVICE", 3)
+    ratelimit._buckets.clear()
+
+    device = "dev-daily"
+    for i in range(3):
+        r = client.post(
+            "/api/v1/auth/sms/send",
+            json={"phone": f"13720137{i:03d}", "device_id": device},
+        )
+        assert r.status_code == 200, f"第 {i + 1} 次应放行: {r.text}"
+    # 第 4 次:同设备同 IP 当日超限 → 429
+    r = client.post(
+        "/api/v1/auth/sms/send",
+        json={"phone": "13720137999", "device_id": device},
+    )
+    assert r.status_code == 429, r.text
+    assert "今日" in r.json()["detail"]
+
+
 def test_sms_login_device_ip_rate_limit(client, monkeypatch) -> None:
     """防刷:同一设备(device_id) + 同一 IP 每小时最多 SMS_LOGIN_MAX_PER_HOUR 次登录尝试,超出 429。
     conftest 默认 RATE_LIMIT_ENABLED=false(内存计数跨用例累加),本用例临时打开并清空计数隔离。"""

tests/test_board_ad_revenue.py

@@ -43,35 +43,6 @@ def test_coupon_data_report_includes_ad_revenue() -> None:
         db.close()
 
 
-def test_coupon_data_report_distinguishes_unfilled_from_zero_revenue() -> None:
-    """无 eCPM 记录返回 None；已填充但 eCPM=0 返回 0.0。"""
-    db = SessionLocal()
-    try:
-        db.add_all([
-            CouponSession(
-                trace_id="rev-cp-unfilled", device_id="d-unfilled", status="completed", app_env="prod",
-                platforms=["meituan-waimai"], platform_success=["meituan-waimai"],
-                started_at=datetime(2020, 1, 3, tzinfo=UTC), started_date=date(2020, 1, 3),
-            ),
-            CouponSession(
-                trace_id="rev-cp-zero", device_id="d-zero", status="completed", app_env="prod",
-                platforms=["meituan-waimai"], platform_success=["meituan-waimai"],
-                started_at=datetime(2020, 1, 3, tzinfo=UTC), started_date=date(2020, 1, 3),
-            ),
-            _ecpm("rev-cp-zero", "0", "cp-sess-zero", "coupon"),
-        ])
-        db.flush()
-
-        res = coupon_data_report(db, date_from="2020-01-03", date_to="2020-01-03", app_env="prod")
-        rows = {row["trace_id"]: row for row in res["items"]}
-
-        assert rows["rev-cp-unfilled"]["ad_revenue_yuan"] is None
-        assert rows["rev-cp-zero"]["ad_revenue_yuan"] == 0.0
-    finally:
-        db.rollback()
-        db.close()
-
-
 def test_comparison_list_includes_ad_revenue() -> None:
     """比价记录列表项带本次广告收益;200 分 → 0.002 元。
 

tests/test_ratelimit.py

@@ -0,0 +1,57 @@
+"""ratelimit 内存桶过期清理(GC)测试。
+
+回归重点:_buckets 是**全局共享**、混着不同窗口(60s 广告 / 3600s 登录 / 86400s 日闸)的 key。
+GC 必须按【每个 key 自己存的 window_sec】判过期,而不是当前调用方的窗口 —— 否则高频的 60s 端点
+触发 GC 时会把本该存活更久的 3600s/86400s 计数(如短信日闸)一并删掉,使其被反复清零、限流失效。
+用 monkeypatch 把 _GC_THRESHOLD 调 0 强制每次都扫,免造上万条(仿 test_auth 里对 sms._GC_THRESHOLD 的做法)。
+"""
+from __future__ import annotations
+
+from app.core import ratelimit
+
+
+def test_purge_expired_respects_each_key_own_window(monkeypatch) -> None:
+    """短窗口(60s)触发的 GC 只删真正过期的 key,不得删掉仍在自身窗口内的长窗口 key。"""
+    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 0)  # 强制每次都扫
+    ratelimit._buckets.clear()
+
+    now = 1_000_000.0
+    # 日闸:100s 前开窗、window=86400 → 远未过期,必须保留
+    ratelimit._buckets["sms-send-device-daily:D:IP"] = (now - 100, 7, 86400.0)
+    # 登录:1800s、window=3600 → 未过期,保留
+    ratelimit._buckets["sms-login-device:D:IP"] = (now - 1800, 2, 3600.0)
+    # 广告:120s、window=60 → 已过期,应删
+    ratelimit._buckets["ad-watch-report:IP2"] = (now - 120, 3, 60.0)
+
+    ratelimit._purge_expired(now)
+
+    assert "sms-send-device-daily:D:IP" in ratelimit._buckets
+    assert "sms-login-device:D:IP" in ratelimit._buckets
+    assert "ad-watch-report:IP2" not in ratelimit._buckets
+
+
+def test_purge_expired_keeps_long_window_key_older_than_short_window(monkeypatch) -> None:
+    """反证旧 bug:日闸 key 已老于 3600s,旧代码在 60s/3600s 端点触发 GC 时会误删它;
+    现在按自身 86400s 窗口判 → 未过期 → 必须保留。"""
+    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 0)
+    ratelimit._buckets.clear()
+
+    now = 2_000_000.0
+    # 3700s 前开窗(> 1 小时),但 window=86400 → 未过期
+    ratelimit._buckets["sms-send-device-daily:D:IP"] = (now - 3700, 20, 86400.0)
+
+    ratelimit._purge_expired(now)
+
+    assert "sms-send-device-daily:D:IP" in ratelimit._buckets
+
+
+def test_purge_expired_noop_below_threshold(monkeypatch) -> None:
+    """未超阈值时不扫(即便有过期 key 也不动),避免每次请求都 O(n) 扫全表。"""
+    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 10)
+    ratelimit._buckets.clear()
+
+    now = 3_000_000.0
+    ratelimit._buckets["stale:IP"] = (now - 999, 1, 60.0)  # 早过期,但没超阈值
+    ratelimit._purge_expired(now)
+
+    assert "stale:IP" in ratelimit._buckets  # 桶数没超阈值 → 不清理