fix(tenant): 收紧双站后台边界并补齐货架管理

This commit is contained in:
yml
2026-11-15 22:28:40 +08:00
parent a68eb815a9
commit 0cb385d84f
42 changed files with 831 additions and 97 deletions
+13 -1
View File
@@ -151,10 +151,11 @@ validate_env() {
exit 1
fi
local app_env caddy_domain caddy_email 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 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)"
jieyou_domain="$(require_env TENANT_JIEYOU_DOMAIN)"
mysql_dsn="$(require_env MYSQL_DSN)"
redis_addr="$(require_env REDIS_ADDR)"
storage_endpoint="$(require_env STORAGE_ENDPOINT)"
@@ -193,6 +194,14 @@ validate_env() {
log_error "CADDY_DOMAIN 必须填写可公网解析到本机的正式域名,当前值:${caddy_domain}"
exit 1
fi
if [[ "${jieyou_domain}" == http://* || "${jieyou_domain}" == https://* || "${jieyou_domain}" == */* || "${jieyou_domain}" != *"."* ]]; then
log_error "TENANT_JIEYOU_DOMAIN 必须填写解忧商行的正式域名,当前值:${jieyou_domain}"
exit 1
fi
if [[ "${jieyou_domain}" == "${caddy_domain}" ]]; then
log_error "TENANT_JIEYOU_DOMAIN 不能与 CADDY_DOMAIN 相同"
exit 1
fi
if [[ "${caddy_email}" == "admin@example.com" || "${caddy_email}" != *"@"* ]]; then
log_error "CADDY_EMAIL 需要填写真实邮箱,用于 ACME 证书通知"
exit 1
@@ -260,9 +269,11 @@ export_caddy_env() {
export CADDY_DOMAIN
export CADDY_EMAIL
export CADDY_SHOW_DOMAIN
export TENANT_JIEYOU_DOMAIN
CADDY_DOMAIN="$(require_env CADDY_DOMAIN)"
CADDY_EMAIL="$(require_env CADDY_EMAIL)"
CADDY_SHOW_DOMAIN="$(env_value CADDY_SHOW_DOMAIN || true)"
TENANT_JIEYOU_DOMAIN="$(require_env TENANT_JIEYOU_DOMAIN)"
export CADDY_SHOW_DOMAIN
# 分销后台地址:未在 backend/.env 显式配置时,按 Caddyfile 的 distribution.<CADDY_DOMAIN>
@@ -719,6 +730,7 @@ main() {
fi
log_success "部署完成:$(public_url)"
log_success "解忧商行后台:https://$(require_env TENANT_JIEYOU_DOMAIN)${VITE_ADMIN_BASE_PATH:-/manage-7x9k2p}/login"
log_success "平台运营统计后台:https://ops.$(require_env CADDY_DOMAIN)"
if [[ -n "$(env_value CADDY_SHOW_DOMAIN || true)" ]]; then
log_success "选号网:https://$(env_value CADDY_SHOW_DOMAIN)"