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
+38 -4
View File
@@ -54,6 +54,12 @@ require_env() {
printf "%s" "${value}"
}
host_from_url() {
local value="$1"
value="${value#*://}"
printf "%s" "${value%%/*}"
}
show_help() {
cat << EOF
用法: ./scripts/deploy-prod.sh [选项]
@@ -151,7 +157,7 @@ validate_env() {
exit 1
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)"
caddy_domain="$(require_env CADDY_DOMAIN)"
caddy_email="$(require_env CADDY_EMAIL)"
@@ -160,6 +166,15 @@ validate_env() {
if [[ -z "${ops_domain}" ]]; then
ops_domain="ops.${caddy_domain}"
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)"
redis_addr="$(require_env REDIS_ADDR)"
storage_endpoint="$(require_env STORAGE_ENDPOINT)"
@@ -214,6 +229,14 @@ validate_env() {
log_error "OPS_DOMAIN 不能与主站或解忧商行域名相同"
exit 1
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
log_error "CADDY_EMAIL 需要填写真实邮箱,用于 ACME 证书通知"
exit 1
@@ -283,6 +306,7 @@ export_caddy_env() {
export CADDY_SHOW_DOMAIN
export TENANT_JIEYOU_DOMAIN
export OPS_DOMAIN
export DISTRIBUTION_ADMIN_DOMAIN
export VITE_OPS_DOMAIN
CADDY_DOMAIN="$(require_env CADDY_DOMAIN)"
CADDY_EMAIL="$(require_env CADDY_EMAIL)"
@@ -293,14 +317,23 @@ export_caddy_env() {
OPS_DOMAIN="ops.${CADDY_DOMAIN}"
fi
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
# 分销后台地址:未在 backend/.env 显式配置时,按 Caddyfile 的 distribution.<CADDY_DOMAIN>
# 推导,供 Caddy 镜像构建期注入主站前端的「打开独立分销后台」入口与开通凭证。
# Caddy、后端域名白名单和主站「打开独立分销后台」入口共用同一个后台域名。
VITE_DISTRIBUTION_ADMIN_URL="$(env_value VITE_DISTRIBUTION_ADMIN_URL || true)"
if [[ -z "${VITE_DISTRIBUTION_ADMIN_URL}" ]]; then
VITE_DISTRIBUTION_ADMIN_URL="https://distribution.${CADDY_DOMAIN}"
VITE_DISTRIBUTION_ADMIN_URL="https://${DISTRIBUTION_ADMIN_DOMAIN}"
fi
export DISTRIBUTION_ADMIN_DOMAIN
export VITE_DISTRIBUTION_ADMIN_URL
}
@@ -749,6 +782,7 @@ main() {
fi
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://$(env_value OPS_DOMAIN || printf 'ops.%s' "$(require_env CADDY_DOMAIN)")"
if [[ -n "$(env_value CADDY_SHOW_DOMAIN || true)" ]]; then