From 67b3f6550afb0e8bfe257b70a7ed9a22466bfb12 Mon Sep 17 00:00:00 2001
From: "ipcjs.mac4" <gipcjs@gmail.com>
Date: Fri, 6 Jun 2025 18:30:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf:=20=E9=83=A8=E7=BD=B2=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=94=AF=E6=8C=81=E6=8C=87=E5=AE=9A=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projects/README.md             |  8 +++++++-
 projects/distar-beta-deploy.sh | 20 +++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/projects/README.md b/projects/README.md
index a1954aa..52947da 100644
--- a/projects/README.md
+++ b/projects/README.md
@@ -6,6 +6,12 @@
 # 确认https://github.com/TranscodeGroup/maintain-vben-admin仓库存在对应的版本tag
 # 确认 https://xn.transcodegroup.cn:8590/buildConfiguration/MaintainVbenAdmin_Release?mode=builds 已经打包出附件
 
-# 下载tag版本到本地, 并解压到版本对应的文件夹
+# 下载tag版本到默认目录, 并解压到版本对应的文件夹
 /home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1
+
+# 下载tag版本到当前目录
+DEPLOY_DIR=. /home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1
+
+# 下载tag版本到/data/nginx/html目录
+DEPLOY_DIR=/data/nginx/html /home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1
 ```
diff --git a/projects/distar-beta-deploy.sh b/projects/distar-beta-deploy.sh
index f083e67..f5e35e9 100755
--- a/projects/distar-beta-deploy.sh
+++ b/projects/distar-beta-deploy.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 set -e
-__dirname__=$(dirname "$0")
+__dirname__=$(realpath "$(dirname "$0")")
 
 BUILD_NAME="MaintainVbenAdmin_Release"
 CONFIG_DIR="$__dirname__/distar"
-WORK_DIR="/data/nginx/html/track/beta"
+DOWNLOAD_SCRIPT="$__dirname__"/teamcity-download-artifact.sh
+DEPLOY_DIR="${DEPLOY_DIR:-/data/nginx/html/track/beta}"
 
-# 创建并切换到工作目录
-[ -d "$WORK_DIR" ] || mkdir -p "$WORK_DIR" || (echo "创建工作目录失败" && exit 1)
-cd "$WORK_DIR"
+# 创建并切换到部署目录
+[ -d "$DEPLOY_DIR" ] || mkdir -p "$DEPLOY_DIR" || (echo "创建部署目录失败" && exit 1)
+cd "$DEPLOY_DIR"
 
 # 检查参数是否提供
 if [ -z "$1" ]; then
@@ -53,9 +54,9 @@ fi
 if [ "$confirm" == "y" ]; then
   echo "开始下载压缩文件 $zip_file ..."
   if [ "$version" == "latest" ]; then
-    "$__dirname__"/teamcity-download-artifact.sh --build=$BUILD_NAME
+    "$DOWNLOAD_SCRIPT" --build=$BUILD_NAME
   else
-    "$__dirname__"/teamcity-download-artifact.sh --build=$BUILD_NAME --tag="$version"
+    "$DOWNLOAD_SCRIPT" --build=$BUILD_NAME --tag="$version"
   fi
 
   # 再次检查压缩文件是否存在
@@ -116,8 +117,9 @@ OLD_DIV='数字交通云平台'
 NEW_DIV='ดูแลการเดินรถของคุ'
 
 # 使用sed命令进行文本替换
-sed -i "s|$OLD_TITLE|$NEW_TITLE|g" "$html_file"
-sed -i "s|$OLD_DIV|$NEW_DIV|g" "$html_file"
+sed -i.bak "s|$OLD_TITLE|$NEW_TITLE|g" "$html_file"
+sed -i.bak "s|$OLD_DIV|$NEW_DIV|g" "$html_file"
+rm "$html_file".bak
 
 echo "替换完成：$html_file 中的 '工物员' 已被替换为 'DiStarGPS ดูแลการเดินรถของคุณ'"
 

From b18bc3333749caa222686d053bc3cf03e7630f31 Mon Sep 17 00:00:00 2001
From: "ipcjs.mac4" <gipcjs@gmail.com>
Date: Mon, 9 Jun 2025 11:01:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?wip:=20=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?--dir=3Dxxx=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projects/README.md             |  4 +--
 projects/distar-beta-deploy.sh | 54 +++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/projects/README.md b/projects/README.md
index 52947da..a756fd5 100644
--- a/projects/README.md
+++ b/projects/README.md
@@ -10,8 +10,8 @@
 /home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1
 
 # 下载tag版本到当前目录
-DEPLOY_DIR=. /home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1
+/home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1 --dir=.
 
 # 下载tag版本到/data/nginx/html目录
-DEPLOY_DIR=/data/nginx/html /home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1
+/home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1 --dir=/data/nginx/html
 ```
diff --git a/projects/distar-beta-deploy.sh b/projects/distar-beta-deploy.sh
index f5e35e9..6398807 100755
--- a/projects/distar-beta-deploy.sh
+++ b/projects/distar-beta-deploy.sh
@@ -7,37 +7,51 @@ CONFIG_DIR="$__dirname__/distar"
 DOWNLOAD_SCRIPT="$__dirname__"/teamcity-download-artifact.sh
 DEPLOY_DIR="${DEPLOY_DIR:-/data/nginx/html/track/beta}"
 
-# 创建并切换到部署目录
-[ -d "$DEPLOY_DIR" ] || mkdir -p "$DEPLOY_DIR" || (echo "创建部署目录失败" && exit 1)
-cd "$DEPLOY_DIR"
-
-# 检查参数是否提供
-if [ -z "$1" ]; then
-  echo "使用方式: $0 --tag=版本号"
-  exit 1
-fi
-
-# 解析参数
-for arg in "$@"
-do
-  case $arg in
+print_help() {
+  local bin_name=$(basename "$0")
+  echo
+  echo "部署 distar beta版"
+  echo
+  echo "Usage: $bin_name --tag=<tag> [--dir=<dir>]"
+  echo
+  echo "--tag: 标签名, 必填"
+  echo "--deploy-dir: 部署目录, 默认为 /data/nginx/html/track/beta"
+  echo
+  echo "示例:"
+  echo
+  echo "$bin_name --tag=v1.14.0"
+  echo
+  echo "$bin_name --tag=v1.14.0 --dir=/data/nginx/html/track/test"
+  echo
+}
+
+while [ $# -gt 0 ]; do
+  case "$1" in
     --tag=*)
-    version="${arg#*=}"
-    shift # 移除已处理的参数
-    ;;
+      version="${1#*=}"
+      ;;
+    --dir=*)
+      DEPLOY_DIR="${1#*=}"
+      ;;
     *)
-    echo "未知参数: $arg"
-    exit 1
-    ;;
+      print_help
+      exit 1
+      ;;
   esac
+  shift
 done
 
 # 检查版本号是否为空
 if [ -z "$version" ]; then
   echo "版本号不能为空"
+  print_help
   exit 1
 fi
 
+# 创建并切换到部署目录
+[ -d "$DEPLOY_DIR" ] || mkdir -p "$DEPLOY_DIR" || (echo "创建部署目录失败" && exit 1)
+cd "$DEPLOY_DIR"
+
 # 替换点号并生成目标目录
 target_dir="${version//./}"