From 4896d64366a15efd662a5a86611c7c91401fcb6b Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 4 Aug 2026 17:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 2 +- deploy/admin/prod-build.sh | 2 +- deploy/admin/prod-deploy.sh | 2 +- deploy/app/prod-build.sh | 2 +- deploy/app/prod-deploy.sh | 4 ++-- deploy/console/prod-build.sh | 2 +- deploy/console/prod-deploy.sh | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 0828053e..4785b9ef 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ PUSH="${PUSH:-1}" case "$SERVICE" in console) CONTEXT="$REPO_ROOT/apps/services"; DOCKERFILE="$CONTEXT/Dockerfile.console" ;; admin) CONTEXT="$REPO_ROOT/apps/admin"; DOCKERFILE="$CONTEXT/Dockerfile" ;; - *) echo "未知服务: $SERVICE（应为 console|admin）"; exit 1 ;; + *) echo "未知服务: ${SERVICE}（应为 console|admin）"; exit 1 ;; esac [ -f "$DOCKERFILE" ] || { echo "✗ 找不到 Dockerfile: $DOCKERFILE"; exit 1; } diff --git a/deploy/admin/prod-build.sh b/deploy/admin/prod-build.sh index 216542c2..7b64c972 100755 --- a/deploy/admin/prod-build.sh +++ b/deploy/admin/prod-build.sh @@ -36,7 +36,7 @@ COMPANY="${2:-}" [ -n "$COMPANY" ] || COMPANY="$(pick_company)" registry_profile "$COMPANY" || exit 1 IMAGE_NAME="$(prod_image_name "$COMPANY" admin)" || exit 1 -green "✓ 目标仓库: $COMPANY（$COMPANY_DESC · $REGISTRY） 镜像: $IMAGE_NAME" +green "✓ 目标仓库: ${COMPANY}（$COMPANY_DESC · ${REGISTRY}） 镜像: $IMAGE_NAME" IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION" IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest" diff --git a/deploy/admin/prod-deploy.sh b/deploy/admin/prod-deploy.sh index 36128218..e835d874 100755 --- a/deploy/admin/prod-deploy.sh +++ b/deploy/admin/prod-deploy.sh @@ -91,7 +91,7 @@ env_profile || exit 1 : "${DEPLOY_HOST:?请在 prod-deploy.sh 的 env_profile($DEPLOY_ENV) 段填该环境 IP}" -green "✓ 目标环境: $DEPLOY_ENV（$ENV_DESC） 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR" +green "✓ 目标环境: ${DEPLOY_ENV}（${ENV_DESC}） 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR" # 生产环境改动不可逆，交互模式下再确认一次（无 TTY 的 CI/管道直接放行）。 if [ -t 0 ]; then printf " 确认部署（%s%s）到【%s】? [y/N]: " "$MODE" "${NEW_TAG:+ $NEW_TAG}" "$ENV_DESC" >&2 diff --git a/deploy/app/prod-build.sh b/deploy/app/prod-build.sh index 4f59ec0e..613aa84a 100755 --- a/deploy/app/prod-build.sh +++ b/deploy/app/prod-build.sh @@ -36,7 +36,7 @@ fi COMPANY="${2:-}" [ -n "$COMPANY" ] || COMPANY="$(pick_company)" registry_profile "$COMPANY" || exit 1 -green "✓ 目标仓库: $COMPANY（$COMPANY_DESC · $REGISTRY）" +green "✓ 目标仓库: ${COMPANY}（$COMPANY_DESC · ${REGISTRY}）" IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION" IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest" diff --git a/deploy/app/prod-deploy.sh b/deploy/app/prod-deploy.sh index db5c4706..bd3be016 100755 --- a/deploy/app/prod-deploy.sh +++ b/deploy/app/prod-deploy.sh @@ -88,7 +88,7 @@ region_profile() { # 远端部署目录由「应 DEPLOY_USER=root DEPLOY_KEY=/Users/liwei/Documents/key/alibaba_singapore.pem # ← 新加坡服务器 SSH 私钥（各区域不同） ;; - *) red "✗ 未知区域: $REGION（应为 ${REGIONS[*]// /|}）"; exit 1 ;; + *) red "✗ 未知区域: ${REGION}（应为 ${REGIONS[*]// /|}）"; exit 1 ;; esac } @@ -150,7 +150,7 @@ if [ -z "$APP_KEY" ]; then green " ✓ 应用: $APP_KEY" fi fi -is_app "$APP_KEY" || { red "✗ 未知应用: $APP_KEY（应为 $(app_keys | paste -sd '/' -)）"; exit 1; } +is_app "$APP_KEY" || { red "✗ 未知应用: ${APP_KEY}（应为 $(app_keys | paste -sd '/' -)）"; exit 1; } # 解析应用 → 远端部署目录（镜像与模板共用 voitrans 这套） APP_DISPLAY="$(app_field "$APP_KEY" 2)" diff --git a/deploy/console/prod-build.sh b/deploy/console/prod-build.sh index a44d62c9..eaeb3810 100755 --- a/deploy/console/prod-build.sh +++ b/deploy/console/prod-build.sh @@ -36,7 +36,7 @@ COMPANY="${2:-}" [ -n "$COMPANY" ] || COMPANY="$(pick_company)" registry_profile "$COMPANY" || exit 1 IMAGE_NAME="$(prod_image_name "$COMPANY" console)" || exit 1 -green "✓ 目标仓库: $COMPANY（$COMPANY_DESC · $REGISTRY） 镜像: $IMAGE_NAME" +green "✓ 目标仓库: ${COMPANY}（$COMPANY_DESC · ${REGISTRY}） 镜像: $IMAGE_NAME" IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION" IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest" diff --git a/deploy/console/prod-deploy.sh b/deploy/console/prod-deploy.sh index 11336a1f..40578de2 100755 --- a/deploy/console/prod-deploy.sh +++ b/deploy/console/prod-deploy.sh @@ -91,7 +91,7 @@ env_profile || exit 1 : "${DEPLOY_HOST:?请在 prod-deploy.sh 的 env_profile($DEPLOY_ENV) 段填该环境 IP}" -green "✓ 目标环境: $DEPLOY_ENV（$ENV_DESC） 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR" +green "✓ 目标环境: ${DEPLOY_ENV}（${ENV_DESC}） 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR" # 生产环境改动不可逆，交互模式下再确认一次（无 TTY 的 CI/管道直接放行）。 if [ -t 0 ]; then printf " 确认部署（%s%s）到【%s】? [y/N]: " "$MODE" "${NEW_TAG:+ $NEW_TAG}" "$ENV_DESC" >&2