diff --git a/backend/routers/operations.py b/backend/routers/operations.py index 2e25395..3cca979 100644 --- a/backend/routers/operations.py +++ b/backend/routers/operations.py @@ -11,7 +11,7 @@ from sqlalchemy.orm import Session from ..database import get_db from ..deps import get_current_user -from ..models import OperationLog +from ..models import OperationLog, Task router = APIRouter(prefix="/api/operations", tags=["operations"]) @@ -31,6 +31,27 @@ def _query_logs(db: Session, days: int, username: str = "", action: str = ""): return query +def _task_versions(db: Session, task_ids: set[str]) -> dict[str, str]: + versions = {} + if not task_ids: + return versions + for task_id, config_json in db.query(Task.id, Task.config_json).filter(Task.id.in_(task_ids)).all(): + try: + config = json.loads(config_json or "{}") + versions[task_id] = config.get("VERSION", "") if isinstance(config, dict) else "" + except (TypeError, json.JSONDecodeError): + versions[task_id] = "" + return versions + + +def _log_detail(log: OperationLog) -> dict: + try: + detail = json.loads(log.detail_json or "{}") + except (TypeError, json.JSONDecodeError): + return {} + return detail if isinstance(detail, dict) else {} + + @router.get("/summary") async def operation_summary(days: int = Query(30, ge=1, le=365), user: dict = Depends(get_current_user), db: Session = Depends(get_db)): _require_admin(user) @@ -48,10 +69,20 @@ async def operation_summary(days: int = Query(30, ge=1, le=365), user: dict = De async def list_operations(days: int = Query(30, ge=1, le=365), username: str = "", action: str = "", limit: int = Query(100, ge=1, le=500), user: dict = Depends(get_current_user), db: Session = Depends(get_db)): _require_admin(user) logs = _query_logs(db, days, username, action).order_by(OperationLog.created_at.desc()).limit(limit).all() - return [{"id": log.id, "created_at": log.created_at, "username": log.username, - "action": log.action, "app_name": log.app_name, "task_id": log.task_id, - "resource_type": log.resource_type, "resource_name": log.resource_name, - "detail": json.loads(log.detail_json or "{}"), "client_ip": log.client_ip} for log in logs] + task_ids = {log.task_id for log in logs if log.action == "ipa_download_requested" and log.task_id} + task_versions = _task_versions(db, task_ids) + + result = [] + for log in logs: + detail = _log_detail(log) + item = {"id": log.id, "created_at": log.created_at, "username": log.username, + "action": log.action, "app_name": log.app_name, "task_id": log.task_id, + "resource_type": log.resource_type, "resource_name": log.resource_name, + "detail": detail} + if log.action == "ipa_download_requested": + item["version"] = detail.get("version") or task_versions.get(log.task_id, "") + result.append(item) + return result @router.get("/export") @@ -59,7 +90,14 @@ async def export_operations(days: int = Query(30, ge=1, le=365), user: dict = De _require_admin(user) output = io.StringIO() writer = csv.writer(output) - writer.writerow(["时间", "用户", "操作", "App", "资源类型", "资源名称", "IP", "详情"]) - for log in _query_logs(db, days).order_by(OperationLog.created_at.desc()).all(): - writer.writerow([log.created_at, log.username, log.action, log.app_name or "", log.resource_type or "", log.resource_name or "", log.client_ip or "", log.detail_json or ""]) + writer.writerow(["时间", "用户", "操作", "App", "资源类型", "资源名称", "版本", "详情"]) + logs = _query_logs(db, days).order_by(OperationLog.created_at.desc()).all() + task_ids = {log.task_id for log in logs if log.action == "ipa_download_requested" and log.task_id} + task_versions = _task_versions(db, task_ids) + for log in logs: + detail = _log_detail(log) + version = "" + if log.action == "ipa_download_requested": + version = detail.get("version") or task_versions.get(log.task_id, "") + writer.writerow([log.created_at, log.username, log.action, log.app_name or "", log.resource_type or "", log.resource_name or "", version, log.detail_json or ""]) return StreamingResponse(iter(["\ufeff" + output.getvalue()]), media_type="text/csv", headers={"Content-Disposition": "attachment; filename=operation-logs.csv"}) diff --git a/backend/routers/tasks.py b/backend/routers/tasks.py index dbf562d..e4965bf 100644 --- a/backend/routers/tasks.py +++ b/backend/routers/tasks.py @@ -298,8 +298,9 @@ async def get_download_link(task_id: str, request: Request, user: dict = Depends from .config import load_config from ..config import DOWNLOAD_URL_EXPIRE_SECONDS from ..services.distribution import DistributionError, get_published_download_url + task_config = json.loads(task.config_json or "{}") download_url = get_published_download_url( - json.loads(task.config_json or "{}"), + task_config, load_config().get("upload", {}), task.oss_url, ) @@ -319,7 +320,7 @@ async def get_download_link(task_id: str, request: Request, user: dict = Depends from ..services.audit_log import record_operation record_operation(db, user, "ipa_download_requested", request=request, task=task, resource_type="ipa", resource_name=task.oss_url, - detail={"controlled": True}) + detail={"controlled": True, "version": task_config.get("VERSION", "")}) db.commit() return {"url": download_url, "expires_in": DOWNLOAD_URL_EXPIRE_SECONDS} diff --git a/frontend/src/views/OperationLogView.vue b/frontend/src/views/OperationLogView.vue index 66d24b4..fa4f338 100644 --- a/frontend/src/views/OperationLogView.vue +++ b/frontend/src/views/OperationLogView.vue @@ -4,7 +4,7 @@

操作日志

{{ summary.total || 0 }}操作总数
{{ summary.action_counts?.build_created || 0 }}发起打包
{{ summary.action_counts?.ipa_download_requested || 0 }}发起 IPA 下载

活跃用户

{{ item.name }} {{ item.count }}

App 操作量

{{ item.name }} {{ item.count }}

-
时间用户操作App资源IP
{{ formatTime(log.created_at) }}{{ log.username }}{{ actionText(log.action) }}{{ log.app_name || '-' }}{{ log.resource_type || '-' }}{{ log.client_ip || '-' }}
暂无操作记录
+
时间用户操作App资源版本
{{ formatTime(log.created_at) }}{{ log.username }}{{ actionText(log.action) }}{{ log.app_name || '-' }}{{ log.resource_type || '-' }}{{ log.action === 'ipa_download_requested' ? (log.version || '-') : '-' }}
暂无操作记录