修复更新后服务无法访问:强制 systemd 配置与健康检查。

- update.sh 必须 root 运行,自动注册并重启 grade-archive

- 新增 deploy/repair.sh 一键修复连接被拒绝
This commit is contained in:
dekun
2026-06-28 14:03:36 +08:00
parent 1c50ebc0ec
commit c42cd0b46d
5 changed files with 156 additions and 20 deletions
+80
View File
@@ -0,0 +1,80 @@
#!/usr/bin/env bash
# 部署脚本共用函数
INSTALL_DIR="${INSTALL_DIR:-/opt/secondary-school-grade-archive}"
WEB_PORT="${WEB_PORT:-23566}"
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
NC='\033[0m'
log_info() { echo -e "${GREEN}[INFO]${NC} $*"; }
log_warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
log_error() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
require_root() {
if [[ "${EUID:-$(id -u)}" -ne 0 ]]; then
log_error "请使用 root 运行: sudo bash $*"
exit 1
fi
}
load_env_port() {
if [[ -f "${INSTALL_DIR}/.env" ]]; then
# shellcheck disable=SC1090
set -a && source "${INSTALL_DIR}/.env" && set +a
fi
WEB_PORT="${WEB_PORT:-23566}"
}
stop_legacy_pm2() {
if command -v pm2 &>/dev/null; then
pm2 delete grade-api grade-web 2>/dev/null || true
pm2 save 2>/dev/null || true
log_info "已停止旧版 PM2 进程"
fi
}
setup_systemd_service() {
log_info "配置 systemd 服务 grade-archive…"
sed "s|/opt/secondary-school-grade-archive|${INSTALL_DIR}|g" \
"${INSTALL_DIR}/deploy/grade-archive.service" > /etc/systemd/system/grade-archive.service
systemctl daemon-reload
systemctl enable grade-archive
}
restart_grade_service() {
load_env_port
mkdir -p "${INSTALL_DIR}/uploads" "${INSTALL_DIR}/backups"
chmod +x "${INSTALL_DIR}/deploy/start.sh"
log_info "重启 grade-archive(端口 ${WEB_PORT})…"
systemctl restart grade-archive
}
wait_healthy() {
load_env_port
local i
for i in $(seq 1 30); do
if curl -sf "http://127.0.0.1:${WEB_PORT}/api/health" >/dev/null 2>&1; then
log_info "健康检查通过 — http://127.0.0.1:${WEB_PORT}"
return 0
fi
sleep 2
done
log_error "服务未响应,请查看日志:"
journalctl -u grade-archive -n 40 --no-pager || true
return 1
}
install_ocr_deps_safe() {
if [[ -x "${INSTALL_DIR}/deploy/install-ocr-deps.sh" ]]; then
bash "${INSTALL_DIR}/deploy/install-ocr-deps.sh" || log_warn "OCR 依赖安装跳过(可稍后重试)"
fi
}
show_service_status() {
echo ""
systemctl status grade-archive --no-pager -l 2>/dev/null || true
echo ""
ss -tlnp 2>/dev/null | grep -E ":${WEB_PORT}\s" || echo "端口 ${WEB_PORT} 未监听"
}
+1
View File
@@ -9,6 +9,7 @@ WorkingDirectory=/opt/secondary-school-grade-archive
ExecStart=/opt/secondary-school-grade-archive/deploy/start.sh
Restart=always
RestartSec=5
TimeoutStartSec=120
EnvironmentFile=-/opt/secondary-school-grade-archive/.env
[Install]
+35
View File
@@ -0,0 +1,35 @@
#!/usr/bin/env bash
#
# 服务无法访问(连接被拒绝)时一键修复
# 用法: sudo bash deploy/repair.sh
#
set -euo pipefail
INSTALL_DIR="${INSTALL_DIR:-/opt/secondary-school-grade-archive}"
# shellcheck source=common.sh
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common.sh"
require_root "deploy/repair.sh"
cd "${INSTALL_DIR}" || exit 1
find "${INSTALL_DIR}" -name "*.sh" -exec sed -i 's/\r$//' {} +
log_info "开始修复 grade-archive 服务…"
stop_legacy_pm2
install_ocr_deps_safe
setup_systemd_service
restart_grade_service
if wait_healthy; then
ip=$(hostname -I 2>/dev/null | awk '{print $1}')
ip="${ip:-127.0.0.1}"
echo ""
echo "=========================================="
echo " 修复完成,请访问: http://${ip}:${WEB_PORT}"
echo "=========================================="
else
show_service_status
exit 1
fi
+15 -19
View File
@@ -5,18 +5,16 @@ INSTALL_DIR="${INSTALL_DIR:-/opt/secondary-school-grade-archive}"
BRANCH="${BRANCH:-main}"
PIP_MIRROR="${PIP_MIRROR:-https://pypi.tuna.tsinghua.edu.cn/simple}"
GREEN='\033[0;32m'
RED='\033[0;31m'
NC='\033[0m'
log_info() { echo -e "${GREEN}[INFO]${NC} $*"; }
log_error() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
# shellcheck source=common.sh
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common.sh"
# shellcheck source=proxy.sh
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/proxy.sh"
require_root "deploy/update.sh"
cd "${INSTALL_DIR}" || exit 1
find "${INSTALL_DIR}" -name "*.sh" -exec sed -i 's/\r$//' {} +
chmod +x deploy/start.sh
chmod +x deploy/start.sh deploy/install-ocr-deps.sh deploy/repair.sh
setup_deploy_proxy
@@ -27,7 +25,6 @@ git pull origin "${BRANCH}"
if [[ ! -f "${INSTALL_DIR}/frontend/dist/index.html" ]]; then
log_error "未找到 frontend/dist/index.html"
log_error "请先在开发机构建前端并推送到仓库: cd frontend && npm run build && git add frontend/dist && git push"
exit 1
fi
@@ -36,17 +33,16 @@ cd backend
source venv/bin/activate
pip install -r requirements.txt --progress-bar on -i "${PIP_MIRROR}"
deactivate
cd "${INSTALL_DIR}"
if command -v pm2 &>/dev/null; then
pm2 delete grade-api grade-web 2>/dev/null || true
stop_legacy_pm2
install_ocr_deps_safe
setup_systemd_service
restart_grade_service
if ! wait_healthy; then
log_error "更新后服务异常,可尝试: sudo bash ${INSTALL_DIR}/deploy/repair.sh"
exit 1
fi
if [[ "${EUID:-$(id -u)}" -eq 0 ]]; then
log_info "检查 OCR 系统依赖(libGL)…"
bash "${INSTALL_DIR}/deploy/install-ocr-deps.sh"
fi
log_info "重启 systemd 服务…"
systemctl restart grade-archive
log_info "更新完成 — 访问端口见 .env 中 WEB_PORT(默认 23566"
log_info "更新完成"