diff --git a/docs/superpowers/plans/2026-10-12-user-sync.md b/docs/superpowers/plans/2026-10-12-user-sync.md index d59401e..bb5204c 100644 --- a/docs/superpowers/plans/2026-10-12-user-sync.md +++ b/docs/superpowers/plans/2026-10-12-user-sync.md @@ -1069,15 +1069,24 @@ fn h_sync_push(r: *mut ngx_http_request_t, _actor: Actor) -> Status { } /// GET /api/admin/sync/export —— 导出本侧权威字段(供对端 pull)。 +/// GET /api/admin/sync/export —— 导出本侧权威字段全量快照。 +/// +/// ⚠️ **必须发裸 `SyncPayload`,不能用 `http::ok`**。`http::ok` 会包成 +/// `{code,data,msg}` 信封,而对端 `sync::pull_from_peer` 是 +/// `serde_json::from_str::` 直接解顶层 `users`/`deleted`—— +/// serde 忽略未知的 `code`/`data`/`msg`,随后因缺 `users` 字段报错, +/// **pull 每次都必然失败**(且只在 Task 7 端到端才暴露)。 +/// 同步链路是机器对机器、自带 token 鉴权,不该耦合管理台信封格式; +/// 信封形状是会变的(壳现在读 `data.plugins`)。 fn h_sync_export(r: *mut ngx_http_request_t, _actor: Actor) -> Status { let Some(side) = sync::local_authority() else { return http::fail(r, HTTPStatus::BAD_REQUEST, "本部署未配置 IPASS_SYNC_SIDE"); }; let payload = sync::authority_view(&store::read_users(), side); - http::ok(r, json!({ - "users": payload.users, - "deleted": payload.deleted, - }), "导出本侧权威字段") + match serde_json::to_string(&payload) { + Ok(body) => http::send(r, HTTPStatus::OK, &body), + Err(e) => http::fail(r, HTTPStatus::INTERNAL_SERVER_ERROR, &format!("序列化同步载荷失败:{e}")), + } } /// POST /api/admin/sync/pull —— 主动从对端拉全量并合并(补偿手段)。