🔀 合并测试环境性能优化到生产分支

从已验证并已推送的 test/custom-admin-ui 分支合并静态资源压缩和统一主题资源路由改动。

- 保留生产 Dockerfile 使用前端 main 分支
- 不带入测试环境专用构建配置
- 测试环境已通过 48 组响应式与明暗模式回归

Dockerfile

@@ -54,6 +54,7 @@ COPY --from=frontend-builder /build/fronted-2024/dist ./themes/2024
 COPY --from=frontend-builder /build/fronted-2026/dist ./themes/2026
 COPY --from=frontend-builder /build/fronted-2023/dist ./themes/2023
 
+
 # 安装 Python 依赖
 RUN pip install --no-cache-dir -r requirements.txt
 

apps/admin/services.py

@@ -3,7 +3,7 @@ import json
 import os
 import time
 from datetime import datetime, timedelta
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 from core.response import APIResponse
 from core.storage import FileStorageInterface, storages
@@ -82,6 +82,18 @@ class FileService:
     def _file_metadata_key(self, file_id: int) -> str:
         return f"{self.FILE_METADATA_KEY_PREFIX}{file_id}"
 
+    def _dedupe_download_stats(self, stats: List[TransferStats]) -> List[TransferStats]:
+        deduped: List[TransferStats] = []
+        recent_downloads: Dict[Tuple[Optional[int], str, int], datetime] = {}
+        for stat in stats:
+            key = (stat.file_code_id, stat.ip or "", int(stat.size or 0))
+            previous = recent_downloads.get(key)
+            if previous and (stat.created_at - previous).total_seconds() <= 5:
+                continue
+            recent_downloads[key] = stat.created_at
+            deduped.append(stat)
+        return deduped
+
     async def _delete_file_code(self, file_code: FileCodes):
         try:
             name = (
@@ -1289,15 +1301,18 @@ class FileService:
         download_stats = await TransferStats.filter(
             action="download", file_code_id=file_code.id
         ).order_by("created_at")
+        download_event_count = len(download_stats)
+        display_download_count = max(int(file_code.used_count or 0), download_event_count)
         timeline.append(
             {
                 "key": "retrieved",
-                "status": "done" if file_code.used_count > 0 else "pending",
-                "severity": "success" if file_code.used_count > 0 else "neutral",
+                "status": "done" if display_download_count > 0 else "pending",
+                "severity": "success" if display_download_count > 0 else "neutral",
                 "timestamp": (
                     download_stats[-1].created_at if download_stats else file_code.created_at
                 ),
-                "value": file_code.used_count,
+                "value": display_download_count,
+                "event_count": download_event_count,
             }
         )
         for index, stat in enumerate(download_stats, start=1):

apps/admin/views.py

@@ -189,10 +189,25 @@ async def analytics(start: str = "", end: str = ""):
     end_day = parse_day(end, now.replace(hour=0, minute=0, second=0, microsecond=0))
     start_day = parse_day(start, end_day - datetime.timedelta(days=29))
     end_exclusive = end_day + datetime.timedelta(days=1)
-    stats = await TransferStats.filter(
+    raw_stats = await TransferStats.filter(
         created_at__gte=start_day,
         created_at__lt=end_exclusive,
+    ).order_by("created_at", "id")
+    stats = []
+    recent_downloads = {}
+    for item in raw_stats:
+        if item.action == "download":
+            dedupe_key = (
+                item.file_code_id or item.code or "",
+                item.ip or "",
+                int(item.size or 0),
             )
+            previous = recent_downloads.get(dedupe_key)
+            if previous and (item.created_at - previous).total_seconds() <= 5:
+                continue
+            recent_downloads[dedupe_key] = item.created_at
+        stats.append(item)
+
     files = await FileCodes.all()
     file_map = {item.code: item for item in files}
 
@@ -299,6 +314,13 @@ async def analytics(start: str = "", end: str = ""):
     def iso(value):
         return value.isoformat() if value else ""
 
+    def current_file_expired(file_item) -> bool:
+        if not file_item:
+            return False
+        if file_item.expired_at and file_item.expired_at < now:
+            return True
+        return file_item.expired_count == 0
+
     def history_row(code: str, data: dict) -> dict:
         file_item = file_map.get(code)
         current_name = ""
@@ -320,6 +342,7 @@ async def analytics(start: str = "", end: str = ""):
             "upload_count": data.get("uploads") or 0,
             "upload_traffic": str(data.get("uploadTraffic") or 0),
             "current": bool(file_item),
+            "expired": current_file_expired(file_item),
             "deleted": bool(data.get("deleted")) and not bool(file_item),
             "created_at": iso(uploaded_at),
             "uploaded_at": iso(uploaded_at),

apps/base/views.py

@@ -292,6 +292,7 @@ async def select_file(data: SelectFileModel, ip: str = Depends(ip_limit["error"]
         return APIResponse(code=404, detail=file_code)
 
     assert isinstance(file_code, FileCodes)
+    if file_code.text is not None:
         await update_file_usage(file_code)
         await record_transfer_stat("download", file_code, file_code.size, ip)
     return APIResponse(detail=await build_select_detail(file_code, file_storage))
@@ -303,10 +304,11 @@ async def download_file(key: str, code: str, ip: str = Depends(ip_limit["error"]
     if await get_select_token(code) != key:
         ip_limit["error"].add_ip(ip)
         raise HTTPException(status_code=403, detail="下载鉴权失败")
-    has, file_code = await get_code_file_by_code(code, False)
+    has, file_code = await get_code_file_by_code(code)
     if not has:
-        return APIResponse(code=404, detail="文件不存在")
+        return APIResponse(code=404, detail=file_code)
     assert isinstance(file_code, FileCodes)
+    await update_file_usage(file_code)
     await record_transfer_stat("download", file_code, file_code.size, ip)
     return (
         APIResponse(detail=file_code.text)

main.py

@@ -3,13 +3,14 @@
 # @File    : main.py
 # @Software: PyCharm
 import asyncio
+import re
 import time
 from contextlib import asynccontextmanager
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import HTMLResponse
-from fastapi.staticfiles import StaticFiles
+from fastapi.responses import FileResponse, HTMLResponse, PlainTextResponse
+from starlette.middleware.gzip import GZipMiddleware
 from tortoise import Tortoise
 from tortoise.contrib.fastapi import register_tortoise
 
@@ -75,12 +76,6 @@ async def lifespan(app: FastAPI):
     # 加载配置（多进程下串行化启动写操作）
     async with db_startup_lock():
         await load_config()
-    app.mount(
-        "/assets",
-        StaticFiles(directory=f"./{settings.themesSelect}/assets"),
-        name="assets",
-    )
-
     # 启动后台任务
     task = asyncio.create_task(delete_expire_files())
     chunk_cleanup_task = asyncio.create_task(clean_incomplete_uploads())
@@ -126,6 +121,8 @@ async def migrate_password_to_hash():
 
 app = FastAPI(lifespan=lifespan)
 
+app.add_middleware(GZipMiddleware, minimum_size=1024, compresslevel=6)
+
 @app.middleware("http")
 async def refresh_settings_middleware(request, call_next):
     await refresh_settings()
@@ -154,20 +151,49 @@ app.include_router(presign_api, prefix="/api")
 app.include_router(admin_api)
 
 
+@app.get("/theme-assets/{asset_path:path}")
+@app.get("/assets/{asset_path:path}")
+async def theme_asset(asset_path: str):
+    # Vite with base=/theme-assets/ emits /theme-assets/assets/<file> while
+    # legacy themes use /theme-assets/<file>. Keep both forms compatible.
+    normalized_asset_path = asset_path.removeprefix("assets/")
+    theme_assets = (BASE_DIR / settings.themesSelect / "assets").resolve()
+    target = (theme_assets / normalized_asset_path).resolve()
+    try:
+        target.relative_to(theme_assets)
+    except ValueError:
+        return PlainTextResponse("Not found", status_code=404)
+    if not target.is_file():
+        return PlainTextResponse("Not found", status_code=404)
+    return FileResponse(
+        target,
+        headers={"Cache-Control": "public, max-age=31536000, immutable"},
+    )
+
+
 @app.exception_handler(404)
 @app.get("/")
 async def index(request=None, exc=None):
-    return HTMLResponse(
-        content=open(
-            BASE_DIR / f"{settings.themesSelect}/index.html", "r", encoding="utf-8"
-        )
+    theme_dir = BASE_DIR / settings.themesSelect
+    asset_version = str(int((theme_dir / "index.html").stat().st_mtime))
+    content = (
+        open(theme_dir / "index.html", "r", encoding="utf-8")
         .read()
         .replace("{{title}}", str(settings.name))
         .replace("{{description}}", str(settings.description))
         .replace("{{keywords}}", str(settings.keywords))
         .replace("{{opacity}}", str(settings.opacity))
-        .replace('"/assets/', '"assets/')
-        .replace("{{background}}", str(settings.background)),
+        .replace('"/assets/', '"/theme-assets/')
+        .replace('"assets/', '"/theme-assets/')
+        .replace("{{background}}", str(settings.background))
+    )
+    content = re.sub(
+        r'((?:theme-)?assets/[^"\']+\.(?:css|js|json|png))(["\'])',
+        rf"\1?v={asset_version}\2",
+        content,
+    )
+    return HTMLResponse(
+        content=content,
         media_type="text/html",
         headers={"Cache-Control": "no-cache"},
     )

scripts/patch_admin_timeline_ui.py

@@ -0,0 +1,175 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import gzip
+
+ASSETS_ROOT = Path('/app')
+
+
+def rewrite(path: Path, text: str) -> None:
+    path.write_text(text, encoding='utf-8')
+    gz_path = path.with_suffix(path.suffix + '.gz')
+    if gz_path.exists():
+        with gzip.open(gz_path, 'wb', compresslevel=9) as gz:
+            gz.write(text.encode('utf-8'))
+
+
+def patch_file_manage(path: Path) -> bool:
+    text = path.read_text(encoding='utf-8')
+    old = text
+    if 'detailTimeline:It(s.timeline||[])' in text and 'fcbxTimelineCollapsed' not in text:
+        text = text.replace(
+            'detailTimeline:It(s.timeline||[])}},nt=t=>',
+            'detailTimeline:It(s.timeline||[]),fcbxTimelineCollapsed:!0}},nt=t=>',
+            1,
+        )
+    render_old = 'N(e(b).detailTimeline,(n,K)=>(p(),f("div",{key:`${n.key}-${K}`,class:"grid grid-cols-[auto_minmax(0,1fr)] gap-3"}'
+    render_new = 'N((e(b).fcbxTimelineCollapsed&&e(b).detailTimeline.filter(ga=>ga.key==="retrieved_event").length>3)?e(b).detailTimeline.filter((ga,Qa)=>ga.key!=="retrieved_event"||e(b).detailTimeline.filter(Ja=>Ja.key==="retrieved_event").indexOf(ga)<3):e(b).detailTimeline,(n,K)=>(p(),f("div",{key:`${n.key}-${K}`,class:"grid grid-cols-[auto_minmax(0,1fr)] gap-3"}'
+    if render_old in text and 'ga.key==="retrieved_event"' not in text:
+        text = text.replace(render_old, render_new, 1)
+    close_old = ']))),128))],2)])):j("",!0),l("section",kn,'
+    close_new = ']))),128)),e(b).detailTimeline.filter(n=>n.key==="retrieved_event").length>3?(p(),f("button",{key:0,type:"button",class:o(["mt-3 rounded-lg border px-3 py-2 text-sm font-medium transition",[e(u)?"border-gray-600 text-gray-200 hover:bg-gray-700":"border-gray-200 text-gray-700 hover:bg-gray-50"]]),onClick:m[99]||(m[99]=n=>e(b).fcbxTimelineCollapsed=!e(b).fcbxTimelineCollapsed)},r(e(b).fcbxTimelineCollapsed?`展开全部取件记录（共 ${e(b).detailTimeline.filter(n=>n.key==="retrieved_event").length} 次）":"收起取件记录"),3)):j("",!0)],2)])):j("",!0),l("section",kn,'
+    if close_old in text and '展开全部取件记录' not in text:
+        text = text.replace(close_old, close_new, 1)
+    if text != old:
+        rewrite(path, text)
+        return True
+    return False
+
+
+def patch_clipboard(path: Path) -> bool:
+    text = path.read_text(encoding='utf-8')
+    old = text
+    marker = 'const y=async(a,e={})=>{'
+    if marker not in text or 'fcbx-copy-fallback' in text:
+        return False
+    start = text.index(marker)
+    end_marker = '},T=async(a,e={})=>{'
+    end = text.index(end_marker, start) + 1
+    replacement = '''const y=async(a,e={})=>{const{successMsg:t="复制成功",errorMsg:n="复制失败，请手动复制",showMsg:s=!0,notify:c}=e,l=(r,d)=>{s&&c?.(r,d)},q=()=>{try{window.prompt("复制下面内容",a)}catch{}};try{if(navigator.clipboard&&window.isSecureContext)try{await navigator.clipboard.writeText(a);return l(t,"success"),!0}catch{}const r=document.createElement("textarea");r.value=a,r.setAttribute("readonly","");r.className="fcbx-copy-fallback";r.style.cssText="position:fixed;left:0;top:0;width:1px;height:1px;opacity:0;z-index:-1";document.body.appendChild(r);r.focus();r.select();r.setSelectionRange(0,r.value.length);let d=!1;try{d=document.execCommand("copy")}finally{document.body.removeChild(r)}if(d)return l(t,"success"),!0;q();l("已打开手动复制窗口","warning");return!1}catch(r){return console.error("复制失败:",r),q(),l(n,"error"),!1}}'''
+    text = text[:start] + replacement + text[end:]
+    if text != old:
+        rewrite(path, text)
+        return True
+    return False
+
+
+def write_detail_collapse_script(theme_dir: Path) -> bool:
+    assets = theme_dir / 'assets'
+    index = theme_dir / 'index.html'
+    if not assets.exists() or not index.exists():
+        return False
+    js_path = assets / 'fcb-lifecycle-collapse-v3.js'
+    js = r'''(() => {
+  const LIFE_RE = /(生命周期|Lifecycle)/i;
+  const STATE = new WeakMap();
+  const getSection = section => {
+    const title = section.querySelector('h1,h2,h3,h4,h5');
+    if (!title || !LIFE_RE.test(title.textContent || '')) return null;
+    const box = title.nextElementSibling;
+    if (!box) return null;
+    return { title, box };
+  };
+  const getRows = section => {
+    const ctx = getSection(section);
+    if (!ctx) return [];
+    return [...ctx.box.children].filter(el => el instanceof HTMLElement);
+  };
+  const apply = section => {
+    const ctx = getSection(section);
+    if (!ctx) return;
+    const rows = [...ctx.box.children].filter(el => el instanceof HTMLElement);
+    if (rows.length <= 3) return;
+    const expanded = STATE.get(section) === true;
+    section.classList.toggle('fcbx-life-expanded', expanded);
+    rows.forEach((row, idx) => {
+      const shouldHide = idx >= 3 && !expanded;
+      row.classList.toggle('fcbx-life-row-extra', idx >= 3);
+      if (shouldHide) {
+        if (row.style.display !== 'none') row.style.setProperty('display', 'none', 'important');
+      } else if (row.style.display) {
+        row.style.removeProperty('display');
+      }
+    });
+    const btn = section.querySelector(':scope > .fcbx-life-toggle') || section.querySelector('.fcbx-life-toggle');
+    if (btn) {
+      btn.textContent = expanded ? '收起生命周期记录' : `展开全部生命周期记录（共 ${rows.length} 条）`;
+      btn.setAttribute('aria-expanded', expanded ? 'true' : 'false');
+    }
+  };
+  const ensureSection = section => {
+    const ctx = getSection(section);
+    if (!ctx) return;
+    const rows = [...ctx.box.children].filter(el => el instanceof HTMLElement);
+    if (rows.length <= 3) return;
+    if (!STATE.has(section)) STATE.set(section, false);
+    let btn = section.querySelector(':scope > .fcbx-life-toggle');
+    if (!btn) {
+      btn = document.createElement('button');
+      btn.type = 'button';
+      btn.className = 'fcbx-life-toggle mt-3 rounded-lg border px-3 py-2 text-sm font-medium transition';
+      btn.style.cssText = 'border-color:rgba(148,163,184,.55);display:inline-flex;align-items:center;gap:.35rem;touch-action:manipulation;user-select:none;cursor:pointer;';
+      btn.onclick = event => {
+        event.preventDefault();
+        event.stopPropagation();
+        STATE.set(section, STATE.get(section) !== true);
+        apply(section);
+      };
+      section.appendChild(btn);
+    }
+    apply(section);
+  };
+  const markRows = root => {
+    const scope = root?.querySelectorAll ? root : document;
+    scope.querySelectorAll('section').forEach(ensureSection);
+  };
+  let raf = 0;
+  const schedule = root => { cancelAnimationFrame(raf); raf = requestAnimationFrame(() => markRows(root)); };
+  window.addEventListener('hashchange', () => schedule(document));
+  document.addEventListener('DOMContentLoaded', () => schedule(document));
+  new MutationObserver(records => {
+    for (const rec of records) {
+      if ([...rec.addedNodes].some(n => n.nodeType === 1 && ((n.matches?.('section')) || n.querySelector?.('section')))) {
+        schedule(document);
+        break;
+      }
+    }
+  }).observe(document.body || document.documentElement, { childList: true, subtree: true });
+  schedule(document);
+})();'''
+    rewrite(js_path, js)
+    html = index.read_text(encoding='utf-8')
+    # Remove old detail-collapse injection so browsers cannot keep loading the stale “取件记录” script.
+    html = html.replace('<script src="assets/fcb-detail-collapse.js?v=20260709"></script>\n', '')
+    html = html.replace('<script src="assets/fcb-detail-collapse.js?v=20260709"></script>', '')
+    html = html.replace('<script src="assets/fcb-lifecycle-collapse.js?v=20260709-2"></script>\n', '')
+    html = html.replace('<script src="assets/fcb-lifecycle-collapse.js?v=20260709-2"></script>', '')
+    tag = '<script src="assets/fcb-lifecycle-collapse-v3.js"></script>'
+    if 'fcb-lifecycle-collapse-v3.js' not in html:
+        html = html.replace('</body>', tag + '\n</body>') if '</body>' in html else html + '\n' + tag + '\n'
+        index.write_text(html, encoding='utf-8')
+        gz = index.with_suffix(index.suffix + '.gz')
+        if gz.exists():
+            with gzip.open(gz, 'wb', compresslevel=9) as fh:
+                fh.write(html.encode('utf-8'))
+    return True
+
+
+def main() -> None:
+    changed = []
+    theme = ASSETS_ROOT / 'themes/2026'
+    assets = theme / 'assets'
+    if assets.exists():
+        # 只用独立 DOM 脚本处理生命周期收起，避免再改编译后的 FileManageView，
+        # 否则 Vue 内部状态和外部补丁会互相抢状态，导致展开/收起需要点多次。
+        for path in assets.glob('clipboard-*.js'):
+            if patch_clipboard(path):
+                changed.append(str(path.relative_to(ASSETS_ROOT)))
+        if write_detail_collapse_script(theme):
+            changed.append(str((assets / 'fcb-lifecycle-collapse-v3.js').relative_to(ASSETS_ROOT)))
+    if not changed:
+        raise SystemExit('admin timeline/clipboard patch markers not found or already patched')
+    print('patched admin assets:', ', '.join(changed))
+
+
+if __name__ == '__main__':
+    main()