1c93ea0a4b
- 审批：删 _flush_order 撞键内部重试（rollback 会回掉同事务业务行造成 静默丢数据，异常改由 create 外层重试整体重来/update 路径审计收敛）； act() 出参固化前置到 commit 之前（commit 后查询失败会把已通过的审批 记成失败审计）；驳回/撤回清空方案生效行（防被否决方案进 M3 快照）； keyword 改 contains(autoescape=True) 对齐全库转义口径；撤单抽 withdraw_pending_orders 供编辑清空方案时显式调用 - 业务：删业务遇在途审批单禁删 400、终态审批单随 _hard_delete 清理； 编辑清空方案同步撤回在途单；历史离职参与人编辑放行（冗余姓名固化 语义，仅新增参与人做在职校验） - 迁移：business_secondary_allocations 补 uk(business_id, personnel_id) （模型/迁移 py/导出 SQL/init-dev 四方同步，开发库往返重放验证） - 设置：upload_logo 改同步 def（阻塞操作不卡事件循环）+ file.size 先拦； company_name schema 剥空白防全空白入库；logo 旧文件清理移到 commit 成功后（防库指旧路径而文件已删断链）；uploadLogo 走 request() 解包 （原直发 service.post 不解包信封，logoUrl 会被置 undefined） - 备份：restore_drill --drop-exec 先清全部历史 drill 库再演练并即删本轮 （原语义永远删错对象，每轮净增一份整库拷贝） - 测试：conftest 清理补 system_settings 种子行与 uploads/logo 文件； 新增 5 例（驳回清方案/清空撤单/在途禁删终态随删/离职放行/BOOL 边界）； 全量回归 701 passed - 遗留 2 项记 AI_CONTEXT（方案版本承载、审批单快照，依赖 ④ 分摊语义） Co-Authored-By: Claude Code <noreply@anthropic.com>
104 lines
3.9 KiB
Bash
104 lines
3.9 KiB
Bash
#!/usr/bin/env bash
|
||
# 恢复演练 —— 把最近一份备份恢复到「临时库」并核对行数（⑨：备份不演练 = 没有备份）
|
||
#
|
||
# 演练绝不直接覆盖生产库；临时库名 payroll_drill_<时间戳>，核对完由
|
||
# 调用方决定是否删除（本脚本默认不 DROP，安全优先）。
|
||
#
|
||
# 用法：在项目根目录执行 bash scripts/restore_drill.sh
|
||
# 产物：临时库 + 终端行数对比报告；--drop-exec 参数在核对通过后删除临时库。
|
||
|
||
set -euo pipefail
|
||
|
||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||
cd "$ROOT"
|
||
|
||
if [[ -f docker/.env ]]; then
|
||
# shellcheck disable=SC1091
|
||
source docker/.env
|
||
else
|
||
echo "ERROR: docker/.env 不存在" >&2
|
||
exit 1
|
||
fi
|
||
|
||
: "${MYSQL_DATABASE:?docker/.env 缺 MYSQL_DATABASE}"
|
||
: "${MYSQL_ROOT_PASSWORD:?docker/.env 缺 MYSQL_ROOT_PASSWORD}"
|
||
|
||
CONTAINER="ys-mysql-dev"
|
||
if ! docker inspect "$CONTAINER" >/dev/null 2>&1; then
|
||
echo "ERROR: 容器 $CONTAINER 未运行" >&2
|
||
exit 1
|
||
fi
|
||
|
||
BACKUP_DIR="$ROOT/db/backups"
|
||
LATEST="$(ls -t "$BACKUP_DIR"/payroll_*.sql.gz 2>/dev/null | head -1)"
|
||
if [[ -z "$LATEST" ]]; then
|
||
echo "ERROR: 未找到备份文件（先 bash scripts/backup_full.sh）" >&2
|
||
exit 1
|
||
fi
|
||
|
||
DRILL_DB="payroll_drill_$(date +%Y%m%d_%H%M%S)"
|
||
|
||
# 0. --drop-exec：演练前先清掉**全部**历史遗留 drill 库（含上一轮「保留供
|
||
# 核对」的那份——否则每演练一轮净增一份整库拷贝，磁盘被无人认领的
|
||
# drill 库吃满），演练完成后本轮临时库也随之删除
|
||
if [[ "${1:-}" == "--drop-exec" ]]; then
|
||
OLD_DBS=$(docker exec "$CONTAINER" sh -c \
|
||
"mysql -uroot -p\"\$MYSQL_ROOT_PASSWORD\" -N -B -e \"SHOW DATABASES LIKE 'payroll_drill_%';\"" 2>/dev/null || true)
|
||
for OLD in $OLD_DBS; do
|
||
docker exec "$CONTAINER" sh -c \
|
||
"mysqladmin -uroot -p\"\$MYSQL_ROOT_PASSWORD\" -f drop \"$OLD\""
|
||
echo "已清理历史演练库 $OLD"
|
||
done
|
||
fi
|
||
|
||
echo "演练恢复：$(basename "$LATEST") → 临时库 $DRILL_DB"
|
||
|
||
# 1. 创建临时库（mysqladmin create 无反引号转义问题）
|
||
docker exec "$CONTAINER" sh -c \
|
||
"mysqladmin -uroot -p\"\$MYSQL_ROOT_PASSWORD\" create \"$DRILL_DB\""
|
||
|
||
# 2. 解压导入
|
||
gunzip -c "$LATEST" | docker exec -i "$CONTAINER" sh -c \
|
||
"mysql -uroot -p\"\$MYSQL_ROOT_PASSWORD\" \"$DRILL_DB\""
|
||
|
||
# 3. 行数核对：关键业务表
|
||
TABLES=(users roles user_roles param_definitions param_values businesses business_items personnel products customers shipments shipment_items receipts approval_orders approval_steps system_settings)
|
||
|
||
echo ""
|
||
echo "======== 行数对比（源库 vs 演练库）========"
|
||
printf "%-24s %12s %12s %6s\n" "表名" "源库" "演练库" "结果"
|
||
ALL_OK=1
|
||
for T in "${TABLES[@]}"; do
|
||
SRC=$(docker exec "$CONTAINER" sh -c \
|
||
"mysql -uroot -p\"\$MYSQL_ROOT_PASSWORD\" -N -B -e \"SELECT COUNT(*) FROM $MYSQL_DATABASE.$T;\" 2>/dev/null" || echo "?")
|
||
DST=$(docker exec "$CONTAINER" sh -c \
|
||
"mysql -uroot -p\"\$MYSQL_ROOT_PASSWORD\" -N -B -e \"SELECT COUNT(*) FROM $DRILL_DB.$T;\" 2>/dev/null" || echo "?")
|
||
if [[ "$SRC" == "$DST" ]]; then
|
||
MARK="✓"
|
||
else
|
||
MARK="✗"
|
||
ALL_OK=0
|
||
fi
|
||
printf "%-24s %12s %12s %6s\n" "$T" "$SRC" "$DST" "$MARK"
|
||
done
|
||
echo "=========================================="
|
||
|
||
if [[ "$ALL_OK" == "1" ]]; then
|
||
echo ""
|
||
echo "结果：全部表行数一致，备份可恢复。"
|
||
if [[ "${1:-}" == "--drop-exec" ]]; then
|
||
docker exec "$CONTAINER" sh -c \
|
||
"mysqladmin -uroot -p\"\$MYSQL_ROOT_PASSWORD\" -f drop \"$DRILL_DB\""
|
||
echo "本轮临时库 $DRILL_DB 已删除（历史遗留亦在演练前清理）。"
|
||
else
|
||
echo "临时库 $DRILL_DB 保留（核对用）；确认无误后重跑本脚本加 --drop-exec，"
|
||
echo "会先清掉包括它在内的全部演练库再演练，本轮完成后同样即删。"
|
||
fi
|
||
exit 0
|
||
else
|
||
echo ""
|
||
echo "结果：存在不一致，请检查备份文件与数据库结构。" >&2
|
||
echo "临时库 $DRILL_DB 保留供排查。" >&2
|
||
exit 1
|
||
fi
|