优化

deploy/scripts/deploy-built-service.sh

@@ -30,12 +30,10 @@ case "$SERVICE" in
     ;;
 esac
 
-for file in "$ENV_FILE" "$COMPOSE_FILE"; do
-  if [ ! -f "$file" ]; then
-    echo "必需文件不存在: $file" >&2
-    exit 2
-  fi
-done
+if [ ! -f "$ENV_FILE" ]; then
+  echo "必需文件不存在: $ENV_FILE" >&2
+  exit 2
+fi
 
 env_file_has_key() {
   grep -q "^$1=" "$ENV_FILE"
@@ -45,6 +43,37 @@ env_file_value() {
   sed -n "s/^$1=//p" "$ENV_FILE" | tail -n 1 | tr -d '\r'
 }
 
+case "$SERVICE" in
+  gateway-overseas|lastleg-service|warehouse-overseas-service)
+    COMPOSE_FILE="deploy/docker-compose.overseas.yml"
+    PROJECT_NAME="firstleg-$DEPLOY_ENV-overseas"
+    ;;
+  event-bridge-service)
+    if ! env_file_has_key REGION_CODE; then
+      echo "部署 event-bridge-service 时，环境文件必须显式包含 REGION_CODE=CN 或 REGION_CODE=OVERSEAS" >&2
+      exit 2
+    fi
+    case "$(env_file_value REGION_CODE)" in
+      CN) ;;
+      OVERSEAS)
+        COMPOSE_FILE="deploy/docker-compose.overseas.yml"
+        PROJECT_NAME="firstleg-$DEPLOY_ENV-overseas"
+        ;;
+      *)
+        echo "部署 event-bridge-service 时，REGION_CODE 只能为 CN 或 OVERSEAS" >&2
+        exit 2
+        ;;
+    esac
+    ;;
+esac
+
+for file in "$ENV_FILE" "$COMPOSE_FILE"; do
+  if [ ! -f "$file" ]; then
+    echo "必需文件不存在: $file" >&2
+    exit 2
+  fi
+done
+
 if [ "$SERVICE" = "finance" ]; then
   for key in FINANCE_DB_URL FINANCE_DB_USERNAME FINANCE_DB_PASSWORD; do
     if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
@@ -54,6 +83,56 @@ if [ "$SERVICE" = "finance" ]; then
   done
 fi
 
+case "$SERVICE" in
+  gateway-overseas|lastleg-service|warehouse-overseas-service)
+    for key in NACOS_SERVER_ADDR OVERSEAS_NACOS_NAMESPACE INTERNAL_SERVICE_TOKEN JWT_ISSUER OVERSEAS_JWT_AUDIENCE JWT_JWK_SET_URI; do
+      if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+        echo "部署海外服务时，环境文件必须包含非空 $key" >&2
+        exit 2
+      fi
+    done
+    ;;
+esac
+
+if [ "$SERVICE" = "firstleg" ]; then
+  if ! env_file_has_key LASTLEG_EVENT_BRIDGE_URL || [ -z "$(env_file_value LASTLEG_EVENT_BRIDGE_URL)" ]; then
+    echo "部署 firstleg 时，环境文件必须包含非空 LASTLEG_EVENT_BRIDGE_URL" >&2
+    exit 2
+  fi
+fi
+
+if [ "$SERVICE" = "lastleg-service" ]; then
+  for key in LASTLEG_DB_URL LASTLEG_DB_USERNAME LASTLEG_DB_PASSWORD FIRSTLEG_EVENT_BRIDGE_URL DOMESTIC_WAREHOUSE_URL; do
+    if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+      echo "部署 lastleg-service 时，环境文件必须包含非空 $key" >&2
+      exit 2
+    fi
+  done
+fi
+
+if [ "$SERVICE" = "warehouse-overseas-service" ]; then
+  for key in WAREHOUSE_OVERSEAS_DB_URL WAREHOUSE_OVERSEAS_DB_USERNAME WAREHOUSE_OVERSEAS_DB_PASSWORD; do
+    if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+      echo "部署 warehouse-overseas-service 时，环境文件必须包含非空 $key" >&2
+      exit 2
+    fi
+  done
+fi
+
+if [ "$SERVICE" = "event-bridge-service" ]; then
+  if [ "$PROJECT_NAME" = "firstleg-$DEPLOY_ENV-overseas" ]; then
+    EVENT_BRIDGE_KEYS="EVENT_BRIDGE_OVERSEAS_DB_URL EVENT_BRIDGE_OVERSEAS_DB_USERNAME EVENT_BRIDGE_OVERSEAS_DB_PASSWORD EVENT_CONSUMER_URL"
+  else
+    EVENT_BRIDGE_KEYS="EVENT_BRIDGE_DB_URL EVENT_BRIDGE_DB_USERNAME EVENT_BRIDGE_DB_PASSWORD EVENT_CONSUMER_URL"
+  fi
+  for key in $EVENT_BRIDGE_KEYS; do
+    if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+      echo "部署 event-bridge-service 时，环境文件必须包含非空 $key" >&2
+      exit 2
+    fi
+  done
+fi
+
 if [ "$SERVICE" = "file" ]; then
   if ! env_file_has_key ROCKETMQ_NAME_SERVER || [ -z "$(env_file_value ROCKETMQ_NAME_SERVER)" ]; then
     echo "部署 file 服务时，环境文件必须包含非空 ROCKETMQ_NAME_SERVER" >&2
