每晚 01:28 只跑一次 jushuitan:sync-shipping --days=3,输出丢到 /dev/null; 副本库偶发超时时整次同步失败且无记录,最近几天大量漏单(如 11-06 只同步到 43%、11-08 68%)。 - run-finance-batch.sh:发货数据同步输出含"同步失败"时自动重试(默认 3 次、间隔 5 分钟), 每次输出写 /opt/caiwuxitong/jst-sync-shipping.log(超 5MB 轮转);只有警告不重试; - cron 增加 21:28 再拉最近 3 天,补齐凌晨商品明细未到齐/超时漏掉的包裹。 注:BusinessMirrorScheduleTest 在 main 上已有 2 个与本改动无关的失败(compose.jiangling.yml 的 config_db 内存参数、app 服务配置断言),本次未改动。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014nvGZkg27YMEdhry6eiuwf > 开工时标题使用 `WIP: <任务名称>` 并先填写“任务占用与边界”。Codex 完成独立合并前自审后补齐其余内容并移除 `WIP:`。 ## 任务占用与边界 - 任务名称: - 实际开发者: - 任务来源/团队分工: - 目标结果: - 预计修改路径: - 将写入的公共契约(路由、Controller 方法、Repository、表/视图、`source_key`、`scope`、权限名、菜单键或共享组件): - 仅复用、明确不修改的公共契约: - 数据源、表/视图和字段: - 上游 `source_key` / `scope`: - 权限名、菜单键或共享组件: - 明确不修改的范围: ## 开工碰撞检查 - [ ] Codex 已执行 `scripts/codex-task-preflight.ps1` - [ ] 已检查最新 `main` 和所有远程任务分支 - [ ] 已搜索主线既有页面、接口、Repository 和数据查询 - [ ] 已把“将写入”和“仅复用、不修改”的公共契约分开;仅复用项不作为单独阻断条件 - [ ] 未发现实际写入重叠;或已在下方写明相关分支、具体重叠项和协调结论 相关分支、重叠项与协调结论: ## 实际改动 - 完成内容: - Codex 实际修改的文件: - 新增或变更的公共契约: - 与原计划的差异: ## 验证证据 - 正常流程: - 空数据/错误输入/无权限场景: - 受影响旧功能: - 自动测试及结果: - 实际页面、接口或只读业务查询结果: ## 风险检查 - [ ] 不涉及金额、权限、审批、数据库迁移、生产配置或数据修复 - [ ] 如涉及上述高风险内容,已在下方写明影响、回滚和所需授权 - [ ] 未提交 `.env`、密码、Token、私钥、真实财务数据、生产日志或构建产物 - [ ] 前端改动符合 `DESIGN.md`;无前端改动则写“不适用” 高风险影响、回滚和授权状态: ## 合并前复查 - [ ] 已重新拉取远程引用并用实际修改范围再次运行碰撞检查 - [ ] PR 不再是 `WIP:`,所有测试结果已经补齐 - [ ] Codex 已重新读取原始需求和验收标准,并逐文件审核 `origin/main...任务分支` 的完整 diff - [ ] Codex 自审确认无越界修改、重复实现、敏感内容、未处理冲突和未验证结果 - [ ] 合并顺序不会覆盖其他未合并任务 - [ ] 已授权当前任务的 Codex 执行 Squash merge、验证 `main` 并清理任务分支 - [ ] 如涉及生产迁移、数据修复、删除、覆盖配置或部署,已另行取得对应高风险授权 Reviewed-on: #1183
92 lines
4.5 KiB
Bash
92 lines
4.5 KiB
Bash
#!/bin/sh
|
||
set -eu
|
||
|
||
REMOTE_DIR="${CAIWU_REMOTE_DIR:-/opt/caiwuxitong}"
|
||
GENERAL_LOCK_FILE="${CAIWU_GENERAL_LOCK:-/run/caiwu-upstream-sync.lock}"
|
||
OA_LOCK_FILE="${CAIWU_OA_LOCK:-/run/caiwu-oa-process.lock}"
|
||
is_import=0
|
||
CAIWU_BATCH_CALLER_DIR="$PWD"
|
||
export CAIWU_BATCH_CALLER_DIR
|
||
case "${1:-}" in
|
||
*:import|*:import-*|*:import:*|payables:unpriced-cycle|product:monthly-weighted-average:base|planting-details:sync-work-orders|jst-order-labels:sync-daily) is_import=1 ;;
|
||
jushuitan:sync-shipping|store-receipt:order-match:sync|store-receipt:planting-daily|store-receipt:product-cost:sync|store-receipt:auto-resync|order-data:warm-shop-candidates|business-mirror:sync-tables|business-mirror:sync-ding-process-details|business-mirror:process-ding-refresh-requests|business-mirror:index-work-order-waybills|business-mirror:refresh-paid-sales|account-bills:exports:run|finance-ledger:recalculate|product:monthly-weighted-average:auto|product:monthly-weighted-average:compute|product:monthly-weighted-average:report|finance:monthly-weighted-product-cost:auto) ;;
|
||
*) echo 'Unsupported finance batch command' >&2; exit 64 ;;
|
||
esac
|
||
case "${1:-}" in
|
||
business-mirror:sync-ding-process-details|business-mirror:process-ding-refresh-requests)
|
||
LOCK_FILE="${CAIWU_UPSTREAM_LOCK:-$OA_LOCK_FILE}"
|
||
;;
|
||
*)
|
||
LOCK_FILE="${CAIWU_UPSTREAM_LOCK:-$GENERAL_LOCK_FILE}"
|
||
;;
|
||
esac
|
||
cd "$REMOTE_DIR"
|
||
if [ "$1" = 'account-bills:exports:run' ]; then
|
||
storage_root="$(docker inspect caiwu_app --format '{{range .Mounts}}{{if eq .Destination "/var/www/html/storage"}}{{.Source}}{{end}}{{end}}')"
|
||
[ -n "$storage_root" ] && [ -d "$storage_root" ] || exit 65
|
||
# Check only tiny task metadata; do not start an idle container every minute.
|
||
if ! python3 - "$storage_root" <<'PY'
|
||
import json,pathlib,sys
|
||
for path in pathlib.Path(sys.argv[1]).glob('app/account-bills-exports/*/*.json'):
|
||
try:
|
||
task = json.loads(path.read_text())
|
||
if isinstance(task, dict) and task.get('status') == 'queued':
|
||
sys.exit(0)
|
||
except (OSError,ValueError):
|
||
continue
|
||
sys.exit(1)
|
||
PY
|
||
then
|
||
exit 0
|
||
fi
|
||
fi
|
||
if [ "$1" = 'business-mirror:process-ding-refresh-requests' ]; then
|
||
storage_root="$(docker inspect caiwu_app --format '{{range .Mounts}}{{if eq .Destination "/var/www/html/storage"}}{{.Source}}{{end}}{{end}}')"
|
||
[ -n "$storage_root" ] && [ -d "$storage_root/app/ding-process-refresh" ] || exit 0
|
||
pending_request="$(find "$storage_root/app/ding-process-refresh" -maxdepth 1 -type f -name '*.pending' -print -quit)"
|
||
[ -n "$pending_request" ] || exit 0
|
||
fi
|
||
if [ "$1" != 'account-bills:exports:run' ]; then
|
||
exec 9>"$LOCK_FILE"
|
||
if ! flock -w "${CAIWU_BATCH_LOCK_WAIT:-1800}" 9; then
|
||
echo 'Upstream synchronization is busy; no batch container started' >&2
|
||
exit 75
|
||
fi
|
||
fi
|
||
if [ "$is_import" -eq 1 ]; then
|
||
exec python3 "$REMOTE_DIR/run-finance-import.py" "$@"
|
||
fi
|
||
image="$(docker inspect caiwu_app --format '{{.Config.Image}}')"
|
||
case "$image" in
|
||
caiwu_akaunting:*) IMAGE_TAG="${image#*:}" ;;
|
||
*) echo 'Unsupported active finance image; no batch container started' >&2; exit 65 ;;
|
||
esac
|
||
RUN_MIGRATIONS=0
|
||
export IMAGE_TAG RUN_MIGRATIONS
|
||
# Mutating jobs hold the upstream lock; read-only exports use their own single-worker lock.
|
||
if [ "$1" = 'jushuitan:sync-shipping' ]; then
|
||
# 聚水潭副本库偶发超时会让整次发货数据同步失败(当晚最近几天漏单):
|
||
# 输出里有"同步失败"时自动重试,每次输出留日志;只有警告(未写"同步失败")不重试。
|
||
sync_log="${CAIWU_JST_SYNC_LOG:-$REMOTE_DIR/jst-sync-shipping.log}"
|
||
sync_attempts="${CAIWU_JST_SYNC_ATTEMPTS:-3}"
|
||
if [ -f "$sync_log" ] && [ "$(wc -c <"$sync_log")" -gt 5000000 ]; then
|
||
mv -f "$sync_log" "$sync_log.1"
|
||
fi
|
||
sync_out="$(mktemp)"
|
||
trap 'rm -f "$sync_out"' EXIT
|
||
attempt=1
|
||
while :; do
|
||
echo "== $(date '+%Y-%m-%d %H:%M:%S') attempt $attempt/$sync_attempts: $*" >>"$sync_log"
|
||
rc=0
|
||
docker compose -f compose.jiangling.yml --profile batch run --rm -T --no-deps batch "$@" >"$sync_out" 2>&1 || rc=$?
|
||
tr '\r' '\n' <"$sync_out" | grep -v '已扫描' | tail -n 60 >>"$sync_log" || true
|
||
echo "== rc=$rc" >>"$sync_log"
|
||
if [ "$rc" -eq 0 ] || ! grep -q '同步失败' "$sync_out" || [ "$attempt" -ge "$sync_attempts" ]; then
|
||
exit "$rc"
|
||
fi
|
||
attempt=$((attempt + 1))
|
||
sleep "${CAIWU_JST_SYNC_RETRY_WAIT:-300}"
|
||
done
|
||
fi
|
||
docker compose -f compose.jiangling.yml --profile batch run --rm -T --no-deps batch "$@"
|