From a9be70aabcc1a7ec98a2a4dfa61111b864080818 Mon Sep 17 00:00:00 2001 From: milky0217 Date: Mon, 25 May 2026 15:37:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20deploy=E5=B7=A5=E5=85=B7service=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D=E5=AF=B9=E9=BD=90=20+=20=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8Ddev=E6=9C=8D=E5=8A=A1=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-dev.service => rust-backend-development.service} | 0 lib/common.sh | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename deploy/{rust-backend-dev.service => rust-backend-development.service} (100%) diff --git a/deploy/rust-backend-dev.service b/deploy/rust-backend-development.service similarity index 100% rename from deploy/rust-backend-dev.service rename to deploy/rust-backend-development.service diff --git a/lib/common.sh b/lib/common.sh index 07e8130..efc49b0 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -97,10 +97,10 @@ check_service_file() { deploy_service_file() { log_step "部署 systemd service 文件..." - [ "$DRY_RUN" = true ] && { log_dry "上传 ${SERVICE_FILE_LOCAL} → /etc/systemd/system/${SERVICE_NAME}"; return 0; } + [ "$DRY_RUN" = true ] && { log_dry "上传 $(get_service_file_local) → /etc/systemd/system/${SERVICE_NAME}"; return 0; } if [ ! -f "$(get_service_file_local)" ]; then - log_error "本地 service 文件不存在: ${SERVICE_FILE_LOCAL}" + log_error "本地 service 文件不存在: $(get_service_file_local)" log_info "可通过 --init-env 生成模板" exit 1 fi @@ -112,13 +112,13 @@ deploy_service_file() { init_env() { log_step "初始化 systemd service 文件(从模板生成)..." - [ "$DRY_RUN" = true ] && { log_dry "生成 ${SERVICE_FILE_LOCAL}"; return 0; } + [ "$DRY_RUN" = true ] && { log_dry "生成 $(get_service_file_local)"; return 0; } if [ -f "$(get_service_file_local)" ]; then - log_warn "${SERVICE_FILE_LOCAL} 已存在,继续将覆盖!" + log_warn "$(get_service_file_local) 已存在,继续将覆盖!" read -p "是否覆盖? [y/N] " -n 1 -r; echo [[ ! $REPLY =~ ^[Yy]$ ]] && { log_warn "已取消"; return 0; } - cp "$(get_service_file_local)" "${SERVICE_FILE_LOCAL}.bak.$(date +%Y%m%d_%H%M%S)" + cp "$(get_service_file_local)" "$(get_service_file_local).bak.$(date +%Y%m%d_%H%M%S)" fi local jwt_secret @@ -154,7 +154,7 @@ Environment=FREE_USER_DATA_LIMIT=20 SERVEOF chmod 600 "$(get_service_file_local)" - log_info "service 模板已生成: ${SERVICE_FILE_LOCAL}" + log_info "service 模板已生成: $(get_service_file_local)" log_warn "请手动填写 DATABASE_URL / WECHAT_APPID / WECHAT_SECRET" log_info "然后使用 ./deploy.sh ${APP_ENV} --deploy-service 上传" }