@@ -149,24 +228,25 @@ REMOTE_PREPARE
 echo "传输镜像到 $SSH_TARGET: $IMAGE"
 docker save "$IMAGE" | gzip -1 | run_ssh 'gzip -dc | docker load'
 
-run_ssh sh -s -- "$REMOTE_DIR" "$DEPLOY_ENV" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE" <<'REMOTE_DEPLOY'
+run_ssh sh -s -- "$REMOTE_DIR" "$DEPLOY_ENV" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE" "$PROJECT_NAME" <<'REMOTE_DEPLOY'
 set -eu
 remote_dir="$1"
 deploy_env="$2"
 image_repository="$3"
 image_tag="$4"
 service="$5"
+project_name="$6"
 cd "$remote_dir"
 export DEPLOY_ENV="$deploy_env"
 export IMAGE_REPOSITORY="$image_repository"
 export IMAGE_TAG="$image_tag"
 docker compose \
-  --project-name "firstleg-$deploy_env" \
+  --project-name "$project_name" \
   --env-file .env \
   -f docker-compose.yml \
   up -d --remove-orphans --pull never "$service"
 docker compose \
-  --project-name "firstleg-$deploy_env" \
+  --project-name "$project_name" \
   --env-file .env \
   -f docker-compose.yml \
   ps "$service"

deploy/scripts/deploy-development-service.sh

@@ -15,7 +15,8 @@ SSH_TARGET="${DEVELOPMENT_SSH_TARGET:-deploy@172.31.198.8}"
 SSH_KEY="${DEVELOPMENT_SSH_KEY:-/var/jenkins_home/.ssh/dev_deploy}"
 SSH_KNOWN_HOSTS="${DEVELOPMENT_SSH_KNOWN_HOSTS:-/var/jenkins_home/.ssh/known_hosts}"
 REMOTE_DIR="${DEVELOPMENT_DEPLOY_DIR:-/opt/firstleg/application}"
-COMPOSE_FILE="deploy/docker-compose.yml"
+COMPOSE_FILE="${DEPLOY_COMPOSE_FILE:-deploy/docker-compose.yml}"
+PROJECT_NAME="${DEPLOY_PROJECT_NAME:-firstleg-development}"
 
 if [ ! -f "$SSH_KEY" ]; then
   echo "开发环境 SSH 私钥不存在: $SSH_KEY" >&2
@@ -65,19 +66,19 @@ if [ "${DEVELOPMENT_DEPLOY_LOCAL:-false}" = "true" ]; then
   export IMAGE_REPOSITORY IMAGE_TAG
 
   docker compose \
-    --project-name firstleg-development \
+    --project-name "$PROJECT_NAME" \
     --env-file .env \
     -f docker-compose.yml \
     pull $SERVICES
 
   docker compose \
-    --project-name firstleg-development \
+    --project-name "$PROJECT_NAME" \
     --env-file .env \
     -f docker-compose.yml \
     up -d --remove-orphans --pull never $SERVICES
 
   docker compose \
