From 164b8f7ca8abbb67bb5a7c4d149fcd19d6516964 Mon Sep 17 00:00:00 2001 From: VMIS Developer Date: Sun, 15 Mar 2026 23:33:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20manager=20tenant=20root=20=E2=86=92=20NC?= =?UTF-8?q?=20Drive,=20/admin=20=E2=86=92=20vmis-backend=20(correct=20rout?= =?UTF-8?q?e)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reverts incorrect redirect: root path now serves NC Drive directly. Manager tenant routes: /admin (priority 200) → vmis-backend, /api (priority 200) → vmis-backend, / → NC container. Co-Authored-By: Claude Sonnet 4.6 --- .../app/services/scheduler/schedule_tenant.py | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/backend/app/services/scheduler/schedule_tenant.py b/backend/app/services/scheduler/schedule_tenant.py index 63701b1..e1071fa 100644 --- a/backend/app/services/scheduler/schedule_tenant.py +++ b/backend/app/services/scheduler/schedule_tenant.py @@ -200,19 +200,13 @@ def _generate_tenant_route_yaml(tenant, is_active: bool) -> str: lines = ["http:"] if tenant.is_manager: - # Manager 租戶:根路徑 redirect 到 /admin,/admin 和 /api 指向 vmis-backend + # Manager 租戶:/admin → vmis-backend,/api → vmis-backend,根路徑 → NC Drive lines += [ " middlewares:", " vmis-strip-admin:", " stripPrefix:", ' prefixes: ["/admin"]', "", - " vmis-redirect-admin:", - " redirectRegex:", - f' regex: "^https://{domain}/?$"', - f' replacement: "https://{domain}/admin/"', - " permanent: false", - "", ] lines += [ " routers:", @@ -233,22 +227,24 @@ def _generate_tenant_route_yaml(tenant, is_active: bool) -> str: " certResolver: letsencrypt", " priority: 200", "", - f" {code}-root:", + f" {code}-drive:", f' rule: "Host(`{domain}`)"', - f" service: {code}-vmis", + f" service: {code}-drive", " entryPoints: [websecure]", - " middlewares: [vmis-redirect-admin]", " tls:", " certResolver: letsencrypt", - " priority: 100", "", f" {code}-http:", f' rule: "Host(`{domain}`)"', " entryPoints: [web]", " middlewares: [redirect-https]", - f" service: {code}-vmis", + f" service: {code}-drive", "", " services:", + f" {code}-drive:", + " loadBalancer:", + " servers:", + f' - url: "{nc_url}"', f" {code}-vmis:", " loadBalancer:", " servers:",