fix(tenant): 收紧双站运营提号与录单边界
This commit is contained in:
@@ -65,7 +65,7 @@ require_pattern "backend/internal/modules/order/queries.go" "offline_settlement_
|
||||
require_pattern "backend/internal/modules/order/queries.go" "page == 1 && len(rows) < pageSize" "订单列表首页面单扫描短路"
|
||||
|
||||
require_pattern "backend/internal/modules/pickup/repository.go" "p.pickup_no = ?" "提号列表提号单号唯一索引直达"
|
||||
require_pattern "backend/internal/modules/pickup/repository.go" "p.owner_id = (SELECT id FROM users WHERE phone = ?)" "提号列表号主手机号解析用户索引直达"
|
||||
require_pattern "backend/internal/modules/pickup/repository.go" "pickup_owner.id = p.owner_id AND pickup_owner.phone = ?" "提号列表号主手机号按已关联号主精确匹配"
|
||||
require_pattern "backend/internal/modules/pickup/repository.go" "page == 1 && len(rows) < pageSize" "提号列表首页面单扫描短路"
|
||||
|
||||
require_pattern "backend/internal/modules/dispute/query.go" "o.order_no = ?" "纠纷列表订单号唯一索引直达"
|
||||
|
||||
+21
-2
@@ -151,11 +151,15 @@ validate_env() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
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
|
||||
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
|
||||
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)"
|
||||
ops_domain="$(env_value OPS_DOMAIN || true)"
|
||||
if [[ -z "${ops_domain}" ]]; then
|
||||
ops_domain="ops.${caddy_domain}"
|
||||
fi
|
||||
mysql_dsn="$(require_env MYSQL_DSN)"
|
||||
redis_addr="$(require_env REDIS_ADDR)"
|
||||
storage_endpoint="$(require_env STORAGE_ENDPOINT)"
|
||||
@@ -202,6 +206,14 @@ validate_env() {
|
||||
log_error "TENANT_JIEYOU_DOMAIN 不能与 CADDY_DOMAIN 相同"
|
||||
exit 1
|
||||
fi
|
||||
if [[ "${ops_domain}" == http://* || "${ops_domain}" == https://* || "${ops_domain}" == */* || "${ops_domain}" != *"."* ]]; then
|
||||
log_error "OPS_DOMAIN 必须填写平台运营后台的正式域名,当前值:${ops_domain}"
|
||||
exit 1
|
||||
fi
|
||||
if [[ "${ops_domain}" == "${caddy_domain}" || "${ops_domain}" == "${jieyou_domain}" ]]; then
|
||||
log_error "OPS_DOMAIN 不能与主站或解忧商行域名相同"
|
||||
exit 1
|
||||
fi
|
||||
if [[ "${caddy_email}" == "admin@example.com" || "${caddy_email}" != *"@"* ]]; then
|
||||
log_error "CADDY_EMAIL 需要填写真实邮箱,用于 ACME 证书通知"
|
||||
exit 1
|
||||
@@ -270,10 +282,17 @@ export_caddy_env() {
|
||||
export CADDY_EMAIL
|
||||
export CADDY_SHOW_DOMAIN
|
||||
export TENANT_JIEYOU_DOMAIN
|
||||
export OPS_DOMAIN
|
||||
export VITE_OPS_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)"
|
||||
OPS_DOMAIN="$(env_value OPS_DOMAIN || true)"
|
||||
if [[ -z "${OPS_DOMAIN}" ]]; then
|
||||
OPS_DOMAIN="ops.${CADDY_DOMAIN}"
|
||||
fi
|
||||
VITE_OPS_DOMAIN="${OPS_DOMAIN}"
|
||||
export CADDY_SHOW_DOMAIN
|
||||
|
||||
# 分销后台地址:未在 backend/.env 显式配置时,按 Caddyfile 的 distribution.<CADDY_DOMAIN>
|
||||
@@ -731,7 +750,7 @@ main() {
|
||||
|
||||
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)"
|
||||
log_success "平台运营统计后台:https://$(env_value OPS_DOMAIN || printf 'ops.%s' "$(require_env CADDY_DOMAIN)")"
|
||||
if [[ -n "$(env_value CADDY_SHOW_DOMAIN || true)" ]]; then
|
||||
log_success "选号网:https://$(env_value CADDY_SHOW_DOMAIN)"
|
||||
fi
|
||||
|
||||
@@ -581,9 +581,11 @@ start_frontend() {
|
||||
log "启动前端:http://localhost:${FRONTEND_PORT}"
|
||||
(
|
||||
cd "${FRONTEND_DIR}"
|
||||
load_env_file "${BACKEND_ENV}"
|
||||
export DEV_FRONTEND_PORT="${FRONTEND_PORT}"
|
||||
export DEV_BACKEND_PORT="${BACKEND_PORT}"
|
||||
export VITE_API_PROXY_TARGET="${VITE_API_PROXY_TARGET:-http://127.0.0.1:${BACKEND_PORT}}"
|
||||
export VITE_OPS_DOMAIN="${VITE_OPS_DOMAIN:-${OPS_DOMAIN:-ops.localhost}}"
|
||||
npm run dev
|
||||
) &
|
||||
FRONTEND_PID="$!"
|
||||
|
||||
Reference in New Issue
Block a user