From 52ea5945eb966d519f8212449c3c9d3db61c066d Mon Sep 17 00:00:00 2001 From: empty Date: Sat, 27 Dec 2025 12:46:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20sync-accounts.sh=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=94=B9=E4=B8=BA=E4=BB=8E=20.env=20=E8=AF=BB?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 自动加载脚本目录下的 .env 文件 - 新增 SYNC_SERVER, SYNC_REMOTE_PATH 等环境变量 - 更新 .env.example 添加同步配置示例 --- .env.example | 7 +++++++ sync-accounts.sh | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index 983f86d..d7ce954 100644 --- a/.env.example +++ b/.env.example @@ -12,3 +12,10 @@ ALIYUN_ACCESS_KEY_SECRET=your_access_key_secret ALIYUN_SLS_ENDPOINT=cn-hangzhou.log.aliyuncs.com ALIYUN_SLS_PROJECT=your_project_name ALIYUN_SLS_LOGSTORE=your_logstore_name + +# 账号同步脚本配置 (sync-accounts.sh) +SYNC_SERVER=user@your-server.com +SYNC_REMOTE_PATH=/opt/droid2api +DEPLOY_TYPE=docker-compose +DOCKER_SERVICE_NAME=droid2api +PM2_APP_NAME=droid2api diff --git a/sync-accounts.sh b/sync-accounts.sh index 4f3c212..8c49ee2 100755 --- a/sync-accounts.sh +++ b/sync-accounts.sh @@ -17,9 +17,19 @@ set -e # ========== 配置区域 ========== -# 可以修改这些默认值,或通过命令行参数覆盖 -DEFAULT_SERVER="user@your-server.com" -DEFAULT_REMOTE_PATH="/opt/droid2api" +# 优先从 .env 文件读取,可通过环境变量或命令行参数覆盖 + +# 加载 .env 文件(如果存在) +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +if [[ -f "$SCRIPT_DIR/.env" ]]; then + set -a # 自动导出变量 + source "$SCRIPT_DIR/.env" + set +a +fi + +# 配置项(优先级:命令行参数 > 环境变量 > 默认值) +DEFAULT_SERVER="${SYNC_SERVER:-user@your-server.com}" +DEFAULT_REMOTE_PATH="${SYNC_REMOTE_PATH:-/opt/droid2api}" LOCAL_FILE="accounts.json" # 部署方式: pm2 | docker | docker-compose | none