merge: 合并远程 ft_wyt 分支，解决冲突

backend/app/core/audit.py

@@ -61,6 +61,7 @@ def audit_log(
                     detail = _build_detail(detail_template, kwargs)
                     _record_audit(
                         action=action,
+                        actor_id=_extract_actor_id(kwargs),
                         target_type=target_type,
                         target_id=target_id,
                         detail=detail,
@@ -87,6 +88,7 @@ def audit_log(
                     detail = _build_detail(detail_template, kwargs)
                     _record_audit(
                         action=action,
+                        actor_id=_extract_actor_id(kwargs),
                         target_type=target_type,
                         target_id=target_id,
                         detail=detail,
@@ -136,6 +138,7 @@ def _build_detail(template: str, kwargs: dict) -> str:
 
 def _record_audit(
     action: str,
+    actor_id: Optional[str],
     target_type: str,
     target_id: Optional[str],
     detail: str,
@@ -149,6 +152,7 @@ def _record_audit(
         store = get_platform_store()
         store.record_audit(
             action=action,
+            actor_id=actor_id,
             target_type=target_type or None,
             target_id=target_id,
             detail=f"{detail} trace_id={trace_id} duration_ms={duration_ms:.1f}" if detail else f"trace_id={trace_id} duration_ms={duration_ms:.1f}",
@@ -157,6 +161,15 @@ def _record_audit(
         logger.error("写入审计日志失败 action=%s", action, exc_info=True)
 
 
+def _extract_actor_id(kwargs: dict) -> Optional[str]:
+    """从 FastAPI 注入的当前用户中提取操作人 ID。"""
+    for key in ("current_user", "user"):
+        value = kwargs.get(key)
+        if isinstance(value, dict) and value.get("id"):
+            return str(value["id"])
+    return None
+
+
 # ==================== 预定义的审计操作常量 ====================
 
 class AuditActions:

backend/app/core/config.py

@@ -68,6 +68,9 @@ class Settings:
     minio_secret_key: str = os.getenv("MINIO_SECRET_KEY", "minioadmin")
     minio_bucket: str = os.getenv("MINIO_BUCKET", "yg-ft-resources")
     minio_secure: bool = _bool_env("MINIO_SECURE", False)
+    # Small text/data files stay inline in PostgreSQL to avoid unnecessary
+    # MinIO round trips. Larger files remain the shared canonical objects.
+    minio_inline_max_bytes: int = _int_env("MINIO_INLINE_MAX_BYTES", 256 * 1024)
     storage_wait_seconds: int = _int_env("STORAGE_WAIT_SECONDS", 300)
     storage_check_interval_seconds: int = _int_env("STORAGE_CHECK_INTERVAL_SECONDS", 10)
     compute_service_token: str = os.getenv("COMPUTE_SERVICE_TOKEN", "")