fix: manager tenant root → NC Drive, /admin → vmis-backend (correct route)

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 <noreply@anthropic.com>
This commit is contained in:
VMIS Developer
2026-03-15 23:33:34 +08:00
parent cf1e26c2e9
commit 164b8f7ca8

View File

@@ -200,19 +200,13 @@ def _generate_tenant_route_yaml(tenant, is_active: bool) -> str:
lines = ["http:"] lines = ["http:"]
if tenant.is_manager: if tenant.is_manager:
# Manager 租戶:根路徑 redirect 到 /admin/admin 和 /api 指向 vmis-backend # Manager 租戶:/admin → vmis-backend/api vmis-backend,根路徑 → NC Drive
lines += [ lines += [
" middlewares:", " middlewares:",
" vmis-strip-admin:", " vmis-strip-admin:",
" stripPrefix:", " stripPrefix:",
' prefixes: ["/admin"]', ' prefixes: ["/admin"]',
"", "",
" vmis-redirect-admin:",
" redirectRegex:",
f' regex: "^https://{domain}/?$"',
f' replacement: "https://{domain}/admin/"',
" permanent: false",
"",
] ]
lines += [ lines += [
" routers:", " routers:",
@@ -233,22 +227,24 @@ def _generate_tenant_route_yaml(tenant, is_active: bool) -> str:
" certResolver: letsencrypt", " certResolver: letsencrypt",
" priority: 200", " priority: 200",
"", "",
f" {code}-root:", f" {code}-drive:",
f' rule: "Host(`{domain}`)"', f' rule: "Host(`{domain}`)"',
f" service: {code}-vmis", f" service: {code}-drive",
" entryPoints: [websecure]", " entryPoints: [websecure]",
" middlewares: [vmis-redirect-admin]",
" tls:", " tls:",
" certResolver: letsencrypt", " certResolver: letsencrypt",
" priority: 100",
"", "",
f" {code}-http:", f" {code}-http:",
f' rule: "Host(`{domain}`)"', f' rule: "Host(`{domain}`)"',
" entryPoints: [web]", " entryPoints: [web]",
" middlewares: [redirect-https]", " middlewares: [redirect-https]",
f" service: {code}-vmis", f" service: {code}-drive",
"", "",
" services:", " services:",
f" {code}-drive:",
" loadBalancer:",
" servers:",
f' - url: "{nc_url}"',
f" {code}-vmis:", f" {code}-vmis:",
" loadBalancer:", " loadBalancer:",
" servers:", " servers:",