ouzhou
27f76918b2
本 PR 汇合三块运营后台改动(原 #50 仅含其中「加固」一块,已并入本 PR 并关闭)。 ## 1. review 加固 (436b2a3) - 超管防自锁:降级/禁用最后一个 active super_admin 前校验,杜绝零超管死局 - 时间筛选统一 tz-aware(列为 timestamptz),比较绝对时刻、不依赖 DB 会话时区 - 上报审核 / 调余额(set·扣减)加行锁,防并发/连点重复发钱 - ad_audit 复算排序补 id 次级键;health-check 限 finance;调账/拒绝 reason 去空白校验 ## 2. 反馈改版 (5a18dbb) - contact 可选、截图≤6;admin 反馈列表筛选/排序;admin·wallet 接口调整 + docs ## 3. 列表页码分页 (1a7a624) - CursorPage 加 total;新增 offset_paginate(count 与分页同源) - 上报/审计日志从 id 游标改 offset 分页(支持跳页) - 用户 / 提现 / 上报 / 审计日志 四页接入页码分页 测试:admin 套件 47 passed。前端配套改动见 shaguabijia-admin-web。 --------- Co-authored-by: OuYingJun1024 <1034284404@qq.com> Reviewed-on: #51 Co-authored-by: ouzhou <ouzhou@wonderable.ai> Co-committed-by: ouzhou <ouzhou@wonderable.ai>
74 lines
2.1 KiB
Python
74 lines
2.1 KiB
Python
"""admin_audit_log 写入 + 查询。
|
|
|
|
审计日志只增不改不删——任何写操作经 app.admin.audit.write_audit 落一条。
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from sqlalchemy import func, select
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.models.admin import AdminAuditLog
|
|
|
|
|
|
def add_audit_log(
|
|
db: Session,
|
|
*,
|
|
admin_id: int,
|
|
admin_username: str,
|
|
action: str,
|
|
target_type: str,
|
|
target_id: str | None = None,
|
|
detail: dict | None = None,
|
|
ip: str | None = None,
|
|
commit: bool = True,
|
|
) -> AdminAuditLog:
|
|
"""插一条审计。commit=False 时只 flush,让调用方把审计和业务写操作放同一事务。"""
|
|
log = AdminAuditLog(
|
|
admin_id=admin_id,
|
|
admin_username=admin_username,
|
|
action=action,
|
|
target_type=target_type,
|
|
target_id=target_id,
|
|
detail=detail,
|
|
ip=ip,
|
|
)
|
|
db.add(log)
|
|
if commit:
|
|
db.commit()
|
|
db.refresh(log)
|
|
else:
|
|
db.flush()
|
|
return log
|
|
|
|
|
|
def list_audit_logs(
|
|
db: Session,
|
|
*,
|
|
action: str | None = None,
|
|
target_type: str | None = None,
|
|
admin_id: int | None = None,
|
|
limit: int = 50,
|
|
cursor: int | None = None,
|
|
) -> tuple[list[AdminAuditLog], int | None, int]:
|
|
"""offset 分页(id 倒序)+ total。cursor 即 offset((page-1)*pageSize),支持页码跳页。
|
|
返回 (rows, next_cursor, total)。"""
|
|
stmt = select(AdminAuditLog)
|
|
if action:
|
|
stmt = stmt.where(AdminAuditLog.action == action)
|
|
if target_type:
|
|
stmt = stmt.where(AdminAuditLog.target_type == target_type)
|
|
if admin_id is not None:
|
|
stmt = stmt.where(AdminAuditLog.admin_id == admin_id)
|
|
|
|
total = int(db.execute(select(func.count()).select_from(stmt.subquery())).scalar_one())
|
|
offset = max(cursor or 0, 0)
|
|
rows = list(
|
|
db.execute(
|
|
stmt.order_by(AdminAuditLog.id.desc()).offset(offset).limit(limit + 1)
|
|
).scalars().all()
|
|
)
|
|
has_more = len(rows) > limit
|
|
items = rows[:limit]
|
|
next_cursor = offset + limit if has_more else None
|
|
return items, next_cursor, total
|