From 3d78c74b1b265b424867c8f3278ed2262a80e5ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Thu, 21 May 2026 17:00:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20500=20=E9=94=99=E8=AF=AF=E5=8F=8A=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=8C=81=E4=B9=85=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. nginx: location /file/ 改为 /api/file/（原路径未匹配到任何请求，
   /api/file/upload 被 /api/ 兜底路由转发给 tenant-service 导致 500）

2. docker-compose: file-service 增加 FILE_UPLOAD_DIR=/data/uploads
   和 FILE_BASE_URL=${CONSOLE_DOMAIN}，确保文件写入持久化卷且
   返回的下载 URL 指向私有服务器而非公有平台默认地址

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 config/nginx/conf.d/xuqm.conf | 4 ++--
 docker-compose.yml            | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/nginx/conf.d/xuqm.conf b/config/nginx/conf.d/xuqm.conf
index 98b2471..ec1b14e 100644
--- a/config/nginx/conf.d/xuqm.conf
+++ b/config/nginx/conf.d/xuqm.conf
@@ -67,8 +67,8 @@ server {
     proxy_read_timeout 60s;
   }
 
-  # 文件上传下载
-  location /file/ {
+  # 文件上传下载 — 必须在通用 /api/ 之前
+  location /api/file/ {
     set $svc file-service;
     proxy_pass             http://$svc:8086;
     proxy_set_header       Host $host;
diff --git a/docker-compose.yml b/docker-compose.yml
index 5c06462..9cfb60e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,6 +58,8 @@ services:
       SPRING_DATA_REDIS_HOST: "${REDIS_HOST}"
       SPRING_DATA_REDIS_PORT: "${REDIS_PORT:-6379}"
       SPRING_DATA_REDIS_DATABASE: "${REDIS_DATABASE:-0}"
+      FILE_UPLOAD_DIR: "/data/uploads"
+      FILE_BASE_URL: "${CONSOLE_DOMAIN}"
     volumes:
       - ./data/uploads:/data/uploads   # 上传文件持久化目录
     restart: unless-stopped