From 03878848ddfbbcf368af1c22289197110d567d3c Mon Sep 17 00:00:00 2001
From: whm <973418690@qq.com>
Date: Mon, 23 Mar 2026 18:10:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(nginx):=20=E7=A7=BB=E9=99=A4=20/admin/asset?=
 =?UTF-8?q?s/=20rewrite=20=E5=9D=97=EF=BC=8C=E9=81=BF=E5=85=8D=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=20proxy=5Fpass=20=E8=BF=94=E5=9B=9E=20500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/deploy/README.md b/deploy/README.md
index 6cfe821..da09a74 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -15,3 +15,4 @@
 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`**。
+5. **若出现 500**：外层 `yuheng.docker.conf.tpl` 仅用 **`location /admin/`** 反代即可（勿对 `/admin/assets/` 再写 `rewrite` + 变量 `proxy_pass`，部分环境会 **500**）；白屏仍以 **内层** `deploy/admin/default.conf` 的 `^~ /assets/` 为准。
diff --git a/nginx/yuheng.docker.conf.tpl b/nginx/yuheng.docker.conf.tpl
index d0f5b73..92887c5 100644
--- a/nginx/yuheng.docker.conf.tpl
+++ b/nginx/yuheng.docker.conf.tpl
@@ -26,18 +26,7 @@ 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;
-    }
-
+    # /admin/ 由下方 location 处理；勿再单独 rewrite /admin/assets（rewrite+变量 proxy_pass 易 500）
     location / {
         set $upstream_web web;
         proxy_pass http://$upstream_web:80;