-    --project-name firstleg-development \
+    --project-name "$PROJECT_NAME" \
     --env-file .env \
     -f docker-compose.yml \
     ps $SERVICES
@@ -129,12 +130,13 @@ for service in $SERVICES; do
   docker save "$image" | gzip -1 | run_ssh 'gzip -dc | docker load'
 done
 
-run_ssh sh -s -- "$REMOTE_DIR" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE_CSV" <<'REMOTE_DEPLOY'
+run_ssh sh -s -- "$REMOTE_DIR" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE_CSV" "$PROJECT_NAME" <<'REMOTE_DEPLOY'
 set -eu
 remote_dir="$1"
 image_repository="$2"
 image_tag="$3"
 service_csv="$4"
+project_name="$5"
 services=$(printf '%s' "$service_csv" | tr ',' ' ')
 
 cd "$remote_dir"
@@ -143,13 +145,13 @@ export IMAGE_REPOSITORY="$image_repository"
 export IMAGE_TAG="$image_tag"
 
 docker compose \
-  --project-name firstleg-development \
+  --project-name "$project_name" \
   --env-file .env \
   -f docker-compose.yml \
   up -d --remove-orphans --pull never $services
 
 docker compose \
-  --project-name firstleg-development \
+  --project-name "$project_name" \
   --env-file .env \
   -f docker-compose.yml \
   ps $services

deploy/scripts/deploy-services.sh

@@ -19,6 +19,15 @@ fi
 
 SERVICES=$(printf '%s' "$SERVICE_CSV" | tr ',' ' ')
 
+for service in $SERVICES; do
+  case "$service" in
+    *[!A-Za-z0-9_-]*|'')
+      echo "非法服务名: $service" >&2
+      exit 2
+      ;;
+  esac
+done
+
 env_file_has_key() {
   grep -q "^$1=" "$ENV_FILE"
 }
@@ -27,6 +36,46 @@ env_file_value() {
   sed -n "s/^$1=//p" "$ENV_FILE" | tail -n 1 | tr -d '\r'
 }
 
+DEPLOY_REGION=CN
+for service in $SERVICES; do
+  case "$service" in
+    gateway-overseas|lastleg-service|warehouse-overseas-service) DEPLOY_REGION=OVERSEAS ;;
+    event-bridge-service)
+      if ! env_file_has_key REGION_CODE; then
+        echo "部署 event-bridge-service 时，环境文件必须显式包含 REGION_CODE=CN 或 REGION_CODE=OVERSEAS" >&2
+        exit 2
+      fi
+      case "$(env_file_value REGION_CODE)" in
+        CN) ;;
+        OVERSEAS) DEPLOY_REGION=OVERSEAS ;;
+        *) echo "部署 event-bridge-service 时，REGION_CODE 只能为 CN 或 OVERSEAS" >&2; exit 2 ;;
+      esac
+      ;;
+  esac
+done
+if [ "$DEPLOY_REGION" = "OVERSEAS" ]; then
+  for service in $SERVICES; do
+    case "$service" in
+      gateway-overseas|lastleg-service|warehouse-overseas-service|event-bridge-service) ;;
+      *) echo "一次部署不得混合国内与海外服务: $SERVICE_CSV" >&2; exit 2 ;;
+    esac
+  done
+  COMPOSE_FILE="deploy/docker-compose.overseas.yml"
+  PROJECT_NAME="firstleg-${DEPLOY_ENV}-overseas"
+else
+  COMPOSE_FILE="deploy/docker-compose.yml"
+  PROJECT_NAME="firstleg-${DEPLOY_ENV}"
+fi
+
+if [ "$DEPLOY_REGION" = "OVERSEAS" ]; then
+  for key in NACOS_SERVER_ADDR OVERSEAS_NACOS_NAMESPACE INTERNAL_SERVICE_TOKEN JWT_ISSUER OVERSEAS_JWT_AUDIENCE JWT_JWK_SET_URI; do
+    if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+      echo "部署海外服务时，环境文件必须包含非空 $key" >&2
+      exit 2
+    fi
+  done
+fi
+
 case " $SERVICES " in
   *" finance "*)
     for key in FINANCE_DB_URL FINANCE_DB_USERNAME FINANCE_DB_PASSWORD; do
