From 0dfe699ceec85ef0b9589958e07b4ae0a22ad27f Mon Sep 17 00:00:00 2001 From: Agent Date: Tue, 14 Jul 2026 23:24:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9E=84=E5=BB=BA=E4=BC=98=E5=8C=96+?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E6=9C=BA=E5=88=B6=20-=20Docker=20=E5=A4=9A?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E6=9E=84=E5=BB=BA=EF=BC=88=E5=87=8F=E5=B0=8F?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E4=BD=93=E7=A7=AF=EF=BC=89=20-=20HEALTHCHECK?= =?UTF-8?q?=20=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5=20-=20=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E5=90=8E=E7=AD=89=E5=BE=85=E5=81=A5=E5=BA=B7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=80=8C=E9=9D=9E=E6=97=A5=E5=BF=97=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=20-=20=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A4=87=E4=BB=BD=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=EF=BC=88mysqldump/=E5=AE=B9=E5=99=A8=E5=86=85?= =?UTF-8?q?=E5=8F=8C=E6=A8=A1=E5=BC=8F=EF=BC=89=20-=2030=E5=A4=A9=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B8=85=E7=90=86=E6=97=A7=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/scripts/backup.sh | 52 +++++++++++++++++++++++++++++++++++++++ build.sh | 26 +++++++++++++++----- 2 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 backend/scripts/backup.sh diff --git a/backend/scripts/backup.sh b/backend/scripts/backup.sh new file mode 100644 index 0000000..4a793d8 --- /dev/null +++ b/backend/scripts/backup.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# yx-nav 数据库备份脚本 +# 用法: ./backup.sh [保存天数] +set -e + +RETENTION_DAYS=${1:-30} +BACKUP_DIR="/opt/data/backups/yx-nav" +TIMESTAMP=$(date +%Y%m%d_%H%M%S) +DB_HOST="${DB_HOST:-110.42.189.169}" +DB_PORT="${DB_PORT:-9109}" +DB_NAME="${DB_NAME:-yx-nav}" +DB_USER="${DB_USER:-yx-nav}" +DB_PASS="${DB_PASS:-yx-nav}" + +mkdir -p "$BACKUP_DIR" + +echo "=== 开始备份 $DB_NAME ===" + +# 使用 mysqldump 备份(如果可用) +if command -v mysqldump &>/dev/null; then + mysqldump -h "$DB_HOST" -P "$DB_PORT" -u "$DB_USER" -p"$DB_PASS" \ + --databases "$DB_NAME" --single-transaction --routines --triggers \ + | gzip > "$BACKUP_DIR/${DB_NAME}_${TIMESTAMP}.sql.gz" + echo "✅ mysqldump 备份完成: ${DB_NAME}_${TIMESTAMP}.sql.gz" +else + echo "⚠️ mysqldump 不可用,尝试容器内备份..." + # 通过 Docker 容器备份 + docker exec yx-nav node -e " + const mysql = require('mysql2/promise'); + const fs = require('fs'); + (async()=>{ + const c = await mysql.createConnection({host:'$DB_HOST',port:$DB_PORT,user:'$DB_USER',password:'$DB_PASS',database:'$DB_NAME'}); + const [tables] = await c.execute('SHOW TABLES'); + const out = []; + for (const t of tables) { + const [rows] = await c.execute('SELECT * FROM \`' + t[0] + '\`'); + out.push({table: t[0], rows}); + } + fs.writeFileSync('/tmp/backup_${TIMESTAMP}.json', JSON.stringify(out, null, 2)); + await c.end(); + })().catch(e=>{console.error(e);process.exit(1)}); + " && docker cp "yx-nav:/tmp/backup_${TIMESTAMP}.json" "$BACKUP_DIR/${DB_NAME}_${TIMESTAMP}.json" + echo "✅ 容器内备份完成: ${DB_NAME}_${TIMESTAMP}.json" +fi + +# 清理过期备份 +find "$BACKUP_DIR" -name "${DB_NAME}_*.sql.gz" -mtime +$RETENTION_DAYS -delete 2>/dev/null +find "$BACKUP_DIR" -name "${DB_NAME}_*.json" -mtime +$RETENTION_DAYS -delete 2>/dev/null + +echo "=== 备份完成,保留 ${RETENTION_DAYS} 天 ===" +echo "备份目录: $BACKUP_DIR" +ls -lh "$BACKUP_DIR" 2>/dev/null | tail -5 \ No newline at end of file diff --git a/build.sh b/build.sh index a4c269d..43ed6fa 100755 --- a/build.sh +++ b/build.sh @@ -53,18 +53,32 @@ BACKUP_IMAGE="$SERVICE_NAME:last-good" cd "$WORKSPACE" -# 生成 Dockerfile +# 生成 Dockerfile(多阶段构建) cat > Dockerfile <<'EOF' +# ---- 构建阶段 ---- +FROM node:22-slim AS builder +WORKDIR /build +COPY backend/package*.json ./ +RUN npm ci --only=production --registry=https://registry.npmmirror.com + +# ---- 运行阶段 ---- FROM node:22-slim WORKDIR /app +RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends curl tzdata && \ + rm -rf /var/lib/apt/lists/* && \ + ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + +# 只复制需要的文件 +COPY --from=builder /build/node_modules ./node_modules +COPY backend/src ./src COPY frontend/dist ./dist -COPY backend ./backend -COPY backend/package.json ./package.json -RUN cd backend && npm install --production && cd .. + EXPOSE 3000 ENV NODE_ENV=production ENV TZ=Asia/Shanghai -CMD ["node", "backend/src/index.js"] +HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \ + CMD node -e "require('http').get('http://localhost:3000/api/health',r=>{process.exit(r.statusCode===200?0:1)}).on('error',()=>process.exit(1))" +CMD ["node", "src/index.js"] EOF echo "构建 Docker 镜像: $IMAGE_NAME ..." @@ -100,7 +114,7 @@ docker run -d \ echo "新容器已启动,等待应用启动(最多 ${HEALTH_WAIT} 秒)..." for i in $(seq 1 $HEALTH_WAIT); do - if docker logs "$CONTAINER_NAME" 2>&1 | grep -qE "(running at|Database connected)"; then + if docker ps --filter "name=$CONTAINER_NAME" --format "{{.Status}}" | grep -q "(healthy)"; then echo "✅ 应用启动成功!" echo "🎉 部署完成!访问 http://110.42.189.169:${HOST_PORT}" docker logs --tail 30 "$CONTAINER_NAME"