From ee9394f410a74ea92cfa114e45af7b0dcf123e08 Mon Sep 17 00:00:00 2001
From: whm <973418690@qq.com>
Date: Mon, 23 Mar 2026 18:04:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(nginx):=20admin=20=E5=AF=B9=E9=BD=90=20asse?=
 =?UTF-8?q?ts=20=E9=85=8D=E7=BD=AE=EF=BC=9B443=20=E6=98=BE=E5=BC=8F=20/adm?=
 =?UTF-8?q?in/assets/=20=E5=8F=8D=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Made-with: Cursor
---
 deploy/README.md             |  1 +
 nginx/admin.conf             | 17 +++++++++++++++--
 nginx/yuheng.docker.conf.tpl | 12 ++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/deploy/README.md b/deploy/README.md
index c391d2b..6cfe821 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -14,3 +14,4 @@
 1. **确认 Nginx 配置已更新**：`deploy/admin/default.conf` 须含 `location ^~ /assets/` 且 `try_files $uri =404`（与仓库内 `admin/nginx.conf` 一致），挂载后重启 `admin` 容器。
 2. **确认 dist 完整**：`deploy/admin/dist/assets/` 下须有与 `index.html` 中 `<script type="module">` 引用**同名**的哈希文件；发版后应**整目录**替换 `dist`（勿只拷 `index.html`）。
 3. **本地重建**：在项目根按 `pull-and-restart.sh` 方式在 `admin/` 执行 `npm run build`，`vite.config` 中 `base` 须为 `'/admin/'`。
+4. **勿用旧版 `nginx/admin.conf`**：若曾把仅含 `location /` 的旧配置拷到服务器，会导致 `/assets/*.js` 全部变成 `index.html`（约 640B、MIME 错）。请以 **`deploy/admin/default.conf`** 或 **`admin/nginx.conf`** 为准，并 **`docker compose restart admin nginx`**。
diff --git a/nginx/admin.conf b/nginx/admin.conf
index 8795907..f62381e 100644
--- a/nginx/admin.conf
+++ b/nginx/admin.conf
@@ -1,9 +1,22 @@
-# 供 compose 中 admin 容器使用：宿主机挂载 admin/dist，SPA 回退
-# 外层 Nginx 把 /admin/ 转成 / 转发到本容器
+# 与 deploy/admin/default.conf、admin/nginx.conf 保持一致（勿再使用仅含 location / 的旧版，否则 /assets/*.js 会回退成 index.html → 白屏）
+# 外层 Nginx 已把 /admin/ 转成 / 转发到本容器
 server {
     listen 80;
     root /usr/share/nginx/html;
     index index.html;
+
+    location = /index.html {
+        add_header Cache-Control "no-cache, no-store, must-revalidate";
+        expires -1;
+    }
+
+    location ^~ /assets/ {
+        try_files $uri =404;
+        access_log off;
+        expires 7d;
+        add_header Cache-Control "public, immutable";
+    }
+
     location / {
         try_files $uri $uri/ /index.html;
     }
diff --git a/nginx/yuheng.docker.conf.tpl b/nginx/yuheng.docker.conf.tpl
index 10e5f22..d0f5b73 100644
--- a/nginx/yuheng.docker.conf.tpl
+++ b/nginx/yuheng.docker.conf.tpl
@@ -26,6 +26,18 @@ server {
         add_header Cache-Control "no-store";
     }
 
+    # ^~ 优先于 location /：strip /admin 后反代（rewrite+break 与变量 upstream 兼容，避免误走 web）
+    location ^~ /admin/assets/ {
+        rewrite ^/admin/(.*)$ /$1 break;
+        set $upstream_admin admin;
+        proxy_pass http://$upstream_admin:80;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
     location / {
         set $upstream_web web;
         proxy_pass http://$upstream_web:80;