@@ -38,6 +87,53 @@ case " $SERVICES " in
     ;;
 esac
 
+case " $SERVICES " in
+  *" firstleg "*)
+    if ! env_file_has_key LASTLEG_EVENT_BRIDGE_URL || [ -z "$(env_file_value LASTLEG_EVENT_BRIDGE_URL)" ]; then
+      echo "部署 firstleg 时，环境文件必须包含非空 LASTLEG_EVENT_BRIDGE_URL" >&2
+      exit 2
+    fi
+    ;;
+esac
+
+case " $SERVICES " in
+  *" lastleg-service "*)
+    for key in LASTLEG_DB_URL LASTLEG_DB_USERNAME LASTLEG_DB_PASSWORD FIRSTLEG_EVENT_BRIDGE_URL DOMESTIC_WAREHOUSE_URL; do
+      if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+        echo "部署 lastleg-service 时，环境文件必须包含非空 $key" >&2
+        exit 2
+      fi
+    done
+    ;;
+esac
+
+case " $SERVICES " in
+  *" warehouse-overseas-service "*)
+    for key in WAREHOUSE_OVERSEAS_DB_URL WAREHOUSE_OVERSEAS_DB_USERNAME WAREHOUSE_OVERSEAS_DB_PASSWORD; do
+      if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+        echo "部署 warehouse-overseas-service 时，环境文件必须包含非空 $key" >&2
+        exit 2
+      fi
+    done
+    ;;
+esac
+
+case " $SERVICES " in
+  *" event-bridge-service "*)
+    if [ "$DEPLOY_REGION" = "OVERSEAS" ]; then
+      EVENT_BRIDGE_KEYS="EVENT_BRIDGE_OVERSEAS_DB_URL EVENT_BRIDGE_OVERSEAS_DB_USERNAME EVENT_BRIDGE_OVERSEAS_DB_PASSWORD EVENT_CONSUMER_URL"
+    else
+      EVENT_BRIDGE_KEYS="EVENT_BRIDGE_DB_URL EVENT_BRIDGE_DB_USERNAME EVENT_BRIDGE_DB_PASSWORD EVENT_CONSUMER_URL"
+    fi
+    for key in $EVENT_BRIDGE_KEYS; do
+      if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+        echo "部署 event-bridge-service 时，环境文件必须包含非空 $key" >&2
+        exit 2
+      fi
+    done
+    ;;
+esac
+
 case " $SERVICES " in
   *" file "*)
     if ! env_file_has_key ROCKETMQ_NAME_SERVER || [ -z "$(env_file_value ROCKETMQ_NAME_SERVER)" ]; then
@@ -75,24 +171,24 @@ esac
 export DEPLOY_ENV IMAGE_REPOSITORY IMAGE_TAG
 
 if [ "$DEPLOY_ENV" = "development" ]; then
-  exec sh deploy/scripts/deploy-development-service.sh \
+  DEPLOY_COMPOSE_FILE="$COMPOSE_FILE" DEPLOY_PROJECT_NAME="$PROJECT_NAME" exec sh deploy/scripts/deploy-development-service.sh \
     "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE_CSV" "$ENV_FILE"
 fi
 
 docker compose \
-  --project-name "firstleg-${DEPLOY_ENV}" \
+  --project-name "$PROJECT_NAME" \
   --env-file "$ENV_FILE" \
-  -f deploy/docker-compose.yml \
+  -f "$COMPOSE_FILE" \
   pull $SERVICES
 
 docker compose \
-  --project-name "firstleg-${DEPLOY_ENV}" \
+  --project-name "$PROJECT_NAME" \
   --env-file "$ENV_FILE" \
-  -f deploy/docker-compose.yml \
+  -f "$COMPOSE_FILE" \
   up -d --remove-orphans --pull never $SERVICES
 
 docker compose \
-  --project-name "firstleg-${DEPLOY_ENV}" \
+  --project-name "$PROJECT_NAME" \
   --env-file "$ENV_FILE" \
-  -f deploy/docker-compose.yml \
+  -f "$COMPOSE_FILE" \
   ps $SERVICES