fix(distribution): 修复分销后台域名登录被拦截

This commit is contained in:
yml
2026-11-17 15:31:21 +08:00
parent 45cc092159
commit d5f45e1027
12 changed files with 133 additions and 13 deletions
+1 -1
View File
@@ -25,7 +25,7 @@
- 分销管理后台:`http://localhost:5190`(在主站后台“分销站点”开通站点并配置分销操作员登录) - 分销管理后台:`http://localhost:5190`(在主站后台“分销站点”开通站点并配置分销操作员登录)
- 分销专属前台:`http://localhost:5191`(独立端口隔离,支持 Host 域名与 X-Distribution-Site 头识别站点) - 分销专属前台:`http://localhost:5191`(独立端口隔离,支持 Host 域名与 X-Distribution-Site 头识别站点)
> 生产环境不使用上述端口:Caddy 按域名分流,主站和解忧商行后台分别通过各自经营域名进入,分销管理后台固定为 `https://distribution.<CADDY_DOMAIN>`,平台运营统计后台使用 `OPS_DOMAIN`,未配置时默认 `https://ops.<CADDY_DOMAIN>`(见 `deploy/caddy/Caddyfile`)。主站后台的「打开独立分销后台」与开通凭证通过构建期 `VITE_DISTRIBUTION_ADMIN_URL` 注入该地址;未配置时按当前主站域名推导。 > 生产环境不使用上述端口:Caddy 按域名分流,主站和解忧商行后台分别通过各自经营域名进入,分销管理后台默认使用 `https://distribution.<CADDY_DOMAIN>`,可由 `DISTRIBUTION_ADMIN_DOMAIN` 覆盖;平台运营统计后台使用 `OPS_DOMAIN`,未配置时默认 `https://ops.<CADDY_DOMAIN>`(见 `deploy/caddy/Caddyfile`)。主站后台的「打开独立分销后台」与开通凭证通过构建期 `VITE_DISTRIBUTION_ADMIN_URL` 注入该地址;未配置时按 `DISTRIBUTION_ADMIN_DOMAIN` 推导。
如需拆分调试,可手动执行: 如需拆分调试,可手动执行:
+1
View File
@@ -25,6 +25,7 @@ JWT_SECRET=change-me
CADDY_DOMAIN= CADDY_DOMAIN=
TENANT_JIEYOU_DOMAIN= TENANT_JIEYOU_DOMAIN=
OPS_DOMAIN=ops.localhost OPS_DOMAIN=ops.localhost
DISTRIBUTION_ADMIN_DOMAIN=distribution.localhost
# 前端后台页面入口;本地默认 /admin,生产建议改成不公开的单段路径。 # 前端后台页面入口;本地默认 /admin,生产建议改成不公开的单段路径。
VITE_ADMIN_BASE_PATH=/admin VITE_ADMIN_BASE_PATH=/admin
+3
View File
@@ -10,6 +10,9 @@ TENANT_JIEYOU_DOMAIN=zuhaox.com
# 平台运营统计后台域名;留空时生产环境按 ops.<CADDY_DOMAIN> 推导。 # 平台运营统计后台域名;留空时生产环境按 ops.<CADDY_DOMAIN> 推导。
# Caddy、前端构建和后端必须使用同一个域名。 # Caddy、前端构建和后端必须使用同一个域名。
OPS_DOMAIN= OPS_DOMAIN=
# 分销管理后台域名;留空时生产环境按 distribution.<CADDY_DOMAIN> 推导。
# Caddy、前端构建和后端域名白名单必须使用同一个域名。
# DISTRIBUTION_ADMIN_DOMAIN=distribution.hfb.221329.cc.cd
# 选号网(hfb_show)独立域名,与主站同机;不部署选号网可留空。 # 选号网(hfb_show)独立域名,与主站同机;不部署选号网可留空。
# CADDY_SHOW_DOMAIN=show.example.com # CADDY_SHOW_DOMAIN=show.example.com
# 选号网源码目录(相对 hfb_sys 根或绝对路径),默认 ../hfb_show # 选号网源码目录(相对 hfb_sys 根或绝对路径),默认 ../hfb_show
+19
View File
@@ -27,6 +27,7 @@ type Config struct {
PrimaryDomain string PrimaryDomain string
TenantJieyouDomain string TenantJieyouDomain string
OpsDomain string OpsDomain string
DistributionAdminDomain string
Storage StorageConfig Storage StorageConfig
StorageMirror StorageConfig StorageMirror StorageConfig
SMS SMSConfig SMS SMSConfig
@@ -110,6 +111,11 @@ func Load() Config {
PrimaryDomain: primaryDomain, PrimaryDomain: primaryDomain,
TenantJieyouDomain: strings.TrimSpace(getEnv("TENANT_JIEYOU_DOMAIN", "")), TenantJieyouDomain: strings.TrimSpace(getEnv("TENANT_JIEYOU_DOMAIN", "")),
OpsDomain: opsDomain(appEnv, getEnv("OPS_DOMAIN", ""), primaryDomain), OpsDomain: opsDomain(appEnv, getEnv("OPS_DOMAIN", ""), primaryDomain),
DistributionAdminDomain: distributionAdminDomain(
appEnv,
getEnv("DISTRIBUTION_ADMIN_DOMAIN", ""),
primaryDomain,
),
Storage: StorageConfig{ Storage: StorageConfig{
Endpoint: getEnv("STORAGE_ENDPOINT", "http://localhost:19090"), Endpoint: getEnv("STORAGE_ENDPOINT", "http://localhost:19090"),
Bucket: getEnv("STORAGE_BUCKET", "hfb-sys"), Bucket: getEnv("STORAGE_BUCKET", "hfb-sys"),
@@ -176,6 +182,19 @@ func opsDomain(appEnv string, value string, primaryDomain string) string {
return "ops.localhost" return "ops.localhost"
} }
func distributionAdminDomain(appEnv string, value string, primaryDomain string) string {
if domain := strings.TrimSpace(value); domain != "" {
return domain
}
if strings.EqualFold(strings.TrimSpace(appEnv), "production") {
if primary := strings.TrimSpace(primaryDomain); primary != "" {
return "distribution." + primary
}
return ""
}
return "distribution.localhost"
}
func (c Config) ValidateProductionSecurity() error { func (c Config) ValidateProductionSecurity() error {
if !IsProductionEnv(c.AppEnv) { if !IsProductionEnv(c.AppEnv) {
return nil return nil
+28
View File
@@ -48,6 +48,34 @@ func TestOpsDomain(t *testing.T) {
} }
} }
func TestDistributionAdminDomain(t *testing.T) {
cases := []struct {
name string
appEnv string
value string
primary string
expected string
}{
{name: "开发默认", appEnv: "development", expected: "distribution.localhost"},
{name: "生产按主域推导", appEnv: "production", primary: "hao858.com", expected: "distribution.hao858.com"},
{
name: "显式覆盖",
appEnv: "production",
value: "dist-admin.example.com",
primary: "hao858.com",
expected: "dist-admin.example.com",
},
{name: "生产无主域", appEnv: "production", expected: ""},
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
if got := distributionAdminDomain(tc.appEnv, tc.value, tc.primary); got != tc.expected {
t.Fatalf("distributionAdminDomain() = %q, want %q", got, tc.expected)
}
})
}
}
func TestLoadDatabaseConfigFromEnvironment(t *testing.T) { func TestLoadDatabaseConfigFromEnvironment(t *testing.T) {
t.Setenv("DATABASE_MAX_OPEN_CONNS", "80") t.Setenv("DATABASE_MAX_OPEN_CONNS", "80")
t.Setenv("DATABASE_MAX_IDLE_CONNS", "16") t.Setenv("DATABASE_MAX_IDLE_CONNS", "16")
+22 -1
View File
@@ -16,11 +16,22 @@ import (
// RequireKnownApplicationHost prevents unknown hosts from falling through to // RequireKnownApplicationHost prevents unknown hosts from falling through to
// legacy unscoped handlers when the application is reached without the Caddy // legacy unscoped handlers when the application is reached without the Caddy
// on-demand TLS guard. // on-demand TLS guard.
func RequireKnownApplicationHost(appEnv string) gin.HandlerFunc { func RequireKnownApplicationHost(appEnv string, extraKnownHosts ...string) gin.HandlerFunc {
if !config.IsProductionEnv(appEnv) { if !config.IsProductionEnv(appEnv) {
return func(c *gin.Context) { c.Next() } return func(c *gin.Context) { c.Next() }
} }
knownHosts := make(map[string]struct{}, len(extraKnownHosts))
for _, rawHost := range extraKnownHosts {
if host := normalizeKnownHost(rawHost); host != "" {
knownHosts[host] = struct{}{}
}
}
return func(c *gin.Context) { return func(c *gin.Context) {
requestHost := sitecode.ExtractHost(c.Request.Host)
if _, ok := knownHosts[requestHost]; ok {
c.Next()
return
}
if platformscope.IsScope(c.Request.Context()) || if platformscope.IsScope(c.Request.Context()) ||
tenancy.IDFromContext(c.Request.Context()) > 0 || tenancy.IDFromContext(c.Request.Context()) > 0 ||
sitecode.HasDomainScope(c.Request.Context()) || sitecode.HasDomainScope(c.Request.Context()) ||
@@ -33,6 +44,16 @@ func RequireKnownApplicationHost(appEnv string) gin.HandlerFunc {
} }
} }
func normalizeKnownHost(raw string) string {
host := strings.TrimSpace(raw)
host = strings.TrimPrefix(host, "https://")
host = strings.TrimPrefix(host, "http://")
if slash := strings.IndexByte(host, '/'); slash >= 0 {
host = host[:slash]
}
return sitecode.ExtractHost(host)
}
func isInfrastructureOrCallbackPath(path string) bool { func isInfrastructureOrCallbackPath(path string) bool {
switch path { switch path {
case "/health", "/health/ready", "/api/health", "/api/site/check-domain": case "/health", "/health/ready", "/api/health", "/api/site/check-domain":
+12 -3
View File
@@ -13,15 +13,16 @@ import (
func TestRequireKnownApplicationHostFailsClosedOnlyInProduction(t *testing.T) { func TestRequireKnownApplicationHostFailsClosedOnlyInProduction(t *testing.T) {
gin.SetMode(gin.TestMode) gin.SetMode(gin.TestMode)
newEngine := func(appEnv string) *gin.Engine { newEngine := func(appEnv string, extraKnownHosts ...string) *gin.Engine {
engine := gin.New() engine := gin.New()
engine.Use(RequireKnownApplicationHost(appEnv)) engine.Use(RequireKnownApplicationHost(appEnv, extraKnownHosts...))
engine.GET("/api/listings", func(c *gin.Context) { c.Status(http.StatusOK) }) engine.GET("/api/listings", func(c *gin.Context) { c.Status(http.StatusOK) })
engine.POST("/api/distribution/auth/login", func(c *gin.Context) { c.Status(http.StatusOK) })
engine.POST("/api/payments/leshua/notify", func(c *gin.Context) { c.Status(http.StatusOK) }) engine.POST("/api/payments/leshua/notify", func(c *gin.Context) { c.Status(http.StatusOK) })
return engine return engine
} }
production := newEngine("production") production := newEngine("production", "https://distribution.hao858.com/")
req := httptest.NewRequest(http.MethodGet, "http://unknown.example.com/api/listings", nil) req := httptest.NewRequest(http.MethodGet, "http://unknown.example.com/api/listings", nil)
req.Host = "unknown.example.com" req.Host = "unknown.example.com"
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
@@ -30,6 +31,14 @@ func TestRequireKnownApplicationHostFailsClosedOnlyInProduction(t *testing.T) {
t.Fatalf("unknown production host status = %d, want 404", rec.Code) t.Fatalf("unknown production host status = %d, want 404", rec.Code)
} }
req = httptest.NewRequest(http.MethodPost, "http://distribution.hao858.com/api/distribution/auth/login", nil)
req.Host = "distribution.hao858.com"
rec = httptest.NewRecorder()
production.ServeHTTP(rec, req)
if rec.Code != http.StatusOK {
t.Fatalf("distribution admin host status = %d, want 200", rec.Code)
}
req = httptest.NewRequest(http.MethodPost, "http://callback.example.com/api/payments/leshua/notify", nil) req = httptest.NewRequest(http.MethodPost, "http://callback.example.com/api/payments/leshua/notify", nil)
req.Host = "callback.example.com" req.Host = "callback.example.com"
rec = httptest.NewRecorder() rec = httptest.NewRecorder()
+1 -1
View File
@@ -378,7 +378,7 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
if distributionRepo != nil { if distributionRepo != nil {
engine.Use(middleware.SiteDomainFallback(distributionRepo, logger)) engine.Use(middleware.SiteDomainFallback(distributionRepo, logger))
} }
engine.Use(middleware.RequireKnownApplicationHost(cfg.AppEnv)) engine.Use(middleware.RequireKnownApplicationHost(cfg.AppEnv, cfg.DistributionAdminDomain))
engine.Use(middleware.PlatformOpsReadOnlyGuard()) engine.Use(middleware.PlatformOpsReadOnlyGuard())
distributionHandler := distribution.NewHandler(distributionService) distributionHandler := distribution.NewHandler(distributionService)
if invitationHandler != nil && distributionService != nil { if invitationHandler != nil && distributionService != nil {
+5 -2
View File
@@ -5,6 +5,7 @@
```text ```text
https://主站域名 # CADDY_DOMAIN,哈夫币系统 https://主站域名 # CADDY_DOMAIN,哈夫币系统
https://OPS_DOMAIN # 平台运营只读统计后台,仅平台超级管理员;默认 ops.主站域名 https://OPS_DOMAIN # 平台运营只读统计后台,仅平台超级管理员;默认 ops.主站域名
https://DISTRIBUTION_ADMIN_DOMAIN # 历史分销管理后台;默认 distribution.主站域名
https://选号网域名 # CADDY_SHOW_DOMAIN(可选),hfb_show 静态选号站 https://选号网域名 # CADDY_SHOW_DOMAIN(可选),hfb_show 静态选号站
https://monitor.主站域名 # Beszel 监控 https://monitor.主站域名 # Beszel 监控
``` ```
@@ -13,7 +14,7 @@ https://monitor.主站域名 # Beszel 监控
部署前请确认: 部署前请确认:
- 主站域名和 `OPS_DOMAIN`(默认 `ops.主站域名`)A 记录已解析到服务器公网 IP;启用选号网时,选号网域名也要解析到同一 IP。 - 主站域名、`OPS_DOMAIN`(默认 `ops.主站域名`)和 `DISTRIBUTION_ADMIN_DOMAIN`(默认 `distribution.主站域名`)的 A 记录已解析到服务器公网 IP;启用选号网时,选号网域名也要解析到同一 IP。
- 服务器安全组或防火墙已放行 `80/tcp` 和 `443/tcp`。 - 服务器安全组或防火墙已放行 `80/tcp` 和 `443/tcp`。
- 服务器上没有其他服务占用 `80`、`443`。 - 服务器上没有其他服务占用 `80`、`443`。
- 国内服务器如需对外访问,请先确认域名备案和云厂商限制。 - 国内服务器如需对外访问,请先确认域名备案和云厂商限制。
@@ -31,6 +32,7 @@ CADDY_DOMAIN
CADDY_EMAIL CADDY_EMAIL
TENANT_JIEYOU_DOMAIN TENANT_JIEYOU_DOMAIN
OPS_DOMAIN OPS_DOMAIN
DISTRIBUTION_ADMIN_DOMAIN
MYSQL_ROOT_PASSWORD MYSQL_ROOT_PASSWORD
MYSQL_PASSWORD MYSQL_PASSWORD
MYSQL_DSN MYSQL_DSN
@@ -197,7 +199,7 @@ set +a
docker compose -f deploy/docker-compose.prod.yml up -d --build docker compose -f deploy/docker-compose.prod.yml up -d --build
``` ```
手动执行 `docker compose` 时需要先导出 `CADDY_DOMAIN`、`CADDY_EMAIL`、`TENANT_JIEYOU_DOMAIN` 和 `OPS_DOMAIN`,否则 Caddy 无法读取证书域名、解忧后台和平台运营后台入口配置。`OPS_DOMAIN` 留空时部署脚本会使用 `ops.<CADDY_DOMAIN>`。优先推荐使用一键部署脚本,它会自动计算并导出这些变量。 手动执行 `docker compose` 时需要先导出 `CADDY_DOMAIN`、`CADDY_EMAIL`、`TENANT_JIEYOU_DOMAIN`、`OPS_DOMAIN` 和 `DISTRIBUTION_ADMIN_DOMAIN`,否则 Caddy 无法读取证书域名、解忧后台、平台运营后台和分销管理后台入口配置。`OPS_DOMAIN` 留空时使用 `ops.<CADDY_DOMAIN>`,`DISTRIBUTION_ADMIN_DOMAIN` 留空时使用 `distribution.<CADDY_DOMAIN>`。优先推荐使用一键部署脚本,它会自动计算并导出这些变量。
## 4. 手动执行数据库迁移 ## 4. 手动执行数据库迁移
@@ -233,6 +235,7 @@ curl "https://选号网域名/api/listings?page=1&page_size=1"
https://主站域名 https://主站域名
https://主站域名/你配置的后台入口/login https://主站域名/你配置的后台入口/login
https://OPS_DOMAIN/你配置的后台入口/login # 平台运营统计后台 https://OPS_DOMAIN/你配置的后台入口/login # 平台运营统计后台
https://DISTRIBUTION_ADMIN_DOMAIN/login # 分销管理后台
https://选号网域名 # 选号网首页 https://选号网域名 # 选号网首页
``` ```
+1 -1
View File
@@ -122,7 +122,7 @@
} }
# 分销管理后台使用独立 React + Ant Design 静态资源,API 与主站复用 backend。 # 分销管理后台使用独立 React + Ant Design 静态资源,API 与主站复用 backend。
distribution.{$CADDY_DOMAIN} { {$DISTRIBUTION_ADMIN_DOMAIN} {
encode zstd gzip encode zstd gzip
import public_api import public_api
handle { handle {
+2
View File
@@ -15,6 +15,7 @@ services:
CADDY_EMAIL: ${CADDY_EMAIL:?请先导出 CADDY_EMAIL,或使用 scripts/deploy-prod.sh 部署} CADDY_EMAIL: ${CADDY_EMAIL:?请先导出 CADDY_EMAIL,或使用 scripts/deploy-prod.sh 部署}
TENANT_JIEYOU_DOMAIN: ${TENANT_JIEYOU_DOMAIN:-tenant-jieyou.invalid} TENANT_JIEYOU_DOMAIN: ${TENANT_JIEYOU_DOMAIN:-tenant-jieyou.invalid}
OPS_DOMAIN: ${OPS_DOMAIN:-ops.${CADDY_DOMAIN}} OPS_DOMAIN: ${OPS_DOMAIN:-ops.${CADDY_DOMAIN}}
DISTRIBUTION_ADMIN_DOMAIN: ${DISTRIBUTION_ADMIN_DOMAIN:-distribution.${CADDY_DOMAIN}}
# Caddyfile 用它放行主站后台隐藏入口,并与前端构建期的 VITE_ADMIN_BASE_PATH 保持一致。 # Caddyfile 用它放行主站后台隐藏入口,并与前端构建期的 VITE_ADMIN_BASE_PATH 保持一致。
ADMIN_BASE_PATH: ${VITE_ADMIN_BASE_PATH:-/manage-7x9k2p} ADMIN_BASE_PATH: ${VITE_ADMIN_BASE_PATH:-/manage-7x9k2p}
# 选号网域名可选;未配置时 conf.d 为空,不影响主站 # 选号网域名可选;未配置时 conf.d 为空,不影响主站
@@ -46,6 +47,7 @@ services:
- ../backend/.env - ../backend/.env
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
DISTRIBUTION_ADMIN_DOMAIN: ${DISTRIBUTION_ADMIN_DOMAIN:-distribution.${CADDY_DOMAIN}}
volumes: volumes:
- mysql_data:/var/lib/mysql - mysql_data:/var/lib/mysql
- ./mysql/my.cnf:/etc/mysql/conf.d/my.cnf:ro - ./mysql/my.cnf:/etc/mysql/conf.d/my.cnf:ro
+38 -4
View File
@@ -54,6 +54,12 @@ require_env() {
printf "%s" "${value}" printf "%s" "${value}"
} }
host_from_url() {
local value="$1"
value="${value#*://}"
printf "%s" "${value%%/*}"
}
show_help() { show_help() {
cat << EOF cat << EOF
用法: ./scripts/deploy-prod.sh [选项] 用法: ./scripts/deploy-prod.sh [选项]
@@ -151,7 +157,7 @@ validate_env() {
exit 1 exit 1
fi fi
local app_env caddy_domain caddy_email jieyou_domain ops_domain mysql_dsn redis_addr storage_endpoint backend_uid backend_gid backup_dir backup_status_dir backup_restore_dir backup_oss_uri backup_user local app_env caddy_domain caddy_email jieyou_domain ops_domain distribution_admin_domain mysql_dsn redis_addr storage_endpoint backend_uid backend_gid backup_dir backup_status_dir backup_restore_dir backup_oss_uri backup_user
app_env="$(require_env APP_ENV)" app_env="$(require_env APP_ENV)"
caddy_domain="$(require_env CADDY_DOMAIN)" caddy_domain="$(require_env CADDY_DOMAIN)"
caddy_email="$(require_env CADDY_EMAIL)" caddy_email="$(require_env CADDY_EMAIL)"
@@ -160,6 +166,15 @@ validate_env() {
if [[ -z "${ops_domain}" ]]; then if [[ -z "${ops_domain}" ]]; then
ops_domain="ops.${caddy_domain}" ops_domain="ops.${caddy_domain}"
fi fi
distribution_admin_domain="$(env_value DISTRIBUTION_ADMIN_DOMAIN || true)"
if [[ -z "${distribution_admin_domain}" ]]; then
distribution_admin_domain="$(env_value VITE_DISTRIBUTION_ADMIN_URL || true)"
if [[ -n "${distribution_admin_domain}" ]]; then
distribution_admin_domain="$(host_from_url "${distribution_admin_domain}")"
else
distribution_admin_domain="distribution.${caddy_domain}"
fi
fi
mysql_dsn="$(require_env MYSQL_DSN)" mysql_dsn="$(require_env MYSQL_DSN)"
redis_addr="$(require_env REDIS_ADDR)" redis_addr="$(require_env REDIS_ADDR)"
storage_endpoint="$(require_env STORAGE_ENDPOINT)" storage_endpoint="$(require_env STORAGE_ENDPOINT)"
@@ -214,6 +229,14 @@ validate_env() {
log_error "OPS_DOMAIN 不能与主站或解忧商行域名相同" log_error "OPS_DOMAIN 不能与主站或解忧商行域名相同"
exit 1 exit 1
fi fi
if [[ "${distribution_admin_domain}" == http://* || "${distribution_admin_domain}" == https://* || "${distribution_admin_domain}" == */* || "${distribution_admin_domain}" != *"."* ]]; then
log_error "DISTRIBUTION_ADMIN_DOMAIN 必须填写分销管理后台的正式域名,当前值:${distribution_admin_domain}"
exit 1
fi
if [[ "${distribution_admin_domain}" == "${caddy_domain}" || "${distribution_admin_domain}" == "${jieyou_domain}" || "${distribution_admin_domain}" == "${ops_domain}" ]]; then
log_error "DISTRIBUTION_ADMIN_DOMAIN 不能与主站、解忧商行或平台运营域名相同"
exit 1
fi
if [[ "${caddy_email}" == "admin@example.com" || "${caddy_email}" != *"@"* ]]; then if [[ "${caddy_email}" == "admin@example.com" || "${caddy_email}" != *"@"* ]]; then
log_error "CADDY_EMAIL 需要填写真实邮箱,用于 ACME 证书通知" log_error "CADDY_EMAIL 需要填写真实邮箱,用于 ACME 证书通知"
exit 1 exit 1
@@ -283,6 +306,7 @@ export_caddy_env() {
export CADDY_SHOW_DOMAIN export CADDY_SHOW_DOMAIN
export TENANT_JIEYOU_DOMAIN export TENANT_JIEYOU_DOMAIN
export OPS_DOMAIN export OPS_DOMAIN
export DISTRIBUTION_ADMIN_DOMAIN
export VITE_OPS_DOMAIN export VITE_OPS_DOMAIN
CADDY_DOMAIN="$(require_env CADDY_DOMAIN)" CADDY_DOMAIN="$(require_env CADDY_DOMAIN)"
CADDY_EMAIL="$(require_env CADDY_EMAIL)" CADDY_EMAIL="$(require_env CADDY_EMAIL)"
@@ -293,14 +317,23 @@ export_caddy_env() {
OPS_DOMAIN="ops.${CADDY_DOMAIN}" OPS_DOMAIN="ops.${CADDY_DOMAIN}"
fi fi
VITE_OPS_DOMAIN="${OPS_DOMAIN}" VITE_OPS_DOMAIN="${OPS_DOMAIN}"
DISTRIBUTION_ADMIN_DOMAIN="$(env_value DISTRIBUTION_ADMIN_DOMAIN || true)"
if [[ -z "${DISTRIBUTION_ADMIN_DOMAIN}" ]]; then
VITE_DISTRIBUTION_ADMIN_URL="$(env_value VITE_DISTRIBUTION_ADMIN_URL || true)"
if [[ -n "${VITE_DISTRIBUTION_ADMIN_URL}" ]]; then
DISTRIBUTION_ADMIN_DOMAIN="$(host_from_url "${VITE_DISTRIBUTION_ADMIN_URL}")"
else
DISTRIBUTION_ADMIN_DOMAIN="distribution.${CADDY_DOMAIN}"
fi
fi
export CADDY_SHOW_DOMAIN export CADDY_SHOW_DOMAIN
# 分销后台地址:未在 backend/.env 显式配置时,按 Caddyfile 的 distribution.<CADDY_DOMAIN> # Caddy、后端域名白名单和主站「打开独立分销后台」入口共用同一个后台域名。
# 推导,供 Caddy 镜像构建期注入主站前端的「打开独立分销后台」入口与开通凭证。
VITE_DISTRIBUTION_ADMIN_URL="$(env_value VITE_DISTRIBUTION_ADMIN_URL || true)" VITE_DISTRIBUTION_ADMIN_URL="$(env_value VITE_DISTRIBUTION_ADMIN_URL || true)"
if [[ -z "${VITE_DISTRIBUTION_ADMIN_URL}" ]]; then if [[ -z "${VITE_DISTRIBUTION_ADMIN_URL}" ]]; then
VITE_DISTRIBUTION_ADMIN_URL="https://distribution.${CADDY_DOMAIN}" VITE_DISTRIBUTION_ADMIN_URL="https://${DISTRIBUTION_ADMIN_DOMAIN}"
fi fi
export DISTRIBUTION_ADMIN_DOMAIN
export VITE_DISTRIBUTION_ADMIN_URL export VITE_DISTRIBUTION_ADMIN_URL
} }
@@ -749,6 +782,7 @@ main() {
fi fi
log_success "部署完成:$(public_url)" log_success "部署完成:$(public_url)"
log_success "分销管理后台:https://${DISTRIBUTION_ADMIN_DOMAIN}"
log_success "解忧商行后台:https://$(require_env TENANT_JIEYOU_DOMAIN)${VITE_ADMIN_BASE_PATH:-/manage-7x9k2p}/login" log_success "解忧商行后台:https://$(require_env TENANT_JIEYOU_DOMAIN)${VITE_ADMIN_BASE_PATH:-/manage-7x9k2p}/login"
log_success "平台运营统计后台:https://$(env_value OPS_DOMAIN || printf 'ops.%s' "$(require_env CADDY_DOMAIN)")" log_success "平台运营统计后台:https://$(env_value OPS_DOMAIN || printf 'ops.%s' "$(require_env CADDY_DOMAIN)")"
if [[ -n "$(env_value CADDY_SHOW_DOMAIN || true)" ]]; then if [[ -n "$(env_value CADDY_SHOW_DOMAIN || true)" ]]; then