From bafdc9822890c6dd2d00ebf6c1accb4cf9fc0266 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 26 Oct 2026 20:15:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor(b1b):=20=E6=90=AC=E5=AE=B6=20=E2=80=94?= =?UTF-8?q?=E2=80=94=20=E5=B9=B3=E5=8F=B0=E5=B1=82/=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=B1=82=E5=88=86=E7=A6=BB=EF=BC=88=E8=A1=8C=E4=B8=BA=E9=9B=B6?= =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按 v3 spec §2.1 的目录映射,把 9810 行代码重组成「平台层 + 业务层」两段: **平台层 `src/platform/`**(12 个文件,与业务零知识) - state / config / db / session / envelope / cipher / ids / protocol - body / mw / fallback(原 `src/routes/`,是通用响应改写与兜底,不是业务) **业务层 `src/tdc/`**(对位上游 `ssw.tdc.*` 包族) - `entity/` —— `registry.rs` 拆成 **18 个实体各一文件** + `mod.rs`(`ALL_SPECS` / `validate` / 权限键) - `mapper.rs` —— 原 `crud.rs` 的 SQL 组装/投影/序列化半边(机械活、实体无关) - `service/crud.rs` —— 原 `crud.rs` 的写路径规则/分档判定半边 - `service/identity.rs` / `service/account.rs` —— 原 `domain/identity.rs` / `account.rs` - `controller/` —— 原 `routes/`(crud / health / auth / account / tds_biz) - `client/tds.rs` —— 原 `tds/mod.rs`(TDS 出向客户端) - `util/code.rs` —— 原 `codec.rs`(**业务**编码生成器,非平台件) - `support/public_paths.rs` —— 免鉴权端点清单(业务侧持有,C5 接线) - `policy/ engine/ schedule/ notify/ heartbeat/ sso/` —— 上游同名包占位 **行为零变化**:HTTP 契约、响应形状、SQL、口令算法、权限判定全部不动。 - `cargo test` 223 passed / 0 failed / 1 ignored(与 B1a 基线一致) - `scripts/smoke.sh` PASS=75 / FAIL=0(断言数 == 基线 N=75,不增不减) - `scripts/check-boundary.sh` exit 0(账本 7 条 B1b 待清 + 2 条永久豁免) - `scripts/check-entity.sh` PASS=15 / FAIL=0 **边界账本同步**:CP3 的 `routes/crud.rs` 条目改为 `controller/crud.rs`(账本按路径后缀匹配,搬家不失效)。 **为什么搬家必须一个 commit**:`check-boundary.sh` 的 NEW_LAYOUT/LEGACY 判定是**全有或全无** (`src/platform/` 目录存在即切新布局)⇒ 分批搬会让账本条目在中间态失效 ⇒ 尺子当场红。 ⇒ 搬家一个 commit,之后 C1–C12 各一个 commit。 Co-Authored-By: Claude Code --- CLAUDE.md | 69 ++-- scripts/boundary-ledger.txt | 8 +- src/domain/mod.rs | 3 - src/lib.rs | 25 +- src/main.rs | 38 +- src/{ => platform}/auth.rs | 4 +- src/{routes => platform}/body.rs | 2 +- src/{ => platform}/cipher.rs | 0 src/{ => platform}/config.rs | 0 src/{ => platform}/db.rs | 2 +- src/{ => platform}/envelope.rs | 0 src/{routes => platform}/fallback.rs | 0 src/{ => platform}/ids.rs | 0 src/platform/mod.rs | 39 ++ src/{routes => platform}/mw.rs | 2 +- src/{ => platform}/protocol.rs | 6 +- src/{ => platform}/session.rs | 0 src/{ => platform}/state.rs | 8 +- src/tdc/client/mod.rs | 5 + src/{tds/mod.rs => tdc/client/tds.rs} | 0 src/{routes => tdc/controller}/account.rs | 18 +- src/{routes => tdc/controller}/auth.rs | 4 +- src/{routes => tdc/controller}/crud.rs | 21 +- src/{routes => tdc/controller}/health.rs | 6 +- src/{routes => tdc/controller}/mod.rs | 10 +- src/{routes => tdc/controller}/tds_biz.rs | 16 +- src/tdc/engine/mod.rs | 6 + src/tdc/entity/api_consume_log.rs | 34 ++ src/tdc/entity/audit_log.rs | 30 ++ src/tdc/entity/contract.rs | 35 ++ src/tdc/entity/credential.rs | 31 ++ src/tdc/entity/data_interface.rs | 24 ++ src/tdc/entity/dataset.rs | 27 ++ src/tdc/entity/datasource.rs | 29 ++ src/tdc/entity/delivery_log.rs | 26 ++ src/tdc/entity/delivery_task.rs | 48 +++ src/tdc/entity/destroy_log.rs | 26 ++ src/tdc/entity/identity.rs | 38 ++ src/{registry.rs => tdc/entity/mod.rs} | 467 +++------------------ src/tdc/entity/notification.rs | 29 ++ src/tdc/entity/order.rs | 33 ++ src/tdc/entity/policy.rs | 26 ++ src/tdc/entity/policy_check_log.rs | 27 ++ src/tdc/entity/policy_template.rs | 22 + src/tdc/entity/product.rs | 33 ++ src/tdc/entity/resource.rs | 32 ++ src/tdc/heartbeat/mod.rs | 3 + src/tdc/mapper.rs | 412 +++++++++++++++++++ src/tdc/mod.rs | 29 ++ src/tdc/notify/mod.rs | 3 + src/tdc/policy/mod.rs | 6 + src/tdc/schedule/mod.rs | 3 + src/{ => tdc/service}/account.rs | 6 +- src/{ => tdc/service}/crud.rs | 478 +++------------------- src/{domain => tdc/service}/identity.rs | 12 +- src/tdc/service/mod.rs | 11 + src/tdc/sso/mod.rs | 5 + src/tdc/support/mod.rs | 6 + src/tdc/support/public_paths.rs | 20 + src/{codec.rs => tdc/util/code.rs} | 0 src/tdc/util/mod.rs | 7 + tests/account_api.rs | 18 +- tests/api_smoke.rs | 18 +- tests/auth_flow.rs | 14 +- tests/bootstrap_fail.rs | 10 +- tests/crud_engine.rs | 70 ++-- tests/permission_gate.rs | 34 +- tests/spa_fallback.rs | 2 +- tests/tds_biz.rs | 18 +- 69 files changed, 1438 insertions(+), 1056 deletions(-) delete mode 100644 src/domain/mod.rs rename src/{ => platform}/auth.rs (99%) rename src/{routes => platform}/body.rs (98%) rename src/{ => platform}/cipher.rs (100%) rename src/{ => platform}/config.rs (100%) rename src/{ => platform}/db.rs (99%) rename src/{ => platform}/envelope.rs (100%) rename src/{routes => platform}/fallback.rs (100%) rename src/{ => platform}/ids.rs (100%) create mode 100644 src/platform/mod.rs rename src/{routes => platform}/mw.rs (97%) rename src/{ => platform}/protocol.rs (99%) rename src/{ => platform}/session.rs (100%) rename src/{ => platform}/state.rs (97%) create mode 100644 src/tdc/client/mod.rs rename src/{tds/mod.rs => tdc/client/tds.rs} (100%) rename src/{routes => tdc/controller}/account.rs (96%) rename src/{routes => tdc/controller}/auth.rs (85%) rename src/{routes => tdc/controller}/crud.rs (90%) rename src/{routes => tdc/controller}/health.rs (90%) rename src/{routes => tdc/controller}/mod.rs (81%) rename src/{routes => tdc/controller}/tds_biz.rs (98%) create mode 100644 src/tdc/engine/mod.rs create mode 100644 src/tdc/entity/api_consume_log.rs create mode 100644 src/tdc/entity/audit_log.rs create mode 100644 src/tdc/entity/contract.rs create mode 100644 src/tdc/entity/credential.rs create mode 100644 src/tdc/entity/data_interface.rs create mode 100644 src/tdc/entity/dataset.rs create mode 100644 src/tdc/entity/datasource.rs create mode 100644 src/tdc/entity/delivery_log.rs create mode 100644 src/tdc/entity/delivery_task.rs create mode 100644 src/tdc/entity/destroy_log.rs create mode 100644 src/tdc/entity/identity.rs rename src/{registry.rs => tdc/entity/mod.rs} (66%) create mode 100644 src/tdc/entity/notification.rs create mode 100644 src/tdc/entity/order.rs create mode 100644 src/tdc/entity/policy.rs create mode 100644 src/tdc/entity/policy_check_log.rs create mode 100644 src/tdc/entity/policy_template.rs create mode 100644 src/tdc/entity/product.rs create mode 100644 src/tdc/entity/resource.rs create mode 100644 src/tdc/heartbeat/mod.rs create mode 100644 src/tdc/mapper.rs create mode 100644 src/tdc/mod.rs create mode 100644 src/tdc/notify/mod.rs create mode 100644 src/tdc/policy/mod.rs create mode 100644 src/tdc/schedule/mod.rs rename src/{ => tdc/service}/account.rs (99%) rename src/{ => tdc/service}/crud.rs (64%) rename src/{domain => tdc/service}/identity.rs (98%) create mode 100644 src/tdc/service/mod.rs create mode 100644 src/tdc/sso/mod.rs create mode 100644 src/tdc/support/mod.rs create mode 100644 src/tdc/support/public_paths.rs rename src/{codec.rs => tdc/util/code.rs} (100%) create mode 100644 src/tdc/util/mod.rs diff --git a/CLAUDE.md b/CLAUDE.md index 9c674ac..0f9a07f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -31,23 +31,30 @@ tdc-rs/ ├── Cargo.toml # 依赖 + release 优化(lto=thin / strip / panic=abort) ├── Cargo.lock # 锁定版本 ├── src/ -│ ├── main.rs # 启动装配(199 行):PGlite open / 引导身份 / 账号库 / 路由 / 中间件 / 静态兜底 -│ ├── lib.rs # 模块声明(业务逻辑都在 lib 里,bin 只做装配) -│ ├── state.rs # AppState(config + db + db_lock + sessions + accounts + bootstrap + tds) -│ ├── auth.rs # 入向鉴权中间件 + 三道门 + 主体(Principal) -│ ├── session.rs # 会话存储(两种 kind:Identity / Account) -│ ├── protocol.rs # 协议版本闸门 -│ ├── envelope.rs # 业务信封 ActionResult(HTTP 200 + {code,msg,data}) -│ ├── registry.rs # 18 实体注册表 + 权限键 + 启动自检 -│ ├── crud.rs # CRUD 引擎(读写路径 + 权限键判定 + 冻结列) -│ ├── db.rs # PGlite 封装(query_json / ensure_schema) -│ ├── codec.rs / ids.rs # 出参 camelCase 编解码 / id 生成 -│ ├── account.rs # 本地账号库(JSON 文件 + Mutex) -│ ├── cipher.rs # 登录口令加解密(MD5 + AES-256-ECB,对齐上游 cipher.ts) -│ ├── config.rs # 环境变量配置 + 密钥守卫 -│ ├── tds/mod.rs # TDS 出向客户端(照抄上游 TdsReportClient 的 internal 通道,9 个方法) -│ ├── domain/identity.rs # 身份引导 / Auth 端点 / 能力集 -│ └── routes/ # 按域装配:health / auth / account / crud / tds_biz / body / mw / fallback +│ ├── main.rs # 启动装配:PGlite open / 引导身份 / 账号库 / 路由 / 中间件 / 静态兜底 +│ ├── lib.rs # 模块声明(只暴露 `platform` 与 `tdc` 两层,bin 只做装配) +│ ├── platform/ # 【平台层】与业务**零**知识(边界由 check-boundary.sh 静态钉住) +│ │ ├── state.rs # AppState(config + db + db_lock + sessions + accounts + bootstrap + tds) +│ │ ├── config.rs # 环境变量配置 + 密钥守卫 +│ │ ├── db.rs # PGlite 封装(query_json / ensure_schema / f_↔camelCase 映射) +│ │ ├── session.rs # 会话存储(两种 kind:Identity / Account) +│ │ ├── envelope.rs # 业务信封 ActionResult(HTTP 200 + {code,msg,data}) +│ │ ├── auth.rs # 入向鉴权中间件 + 三道门 + 主体(Principal) +│ │ ├── cipher.rs # 登录口令加解密(MD5 + AES-256-ECB,对齐上游 cipher.ts) +│ │ ├── ids.rs # id 生成 +│ │ ├── protocol.rs # 协议版本闸门 +│ │ ├── body.rs # 宽松 JSON 体 +│ │ ├── mw.rs # 405 JSON 改写中间件 +│ │ └── fallback.rs # 404 JSON + SPA 静态兜底 + DDL 两层守卫 +│ └── tdc/ # 【业务层】对位上游 `ssw.tdc.*` 包族 +│ ├── entity/ # 18 个实体各一文件 + mod.rs(ALL_SPECS / validate / 权限键) +│ ├── mapper.rs # SQL 组装与执行、投影与序列化(引擎的机械活,**实体无关**) +│ ├── service/ # 业务规则:crud(写路径分档)/ account(本地账号库)/ identity(身份域) +│ ├── controller/ # HTTP 端点:crud / health / auth / account / tds_biz +│ ├── client/tds.rs # TDS 出向客户端(照抄上游 TdsReportClient 的 internal 通道,9 个方法) +│ ├── util/code.rs # 业务编码生成器(原 src/codec.rs:PRO/RES/API/DS 前缀 + 两套上游生成器) +│ ├── support/ # 业务侧公共清单(public_paths:免鉴权端点) +│ └── policy/ engine/ schedule/ notify/ heartbeat/ sso/ # 上游同名包占位(后续批) ├── static/ # 上游 SPA 构建产物(index.html + logo.png + assets/,8 个产物文件) ├── schema/ │ └── migrate.sql # tdc_* schema(include_str! 内嵌进二进制,**30 表**,**不在 web root**) @@ -65,17 +72,23 @@ tdc-rs/ ## 架构约定(红线) +- 🔴 **平台层 / 业务层边界**(v3 spec §2.3):`src/platform/` 里**不许出现业务知识** + ——业务表名(`tdc_*`)、实体名(`Product` / `Resource` / …)、具体端点路径(`/api/ssw/tdc/…`)、 + 业务表数量;`src/tdc/` 里**不许出现平台能力的第二份实现**。 + 这条**可被静态检查** ⇒ `scripts/check-boundary.sh` 的 4 个接触点(CP1–CP4)。 + 🔴 **通用 CRUD 引擎住在业务层**(`tdc/mapper.rs` + `tdc/service/crud.rs` + `tdc/controller/crud.rs`, + 对位上游 `TdcCrudController`)但**逻辑必须实体无关(零 `match api_name`)** ⇒ 分支只能读 `TableSpec` 字段。 - 🔴 **前端不直接持有数据库。** 所有数据访问经 `/api/ssw/tdc/*` REST;不得把 PGlite 重新塞回浏览器。 - 🔴 **不自研前端。** 控制台 = **上游完整前端的构建产物**(`static/`)。改 UI 改上游,**不在本仓写前端**。 - 🔴 **业务错误必须读 body 的 `code`。** 上游 TDS 用 HTTP 200 承载业务错误码(如 `code:600` 登录过期), 只看 HTTP 状态会把失败误判成成功。本仓的**业务失败一律 HTTP 200 + `{code,msg,data}`**; **鉴权/授权失败是另一种形状**:HTTP 401/403 + 裸 `{"success":false,"code":…,"msg":"…"}`(**无 `data` 键**)。 - 🔴 **schema DDL 绝不可从 HTTP 下载。** `schema/migrate.sql` **刻意不在 web root**(`static/` 会被挂上去), - 另有**两层兜底**(`src/routes/fallback.rs` 的 `ddl_guard` 前置守卫 + `ddl_content_guard` 内容兜底)。 + 另有**两层兜底**(`src/platform/fallback.rs` 的 `ddl_guard` 前置守卫 + `ddl_content_guard` 内容兜底)。 - 🔴 **私钥不得外泄。** 身份私钥只落盘 `data/`;API 一律返回去敏后的公开视图 (**不要**用 `#[serde(skip_serializing)]` —— 会让落盘 JSON 缺字段、回读失败)。 🔴 **CRUD 出参也不许带密钥**:上游实体上标了 `@JsonIgnore` 的属性(`Identity.secretKey` / - `DeliveryTask.devUrl` / `devToken`)在本仓由 `registry::TableSpec::hidden_fields` 登记 ⇒ + `DeliveryTask.devUrl` / `devToken`)在本仓由 `crate::tdc::entity::TableSpec::hidden_fields` 登记 ⇒ 出参**整条删键**、入参**静默忽略**(照抄 Jackson 双向语义)。**新增实体/字段前先查上游 `ssw-tdc-entity` 有没有 `@JsonIgnore`**,别靠「这列没人写」蒙混。 - 🔴 **口令不得外泄。** 账号库只存 `md5(明文)`;对外响应**手工挑字段**(`account_view`),不得把 `Account` 整个塞出去。 @@ -175,7 +188,7 @@ bash scripts/check-entity.sh # ③ 实体静态(加实体的接触点完 `Datasource` / `DeliveryLog` / `DeliveryTask` / `DestroyLog` / `Identity` / `Notification` / `Order` / `Policy` / `PolicyCheckLog` / `PolicyTemplate` / `Product` / `Resource` -> ⚠️ 写入能力**按实体分档**(真值见 `src/registry.rs` 的 `no_create` / `no_update` / `no_delete`): +> ⚠️ 写入能力**按实体分档**(真值见 `src/tdc/entity/mod.rs` 的 `no_create` / `no_update` / `no_delete`): > `Dataset` 是 `tdc_resource` 的**只读视图**(禁增/改/删);`ApiConsumeLog` 全只读; > `AuditLog` 禁改禁删(可增);`DeliveryTask` / `DestroyLog` 禁增禁删(可改); > `Contract` / `DeliveryLog` / `PolicyCheckLog` 禁删(可增可改)。 @@ -194,7 +207,7 @@ bash scripts/check-entity.sh # ③ 实体静态(加实体的接触点完 ### 权限键(写操作二次校验) -`src/registry.rs` 的 `PERMISSION_KEYS` 声明 18 条「实体 → 权限键」;权限键来自 +`src/tdc/entity/mod.rs` 的 `PERMISSION_KEYS` 声明 18 条「实体 → 权限键」;权限键来自 `tdc_identity.f_capability`(`domain::identity::capabilities()`)。 - 能力集**解析不出** ⇒ **fail-open**(本地单机模式没有能力集,不该把写操作全锁死)。 @@ -208,10 +221,10 @@ bash scripts/check-entity.sh # ③ 实体静态(加实体的接触点完 **这是规避逐列类型映射的关键手法**,新增查询一律沿用 `query_json()`,不要另起逐类型分支。 2. **单 backend 串行化**:pglite 是单 in-process backend,所有 DB 访问必须持 `state.db_lock`(`tokio::Mutex`)。 3. **表名白名单**:`valid_table()` 只允许 `[A-Za-z][A-Za-z0-9_]*`,任何拼接表名的地方都要走它; - `registry::validate()` 在**启动时**自检全部拼进 SQL 的标识符(不过白名单 ⇒ 秒退)。 + `entity::validate()` 在**启动时**自检全部拼进 SQL 的标识符(不过白名单 ⇒ 秒退)。 4. **路径与 cwd 解耦**:`resolve_project_dir()` 从可执行文件向上找含 `static/index.html` 的目录, `static/` 与 `data/` 都基于它,**不要改成相对 cwd**(后台启动时会 500)。 -5. **`include_str!` 路径相对 `src/db.rs`**:写 `../schema/migrate.sql`,不是 `../../schema/`。 +5. **`include_str!` 路径相对 `src/platform/db.rs`**:写 `../../schema/migrate.sql`,不是 `../schema/`。 6. **camelCase ↔ snake_case**:请求结构体一律加 `#[serde(rename_all = "camelCase")]`。 🔴 **例外**:`/api/oauth/Login` 的表单字段名就是 `grant_type`(上游送的就是这个)⇒ **不能**加 camelCase (加了字段永远为 `None`),改用 `#[serde(default, alias = "grantType")]`。 @@ -270,7 +283,7 @@ bash scripts/check-entity.sh # ③ 实体静态(加实体的接触点完 ⇒ `migrate.sql` 保持逐字节一致、`/api/health` 的 `tables` 恒为 30。 首启引导 `admin` / `admin`(⚠️ **本地调试默认值**,对外部署前必须改掉)。 口令只存 `md5(明文)`;`update` 不动口令;管理员账号不可删;落盘走 `.tmp` → rename,失败**当业务失败抛出**。 -- `src/routes/account.rs`:登录 + 用户管理 6 端点 + 管理员闸门 `require_admin` +- `src/tdc/controller/account.rs`:登录 + 用户管理 6 端点 + 管理员闸门 `require_admin` (连接器身份会话 / 管理员账号放行;**内部令牌刻意 403**,比上游严一档;查不到账号 ⇒ fail-closed 403)。 ## TDS 出向通道(P4) @@ -283,7 +296,7 @@ bash scripts/check-entity.sh # ③ 实体静态(加实体的接触点完 ⇒ `data` 或 `Err(msg)`)/**整包型**(`list_billing_for_connector` / `dispute` / `confirm` / `settle` / `receipt` / `voucher` ⇒ 原始 `{code,msg,data}`)。 ⚠️ 整包型**成功**时 `data` 是**字符串**(账本 id),不是对象。 -- `src/routes/tds_biz.rs`:**10 个对外端点**(服务目录 3 + 账单 7),照抄上游 +- `src/tdc/controller/tds_biz.rs`:**10 个对外端点**(服务目录 3 + 账单 7),照抄上游 `ServiceCatalogController` + `BillingController`。 - 身份解析**两套口径**:宽松(List/Dispute/Receipt/Voucher/LocalCompare)/ 严格(Confirm/Settle)—— 照抄上游,不统一。 @@ -312,7 +325,7 @@ bash scripts/check-entity.sh # ③ 实体静态(加实体的接触点完 | 症状 | 根因 | 处理 | |---|---|---| -| `include_str!` 编译失败找不到文件 | 路径相对 `src/db.rs` | 用 `../schema/migrate.sql` | +| `include_str!` 编译失败找不到文件 | 路径相对 `src/platform/db.rs` | 用 `../../schema/migrate.sql` | | `/` 返回 500、静态资源 404 | 路径基于 cwd,后台启动 cwd 漂移 | 用 `resolve_project_dir()` | | curl 测 localhost 得 502 | 走了系统 HTTP 代理 | 加 `--noproxy '*'` | | 落盘 JSON 回读失败 | 用了 `#[serde(skip_serializing)]` | 磁盘存全量、API 走单独的对外视图 | @@ -322,7 +335,7 @@ bash scripts/check-entity.sh # ③ 实体静态(加实体的接触点完 | `Option>` 编译不过 | axum 0.8.9 的 `Form` 无 `OptionalFromRequest` | 取原始 body 自己解析 | | 405 返回 HTML / 丢 `Allow` 头 | 用了 axum 的 `method_not_allowed_fallback` | 用 `routes::mw::json_method_not_allowed` | | DDL 能从 HTTP 下载 | DDL 落在 web root | 移到 `schema/` + `ddl_guard` 两层兜底(**Range 分段也要拦**) | -| 表名注入 | 直接拼表名 | 一律走 `valid_table()` + `registry::validate()` | +| 表名注入 | 直接拼表名 | 一律走 `valid_table()` + `entity::validate()` | | 两个实例共用 `data/` 报 `postmaster.pid` 锁冲突 | pglite 单实例独占数据目录 | 用不同目录/端口起第二个实例 | | 并行测试互相撞车 | `tdc_identity` 有唯一约束 / 账号库是持久文件 | 每个用例用**唯一**身份码 + **独立**账号文件 | | release 首次编译慢 | 全依赖需重编 | 走 sccache | @@ -349,7 +362,7 @@ Notebook / VizChart / Quality* / HostingJob / DestroyLog` 等——依赖 **Nax - **TDS 的 login / `ensureToken` 通道**(JNPF 登录换 token)**不做** —— P4 只实现 internal 通道。 - ~~`/api/ssw/tdc/tds/*` 代理网关~~ **已永久下线**(旧 Bridge 通道,⇒ 404)⇒ 别再复活。 - **JNPF 角色 / 菜单 / 授权模型**(j7 的 `base_role` / `base_module` 等)**不引入** - ⇒ 本仓的权限判定走**声明式权限键**(`registry::PERMISSION_KEYS`),不走菜单。 + ⇒ 本仓的权限判定走**声明式权限键**(`entity::PERMISSION_KEYS`),不走菜单。 ## 记忆约定 diff --git a/scripts/boundary-ledger.txt b/scripts/boundary-ledger.txt index 7c0afcf..1568a96 100644 --- a/scripts/boundary-ledger.txt +++ b/scripts/boundary-ledger.txt @@ -8,7 +8,9 @@ # # 列:规则 文件(路径后缀,搬家不失效) 命中子串(留空 = 该文件全部) 为什么可接受 责任(B1b / 永久) # -# ── 旧布局(src/*.rs)下的已知越界 ────────────────────────────── +# ── 新布局(src/platform/ + src/tdc/)下的已知越界 ────────────────── +# +# 文件字段按**路径后缀**匹配 ⇒ 搬家(src/auth.rs → src/platform/auth.rs)不会让条目失效。 CP1 auth.rs /api/ssw/tdc/ C5:白名单清单待归业务层 src/tdc/support/public_paths.rs(并剪掉 7 条死路径) B1b CP1 db.rs tdc_identity C4:schema 探针待通用化(改查 pg_catalog.pg_tables) B1b @@ -16,6 +18,6 @@ CP2 session.rs Identity 假阳性:SessionKind::Identity 是**会话口径**, CP2 auth.rs SessionKind::Identity 假阳性:Principal::Session 分支里的会话种类,不是业务实体 永久 CP3 crud.rs match spec.api_name C1:child_tables 待改成读 TableSpec 字段 B1b CP3 crud.rs match api_name C2:detail_not_found_msg 待改成读 TableSpec 字段 B1b -CP3 routes/crud.rs find("Resource") C3:聚合详情注册待改成遍历 spec B1b -CP3 routes/crud.rs find("Dataset") C3:聚合详情注册待改成遍历 spec B1b +CP3 controller/crud.rs find("Resource") C3:聚合详情注册待改成遍历 spec B1b +CP3 controller/crud.rs find("Dataset") C3:聚合详情注册待改成遍历 spec B1b CP4 auth.rs /api/ C5:白名单清单待归业务层(含 /api/oauth/Login 与 /api/health 两条) B1b diff --git a/src/domain/mod.rs b/src/domain/mod.rs deleted file mode 100644 index 7e0b232..0000000 --- a/src/domain/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -//! 业务域模块。 - -pub mod identity; diff --git a/src/lib.rs b/src/lib.rs index 2dc8791..411ca85 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,20 +6,13 @@ //! - 业务错误读 body 的 `code`,不只看 HTTP 状态。 //! - 所有 DB 访问持 `state.db_lock`(PGlite 单 in-process backend)。 //! - 任意 SELECT 走 `db::query_json()`(row_to_json 包裹)。 +//! +//! **分层(v3 spec §2.1)**: +//! - `platform/` —— 与业务无关的基础设施(**零业务知识**); +//! - `tdc/` —— 业务层,对位上游 `ssw.tdc.*` 包族。 +//! +//! 🔴 分层后的唯一入口是 `crate::platform::*` 与 `crate::tdc::*` —— +//! 根模块**不再**暴露任何业务件(避免「又漏回根模块」的第二条路径)。 -pub mod account; -pub mod auth; -pub mod cipher; -pub mod codec; -pub mod config; -pub mod crud; -pub mod db; -pub mod domain; -pub mod envelope; -pub mod ids; -pub mod protocol; -pub mod registry; -pub mod routes; -pub mod session; -pub mod state; -pub mod tds; +pub mod platform; +pub mod tdc; diff --git a/src/main.rs b/src/main.rs index db3d15f..89f9fc9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ //! - Rust(axum) 同时充当「控制面 + 数据面 + 静态托管」: //! * 内嵌 **pglite-rs**(进程内原生 PostgreSQL,数据落在 `data/tdc.pg/`), //! 承载全部 tdc_* 业务数据。 -//! * `/api/ssw/tdc/*` —— 18 个实体的通用 CRUD + 鉴权 + 会话(`routes::build_router` 装配)。 +//! * `/api/ssw/tdc/*` —— 18 个实体的通用 CRUD + 鉴权 + 会话(`tdc::controller::build_router` 装配)。 //! * `/api/**` 未命中 ⇒ **404 + JSON**(不是 SPA 的 HTML:前端据此显示「接口不存在」)。 //! * 根路径托管**上游完整前端的构建产物**(`static/`),深链回退到 `index.html`。 //! - 旧版的 `/api/db/*`、`/api/ssw/tdc/node/identity*`、`/api/ssw/tdc/tds/*` @@ -13,8 +13,8 @@ //! 对应 ssw-mvp 中 `boot/ssw-tdc` 子系统,但去除了 JNPF/Spring 重底座与隐私计算作业 //! (Nax/Tee/Sandbox 等依赖 Nax 引擎与 scard TEE,本地不可行,列为 MVP 外)。 //! -//! ⚠️ Task 6 起:全局状态统一在 `tdc_connector::state::AppState`(配置 + PGlite + 锁 + 会话), -//! 业务路由按域拆到 `tdc_connector::routes::*`(`build_router` 装配)。 +//! ⚠️ Task 6 起:全局状态统一在 `tdc_connector::platform::state::AppState`(配置 + PGlite + 锁 + 会话), +//! 业务路由按域拆到 `tdc_connector::tdc::controller::*`(`build_router` 装配)。 use std::path::PathBuf; use std::sync::Arc; @@ -23,13 +23,13 @@ use axum::{routing::any, Router}; use pglite::PGlite; use tower_http::cors::CorsLayer; -use tdc_connector::auth::{auth_middleware, AuthState}; -use tdc_connector::config::Config; -use tdc_connector::db::ensure_schema; -use tdc_connector::routes::build_router; -use tdc_connector::routes::fallback::{api_not_found, spa_fallback}; -use tdc_connector::session::SessionStore; -use tdc_connector::state::{AppState, BootstrapIdentity}; +use tdc_connector::platform::auth::{auth_middleware, AuthState}; +use tdc_connector::platform::config::Config; +use tdc_connector::platform::db::ensure_schema; +use tdc_connector::tdc::controller::build_router; +use tdc_connector::platform::fallback::{api_not_found, spa_fallback}; +use tdc_connector::platform::session::SessionStore; +use tdc_connector::platform::state::{AppState, BootstrapIdentity}; const APP_VERSION: &str = env!("CARGO_PKG_VERSION"); @@ -60,7 +60,7 @@ async fn main() { { let args: Vec = std::env::args().collect(); if args.len() >= 3 && (args[1] == "--enc" || args[1] == "-e") { - println!("{}", tdc_connector::cipher::encrypt_login_password(&args[2])); + println!("{}", tdc_connector::platform::cipher::encrypt_login_password(&args[2])); return; } } @@ -77,7 +77,7 @@ async fn main() { // 注册表自检:表名/列名不过白名单 ⇒ 启动即失败(fail fast),别拖到运行期。 // 🔴 放在 `PGlite::open` **之前**:注册表写坏时要「秒退」, // 不该先付一次内嵌 PG 的 initdb 成本再退出。 - if let Err(msg) = tdc_connector::registry::validate() { + if let Err(msg) = tdc_connector::tdc::entity::validate() { eprintln!("[tdc-connector] 注册表自检失败: {}", msg); std::process::exit(1); } @@ -113,7 +113,7 @@ async fn main() { sessions.clone(), BootstrapIdentity::default(), ); - let bootstrap = tdc_connector::domain::identity::bootstrap_identity(&state).await; + let bootstrap = tdc_connector::tdc::service::identity::bootstrap_identity(&state).await; // 🔴 没有身份(引导 INSERT 失败)⇒ 直接退出:一个连登录都做不了的连接器, // 「启动失败一眼看得出」远好于「服务起着但一登录就报错」。 if bootstrap.identity_id.is_empty() { @@ -142,13 +142,13 @@ async fn main() { // ⚠️ `data_dir` 已在上面定义(来自 `config.data_dir`)⇒ 这里**不重新定义**。 // 🔴 引导口令可被 `TDC_BOOTSTRAP_ADMIN_PASSWORD` 覆盖(**只对空库生效**)。 let accounts = Arc::new( - tdc_connector::account::AccountStore::open_with_admin( + tdc_connector::tdc::service::account::AccountStore::open_with_admin( &data_dir.join("accounts.json"), &config.bootstrap_admin_account, config .bootstrap_admin_password .as_deref() - .unwrap_or(tdc_connector::account::BOOTSTRAP_ADMIN_PASSWORD), + .unwrap_or(tdc_connector::tdc::service::account::BOOTSTRAP_ADMIN_PASSWORD), ) .expect("打开本地账号库失败"), ); @@ -158,7 +158,7 @@ async fn main() { eprintln!( "[tdc-connector] TDC_STRICT_SECRETS=1:本地管理员仍在用默认口令 `{}` ⇒ 启动即失败。\ 请用 TDC_BOOTSTRAP_ADMIN_PASSWORD 引导,或先改密。", - tdc_connector::account::BOOTSTRAP_ADMIN_PASSWORD + tdc_connector::tdc::service::account::BOOTSTRAP_ADMIN_PASSWORD ); std::process::exit(1); } @@ -184,7 +184,7 @@ async fn main() { // ⇒ **绝不能**从 HTTP 下载(上游部署里 DDL 不在 web root)。 // 🔴 该文件**已移出 web root**(现在在 `schema/`)⇒ ServeDir 根本读不到它; // 这条字面路由只是**额外**兜住这个字面路径。 - // 🔴 **前置守卫**是 `routes::fallback::ddl_guard`(**跑在 `ServeDir` 之前** + // 🔴 **前置守卫**是 `platform::fallback::ddl_guard`(**跑在 `ServeDir` 之前** // 的前置中间件),**两层**: // ① 路径级:路径中**任意一段的扩展名**(去尾部空白与尾部 `.`、 // **Unicode 大写折叠**后)等于 `SQL` ⇒ 404 + JSON(**类**规则,`.sql` 全覆盖); @@ -193,7 +193,7 @@ async fn main() { // ⚠️ 两层都是**兜底**;根因修复是「DDL 文件不在 web root」。 .route("/migrate.sql", any(api_not_found)) // ③ 静态托管挂**根**(vite base 是 `/`,产物引用 `/assets/...`) - // 兜底服务(`routes::fallback::spa_fallback`): + // 兜底服务(`platform::fallback::spa_fallback`): // - **前置守卫** `ddl_guard` ⇒ 路径中任意一段的扩展名(Unicode 大写折叠后) // 等于 `SQL` 时 404 + JSON(**先于** ServeDir) // - **内容兜底** `ddl_content_guard` ⇒ 响应体是**内嵌 DDL**(整份**或** `Range` @@ -205,7 +205,7 @@ async fn main() { // ④ 空体 405 ⇒ 业务信封(保留原 headers,含 `Allow`)。 // 🔴 必须放链尾:`Router::layer` 只作用于**调用时已注册**的路由。 .layer(axum::middleware::from_fn( - tdc_connector::routes::mw::json_method_not_allowed, + tdc_connector::platform::mw::json_method_not_allowed, )) .layer(axum::middleware::from_fn_with_state( auth_state, diff --git a/src/auth.rs b/src/platform/auth.rs similarity index 99% rename from src/auth.rs rename to src/platform/auth.rs index 9732757..8cc96df 100644 --- a/src/auth.rs +++ b/src/platform/auth.rs @@ -21,8 +21,8 @@ use axum::middleware::Next; use axum::response::{IntoResponse, Response}; use serde_json::json; -use crate::protocol::{check_protocol, INTERNAL_TOKEN_HEADER, PROTOCOL_VERSION_HEADER}; -use crate::session::{SessionKind, SessionStore}; +use crate::platform::protocol::{check_protocol, INTERNAL_TOKEN_HEADER, PROTOCOL_VERSION_HEADER}; +use crate::platform::session::{SessionKind, SessionStore}; /// 连接器会话令牌头。 pub const AUTH_TOKEN_HEADER: &str = "X-Auth-Token"; diff --git a/src/routes/body.rs b/src/platform/body.rs similarity index 98% rename from src/routes/body.rs rename to src/platform/body.rs index 63d91cc..be307af 100644 --- a/src/routes/body.rs +++ b/src/platform/body.rs @@ -5,7 +5,7 @@ use axum::extract::{FromRequest, Request}; use axum::response::{IntoResponse, Response}; use serde_json::Value; -use crate::envelope::ActionResult; +use crate::platform::envelope::ActionResult; /// 上游的原文拒因(`SswExceptionHandler#handleNotReadable`)。 /// diff --git a/src/cipher.rs b/src/platform/cipher.rs similarity index 100% rename from src/cipher.rs rename to src/platform/cipher.rs diff --git a/src/config.rs b/src/platform/config.rs similarity index 100% rename from src/config.rs rename to src/platform/config.rs diff --git a/src/db.rs b/src/platform/db.rs similarity index 99% rename from src/db.rs rename to src/platform/db.rs index 51a7a78..4069476 100644 --- a/src/db.rs +++ b/src/platform/db.rs @@ -15,7 +15,7 @@ use serde_json::Value; /// /// 🔴 文件在 `schema/`,**不在 `static/`(web root)** —— 编译期 `include_str!` 内嵌进二进制, /// 运行期不需要它在磁盘上 ⇒ 把它放进 web root 就等于把它挂到 HTTP 上(DDL 泄露)。 -pub const MIGRATE_SQL: &str = include_str!("../schema/migrate.sql"); +pub const MIGRATE_SQL: &str = include_str!("../../schema/migrate.sql"); /// 逻辑未删除谓词(对齐上游 `TdcCrudController.ALIVE`)。 pub const ALIVE: &str = "(f_delete_mark IS NULL OR f_delete_mark = 0)"; diff --git a/src/envelope.rs b/src/platform/envelope.rs similarity index 100% rename from src/envelope.rs rename to src/platform/envelope.rs diff --git a/src/routes/fallback.rs b/src/platform/fallback.rs similarity index 100% rename from src/routes/fallback.rs rename to src/platform/fallback.rs diff --git a/src/ids.rs b/src/platform/ids.rs similarity index 100% rename from src/ids.rs rename to src/platform/ids.rs diff --git a/src/platform/mod.rs b/src/platform/mod.rs new file mode 100644 index 0000000..3871efc --- /dev/null +++ b/src/platform/mod.rs @@ -0,0 +1,39 @@ +//! **平台层** —— 与业务无关的基础设施。 +//! +//! 🔴 **边界规约(v3 spec §2.3)**:本层**不许出现业务知识**—— +//! 业务表名(`tdc_*`)、实体名(`Product` / `Resource` / …)、 +//! 具体端点路径(`/api/ssw/tdc/…`)、业务表数量。 +//! +//! 这条规约**可被静态检查** ⇒ `scripts/check-boundary.sh` 的 4 个接触点: +//! ① `tdc_` / `/api/ssw/tdc/` 字面量; +//! ② 业务实体名; +//! ③ 通用 CRUD 引擎按实体名分支(引擎住在业务层,但逻辑必须实体无关); +//! ④ 平台 auth 出现字面量端点路径(白名单清单归业务层 `tdc/support/public_paths.rs`)。 +//! +//! | 模块 | 职责 | 对位上游 | +//! |---|---|---| +//! | `state` | `AppState`(配置 + db + 锁 + 会话 + 账号 + 引导身份) | — | +//! | `config` | 环境变量配置 + 密钥守卫 | — | +//! | `db` | PGlite 封装 + SQL 切分 + `f_`↔camelCase 映射契约 | — | +//! | `session` | 内存会话(`Identity` / `Account` 两种 kind) | — | +//! | `envelope` | `ActionResult` 业务信封(HTTP 200 + `{code,msg,data}`) | — | +//! | `cipher` | 登录口令加解密(MD5 + AES-256-ECB,对齐上游 `cipher.ts`) | — | +//! | `ids` | 主键生成 | — | +//! | `protocol` | 协议版本闸门 + 日志净化 | — | +//! | `auth` | 三道门 + `Principal` | — | +//! | `body` | 宽松 JSON 体(空体可接受 / 格式错误文案) | — | +//! | `mw` | 405 JSON 改写中间件 | — | +//! | `fallback` | 404 JSON + SPA 静态兜底 + DDL 两层守卫 | — | + +pub mod auth; +pub mod body; +pub mod cipher; +pub mod config; +pub mod db; +pub mod envelope; +pub mod fallback; +pub mod ids; +pub mod mw; +pub mod protocol; +pub mod session; +pub mod state; diff --git a/src/routes/mw.rs b/src/platform/mw.rs similarity index 97% rename from src/routes/mw.rs rename to src/platform/mw.rs index f987f6b..993323e 100644 --- a/src/routes/mw.rs +++ b/src/platform/mw.rs @@ -30,7 +30,7 @@ //! | 场景 | HTTP | body | 来源 | //! |---|---|---|---| //! | 鉴权失败(401/403) | 401/403 | `{"success":false,"code":401,"msg":"…"}`(**无 `data`**) | `auth::reject` | -//! | 404(`/api/**` 未命中) | 404 | `{"success":false,"code":404,"msg":"接口不存在"}`(**无 `data`**) | `routes::fallback::api_not_found` | +//! | 404(`/api/**` 未命中) | 404 | `{"success":false,"code":404,"msg":"接口不存在"}`(**无 `data`**) | `platform::fallback::api_not_found` | //! | 405(方法不允许) | 405 | `{"code":405,"msg":"方法不被允许","data":null}`(**有 `data`、无 `success`**) | 本模块 | //! | 业务失败(400/600 等) | **200** | `{"code":…,"msg":…,"data":…}` | `envelope::ActionResult` | //! diff --git a/src/protocol.rs b/src/platform/protocol.rs similarity index 99% rename from src/protocol.rs rename to src/platform/protocol.rs index 4b06175..bbc9690 100644 --- a/src/protocol.rs +++ b/src/platform/protocol.rs @@ -215,7 +215,7 @@ pub fn is_protocol_acceptable(declared: Option<&str>) -> bool { /// 对端派生的动态 key 走不通这条路(编译期拒绝): /// /// ```compile_fail -/// use tdc_connector::protocol::warn_once; +/// use tdc_connector::platform::protocol::warn_once; /// let dynamic = String::from("protocol:incompatible:2.0"); /// warn_once(&dynamic, "x"); /// ``` @@ -225,7 +225,7 @@ pub fn is_protocol_acceptable(declared: Option<&str>) -> bool { /// 必须有下面这条**正向** doctest 把 crate 路径钉死,否则 `compile_fail` 会假通过。 /// /// ```no_run -/// use tdc_connector::protocol::warn_once; +/// use tdc_connector::platform::protocol::warn_once; /// warn_once("protocol:missing", "x"); /// ``` /// @@ -1199,7 +1199,7 @@ mod tests { let out = std::process::Command::new(&exe) .args([ "--exact", - "protocol::tests::stderr_probe_helper", + "platform::protocol::tests::stderr_probe_helper", "--ignored", "--nocapture", "--test-threads=1", diff --git a/src/session.rs b/src/platform/session.rs similarity index 100% rename from src/session.rs rename to src/platform/session.rs diff --git a/src/state.rs b/src/platform/state.rs similarity index 97% rename from src/state.rs rename to src/platform/state.rs index e4e0505..fafc0e5 100644 --- a/src/state.rs +++ b/src/platform/state.rs @@ -5,10 +5,10 @@ use std::sync::{Arc, OnceLock}; use pglite::PGlite; use tokio::sync::Mutex; -use crate::account::AccountStore; -use crate::config::Config; -use crate::session::SessionStore; -use crate::tds::TdsClient; +use crate::tdc::service::account::AccountStore; +use crate::platform::config::Config; +use crate::platform::session::SessionStore; +use crate::tdc::client::tds::TdsClient; /// 进程级唯一的 DB 锁。 /// diff --git a/src/tdc/client/mod.rs b/src/tdc/client/mod.rs new file mode 100644 index 0000000..1fd3d12 --- /dev/null +++ b/src/tdc/client/mod.rs @@ -0,0 +1,5 @@ +//! 出向客户端(对位上游 `ssw.tdc.client`)。 +//! +//! 目前只有 TDS 出向客户端 `tds.rs`(照抄上游 `TdsReportClient` 的 **internal 通道**)。 + +pub mod tds; diff --git a/src/tds/mod.rs b/src/tdc/client/tds.rs similarity index 100% rename from src/tds/mod.rs rename to src/tdc/client/tds.rs diff --git a/src/routes/account.rs b/src/tdc/controller/account.rs similarity index 96% rename from src/routes/account.rs rename to src/tdc/controller/account.rs index 34743b7..6dd3161 100644 --- a/src/routes/account.rs +++ b/src/tdc/controller/account.rs @@ -3,7 +3,7 @@ //! · `/api/permission/Users*`(「用户管理」页;上游复用 JNPF 的用户 CRUD) //! //! ⚠️ 业务失败一律 **HTTP 200 + body `code` != 200**(上游前端按 `body.code` 判成败)。 -//! 鉴权/授权失败是**另一种**形状(HTTP 401/403 + 裸三字段),见 `crate::auth::reject`。 +//! 鉴权/授权失败是**另一种**形状(HTTP 401/403 + 裸三字段),见 `crate::platform::auth::reject`。 use axum::extract::{Extension, Path, Query, State}; use axum::response::{IntoResponse, Response}; @@ -12,11 +12,11 @@ use axum::Router; use serde::Deserialize; use serde_json::{json, Value}; -use crate::account::{constant_time_eq, Account}; -use crate::auth::Principal; -use crate::cipher::decrypt_login_password; -use crate::envelope::{ActionResult, Pagination}; -use crate::state::AppState; +use crate::tdc::service::account::{constant_time_eq, Account}; +use crate::platform::auth::Principal; +use crate::platform::cipher::decrypt_login_password; +use crate::platform::envelope::{ActionResult, Pagination}; +use crate::platform::state::AppState; /// 登录表单(`application/x-www-form-urlencoded`)。 #[derive(Debug, Deserialize)] @@ -127,18 +127,18 @@ fn require_admin(state: &AppState, p: Option<&Extension>) -> Result<( if admin { Ok(()) } else { - Err(crate::auth::reject( + Err(crate::platform::auth::reject( axum::http::StatusCode::FORBIDDEN, "仅管理员可管理连接器用户", )) } } // 内部令牌通道:**刻意**不过管理员门(见函数注释)⇒ 与上游的差异。 - Some(Principal::Internal { .. }) => Err(crate::auth::reject( + Some(Principal::Internal { .. }) => Err(crate::platform::auth::reject( axum::http::StatusCode::FORBIDDEN, "仅管理员可管理连接器用户", )), - None => Err(crate::auth::reject( + None => Err(crate::platform::auth::reject( axum::http::StatusCode::UNAUTHORIZED, "内部接口凭证无效", )), diff --git a/src/routes/auth.rs b/src/tdc/controller/auth.rs similarity index 85% rename from src/routes/auth.rs rename to src/tdc/controller/auth.rs index 14e1c5c..dcd604c 100644 --- a/src/routes/auth.rs +++ b/src/tdc/controller/auth.rs @@ -3,8 +3,8 @@ use axum::routing::{get, post}; use axum::Router; -use crate::domain::identity; -use crate::state::AppState; +use crate::tdc::service::identity; +use crate::platform::state::AppState; pub fn router() -> Router { Router::new() diff --git a/src/routes/crud.rs b/src/tdc/controller/crud.rs similarity index 90% rename from src/routes/crud.rs rename to src/tdc/controller/crud.rs index 838669a..85c05bf 100644 --- a/src/routes/crud.rs +++ b/src/tdc/controller/crud.rs @@ -17,15 +17,16 @@ use axum::extract::{Extension, Path, RawQuery, State}; use axum::routing::get; use axum::Router; -use super::body::JsonBody; -use crate::auth::Principal; -use crate::crud; -use crate::registry::{self, TableSpec}; -use crate::state::AppState; +use crate::platform::body::JsonBody; +use crate::platform::auth::Principal; +use crate::tdc::service::crud; +use crate::tdc::entity::{self, TableSpec}; +use crate::tdc::mapper; +use crate::platform::state::AppState; pub fn router() -> Router { let mut r = Router::new(); - for spec in registry::REGISTRY { + for spec in entity::ALL_SPECS { let s: &'static TableSpec = spec; r = r .route( @@ -34,7 +35,7 @@ pub fn router() -> Router { move |State(st): State, q: RawQuery, p: Option>| { - let params = crud::parse_query(q.0.as_deref()); + let params = mapper::parse_query(q.0.as_deref()); let principal = p.map(|e| e.0); async move { crud::list(&st, s, ¶ms, principal.as_ref()).await } }, @@ -55,7 +56,7 @@ pub fn router() -> Router { move |State(st): State, q: RawQuery, p: Option>| { - let params = crud::parse_query(q.0.as_deref()); + let params = mapper::parse_query(q.0.as_deref()); let principal = p.map(|e| e.0); async move { crud::all(&st, s, ¶ms, principal.as_ref()).await } }, @@ -100,9 +101,9 @@ pub fn router() -> Router { // 🔴 `Dataset` 在注册表里 `table = "tdc_resource"`(只读视图)⇒ 聚合体与 Resource 同源。 { let res_spec: &'static TableSpec = - registry::find("Resource").expect("Resource 必须在注册表里"); + entity::find("Resource").expect("Resource 必须在注册表里"); let ds_spec: &'static TableSpec = - registry::find("Dataset").expect("Dataset 必须在注册表里"); + entity::find("Dataset").expect("Dataset 必须在注册表里"); r = r .route( &format!("{}/{{id}}/Detail", res_spec.path), diff --git a/src/routes/health.rs b/src/tdc/controller/health.rs similarity index 90% rename from src/routes/health.rs rename to src/tdc/controller/health.rs index d513e1a..4c7cadc 100644 --- a/src/routes/health.rs +++ b/src/tdc/controller/health.rs @@ -4,7 +4,7 @@ use axum::extract::State; use axum::routing::get; use axum::Router; -use crate::state::AppState; +use crate::platform::state::AppState; pub fn router() -> Router { Router::new().route("/api/health", get(health)) @@ -18,7 +18,7 @@ pub fn router() -> Router { async fn health(State(state): State) -> axum::Json { let tables = { let _g = state.db_lock.lock().await; - crate::db::query_json( + crate::platform::db::query_json( state.db.as_ref(), "SELECT count(*)::bigint AS c FROM information_schema.tables \ WHERE table_schema = 'public' AND table_name LIKE 'tdc\\_%'", @@ -36,7 +36,7 @@ async fn health(State(state): State) -> axum::Json "status": "UP", "service": "tdc-connector", "version": env!("CARGO_PKG_VERSION"), - "protocolVersion": crate::protocol::PROTOCOL_VERSION, + "protocolVersion": crate::platform::protocol::PROTOCOL_VERSION, "tdsMode": if state.config.tds_base_url.is_some() { "HTTP" } else { "NOOP" }, "tdsBaseUrl": state.config.tds_base_url.clone().unwrap_or_default(), "db": "pglite-rs (in-process postgres @ data/tdc.pg)", diff --git a/src/routes/mod.rs b/src/tdc/controller/mod.rs similarity index 81% rename from src/routes/mod.rs rename to src/tdc/controller/mod.rs index 385adfd..6481838 100644 --- a/src/routes/mod.rs +++ b/src/tdc/controller/mod.rs @@ -1,17 +1,17 @@ -//! 按域装配的 axum Router。 +//! 业务端点装配(对位上游 `ssw.tdc.controller`)。 +//! +//! 🔴 `mw` / `fallback` / `body` **不在本层** —— 它们是通用响应改写与兜底(平台能力), +//! 已下沉到 `crate::platform::{mw, fallback, body}`。 pub mod account; pub mod auth; -pub mod body; pub mod crud; -pub mod fallback; pub mod health; -pub mod mw; pub mod tds_biz; use axum::Router; -use crate::state::AppState; +use crate::platform::state::AppState; /// 组装全部业务路由(不含静态资源与中间件装配,那部分在 `main.rs`)。 /// diff --git a/src/routes/tds_biz.rs b/src/tdc/controller/tds_biz.rs similarity index 98% rename from src/routes/tds_biz.rs rename to src/tdc/controller/tds_biz.rs index 8073200..d3e6856 100644 --- a/src/routes/tds_biz.rs +++ b/src/tdc/controller/tds_biz.rs @@ -20,13 +20,13 @@ use axum::routing::{get, post, put}; use axum::Router; use serde_json::{json, Value}; -use super::body::BODY_FORMAT_ERROR; -use crate::auth::Principal; -use crate::crud::{param, parse_query, row_to_json}; -use crate::db::query_json_params; -use crate::envelope::{ActionResult, CODE_SERVER_ERROR}; -use crate::state::AppState; -use crate::tds; +use crate::platform::body::BODY_FORMAT_ERROR; +use crate::platform::auth::Principal; +use crate::tdc::mapper::{param, parse_query, row_to_json}; +use crate::platform::db::query_json_params; +use crate::platform::envelope::{ActionResult, CODE_SERVER_ERROR}; +use crate::platform::state::AppState; +use crate::tdc::client::tds; /// 装配 10 个端点(路径/方法**逐字对齐上游**)。 pub fn router() -> Router { @@ -60,7 +60,7 @@ pub fn router() -> Router { /// - **无体**(空 body)⇒ `Value::Null`(上游此时 `body == null`) /// - **体不是合法 JSON** ⇒ 业务失败「请求体格式有误…」(与 `JsonBody` 同一拒因) /// -/// 🔴 为什么不用 `super::body::JsonBody`:它把**空 body 判成失败**(那是上游**必填** +/// 🔴 为什么不用 `platform::body::JsonBody`:它把**空 body 判成失败**(那是上游**必填** /// `@RequestBody` 的语义)⇒ 而上游账单这五个动作端点全是 `required = false` /// (前端可能空体调用)⇒ 必须有一个「空体 ⇒ null」的抽取器。 pub struct OptionalJsonBody(pub Value); diff --git a/src/tdc/engine/mod.rs b/src/tdc/engine/mod.rs new file mode 100644 index 0000000..16f0eff --- /dev/null +++ b/src/tdc/engine/mod.rs @@ -0,0 +1,6 @@ +//! 执行引擎占位(对位上游 `ssw.tdc.engine`)。 +//! +//! 上游的隐私计算作业依赖 **Nax 引擎**与 **scard 安全平面** ⇒ 本地不可行, +//! 本仓不实现(见 `CLAUDE.md`「明确不在本仓库范围」)。 + +pub const _PLACEHOLDER: &str = "占位模块:上游 Nax 执行引擎本地不可实现"; diff --git a/src/tdc/entity/api_consume_log.rs b/src/tdc/entity/api_consume_log.rs new file mode 100644 index 0000000..5bdc98d --- /dev/null +++ b/src/tdc/entity/api_consume_log.rs @@ -0,0 +1,34 @@ +//! `ApiConsumeLog` 的实体元数据(对位上游 `ssw.tdc.entity.ApiConsumeLogEntity`)。 +//! +//! 🔴 **有意偏离上游**:关键字列不用基类默认的 `f_name`(该表**没有**这一列, +//! 上游一搜就 PG `42703`),改用 `f_order_code/f_app_id/f_product_id`。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "ApiConsumeLog", + path: "/api/ssw/tdc/ApiConsumeLog", + table: "tdc_api_consume_log", + keyword_columns: &["f_order_code", "f_app_id", "f_product_id"], + filter_columns: &[ + ("appId", "f_app_id"), + ("orderCode", "f_order_code"), + ("productId", "f_product_id"), + ("deliveryTaskId", "f_delivery_task_id"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: Some( + "计量明细只读:禁止经泛型 CRUD 新增/修改(「已用」的唯一来源,防旁路污染配额)", + ), + no_update: Some( + "计量明细只读:禁止经泛型 CRUD 新增/修改(「已用」的唯一来源,防旁路污染配额)", + ), + no_delete: Some("计量明细只读:禁止经泛型 CRUD 删除(审计证据不可篡改)"), + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/audit_log.rs b/src/tdc/entity/audit_log.rs new file mode 100644 index 0000000..1e6f74b --- /dev/null +++ b/src/tdc/entity/audit_log.rs @@ -0,0 +1,30 @@ +//! `AuditLog` 的实体元数据(对位上游 `ssw.tdc.entity.AuditLogEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "AuditLog", + path: "/api/ssw/tdc/AuditLog", + table: "tdc_audit_log", + keyword_columns: &["f_action", "f_actor_name", "f_target"], + filter_columns: &[ + ("logType", "f_log_type"), + ("bizType", "f_biz_type"), + ("bizId", "f_biz_id"), + ("actorType", "f_actor_type"), + ("actorId", "f_actor_id"), + ("result", "f_result"), + ("reportMark", "f_report_mark"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_log_time", + extra_where: None, + no_create: None, + no_update: Some("审计日志不允许修改"), + no_delete: Some("审计日志不允许删除"), + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/contract.rs b/src/tdc/entity/contract.rs new file mode 100644 index 0000000..30c577d --- /dev/null +++ b/src/tdc/entity/contract.rs @@ -0,0 +1,35 @@ +//! `Contract` 的实体元数据(对位上游 `ssw.tdc.entity.ContractEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Contract", + path: "/api/ssw/tdc/Contract", + table: "tdc_contract", + keyword_columns: &[ + "f_name", + "f_contract_code", + "f_product_name", + "f_peer_org_name", + ], + filter_columns: &[ + ("status", "f_status"), + ("role", "f_role"), + ("productId", "f_product_id"), + ("deliveryType", "f_delivery_type"), + ("syncStatus", "f_sync_status"), + ("tdsContractId", "f_tds_contract_id"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + // 上游 `ContractController#beforeDelete` **无条件**抛(权威归档在平台,副本只随联动清退) + no_delete: Some("本地合约副本不可删除(权威归档在平台,副本仅随空间/合约清退联动)"), + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/credential.rs b/src/tdc/entity/credential.rs new file mode 100644 index 0000000..c2b51aa --- /dev/null +++ b/src/tdc/entity/credential.rs @@ -0,0 +1,31 @@ +//! `Credential` 的实体元数据(对位上游 `ssw.tdc.entity.CredentialEntity`)。 +//! +//! 🔴 本仓**额外**去敏 `secretKey`(比上游严)—— 凭据密钥不该出现在列表接口里。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Credential", + path: "/api/ssw/tdc/Credential", + table: "tdc_credential", + keyword_columns: &["f_subject_name", "f_credential_code"], + filter_columns: &[ + ("subjectType", "f_subject_type"), + ("subjectId", "f_subject_id"), + ("status", "f_status"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + // 🟡 **有意比上游更严的一处**:上游 `CredentialEntity.f_secret_key` **漏标** `@JsonIgnore` + // (该列是「预留 SK 密文(本期空)」,上游自注)⇒ 本仓补上去敏。 + // 该列本仓**从不写入**(恒 NULL)⇒ 对外行为零差异,纯属兜底。 + hidden_fields: &["secretKey"], + }; diff --git a/src/tdc/entity/data_interface.rs b/src/tdc/entity/data_interface.rs new file mode 100644 index 0000000..232c320 --- /dev/null +++ b/src/tdc/entity/data_interface.rs @@ -0,0 +1,24 @@ +//! `DataInterface` 的实体元数据(对位上游 `ssw.tdc.entity.DataInterfaceEntity`)。 +//! +//! 🔴 服务端生成 `interfaceCode`(`TdcCodeUtil` 序号式)—— 照抄上游 `DataInterfaceServiceImpl#prepare`。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "DataInterface", + path: "/api/ssw/tdc/DataInterface", + table: "tdc_data_interface", + keyword_columns: &["f_name", "f_interface_code"], + filter_columns: &[("type", "f_type"), ("enabledMark", "f_enabled_mark")], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/dataset.rs b/src/tdc/entity/dataset.rs new file mode 100644 index 0000000..e61cd13 --- /dev/null +++ b/src/tdc/entity/dataset.rs @@ -0,0 +1,27 @@ +//! `Dataset` 的实体元数据(对位上游 `ssw.tdc.entity.DatasetEntity`)。 +//! +//! 🔴 **只读视图**:`table = "tdc_resource"`(上游 `DatasetController` 查的是 +//! `tdc_resource` 且带一串固定谓词 ⇒ `DATASET_EXTRA_WHERE`)⇒ 禁增/改/删。 +//! `extra_where` 里的 `(f_source_kind='DATASOURCE' OR f_source_kind IS NULL)` +//! 必须写全 —— 只写 `='DATASOURCE'` 会让存量 NULL 行**静默消失**。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::{DATASET_EXTRA_WHERE, TableSpec}; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Dataset", + path: "/api/ssw/tdc/Dataset", + table: "tdc_resource", + keyword_columns: &["f_dataset_name"], + filter_columns: &[], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: Some(DATASET_EXTRA_WHERE), + no_create: Some("数据集为只读视图,不支持新增/编辑/删除"), + no_update: Some("数据集为只读视图,不支持新增/编辑/删除"), + no_delete: Some("数据集为只读视图,不支持新增/编辑/删除"), + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/datasource.rs b/src/tdc/entity/datasource.rs new file mode 100644 index 0000000..0034133 --- /dev/null +++ b/src/tdc/entity/datasource.rs @@ -0,0 +1,29 @@ +//! `Datasource` 的实体元数据(对位上游 `ssw.tdc.entity.DatasourceEntity`)。 +//! +//! 🔴 服务端生成 `datasourceCode`(`BizCodeUtil` 6 位随机尾,非序号)—— 照抄上游基类 `newUniqueCode`。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Datasource", + path: "/api/ssw/tdc/Datasource", + table: "tdc_datasource", + keyword_columns: &["f_name", "f_datasource_code", "f_host", "f_db_name"], + filter_columns: &[ + ("type", "f_type"), + ("status", "f_status"), + ("testStatus", "f_test_status"), + ("ownerDept", "f_owner_dept"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/delivery_log.rs b/src/tdc/entity/delivery_log.rs new file mode 100644 index 0000000..58353cc --- /dev/null +++ b/src/tdc/entity/delivery_log.rs @@ -0,0 +1,26 @@ +//! `DeliveryLog` 的实体元数据(对位上游 `ssw.tdc.entity.DeliveryLogEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "DeliveryLog", + path: "/api/ssw/tdc/DeliveryLog", + table: "tdc_delivery_log", + keyword_columns: &["f_step", "f_message"], + filter_columns: &[ + ("taskId", "f_task_id"), + ("step", "f_step"), + ("level", "f_level"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_log_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: Some("交付日志是审计证据,不允许删除"), + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/delivery_task.rs b/src/tdc/entity/delivery_task.rs new file mode 100644 index 0000000..8529e78 --- /dev/null +++ b/src/tdc/entity/delivery_task.rs @@ -0,0 +1,48 @@ +//! `DeliveryTask` 的实体元数据(对位上游 `ssw.tdc.entity.DeliveryTaskEntity`)。 +//! +//! 🔴 **41 个服务端权威列**(`DELIVERY_TASK_FROZEN`)—— 逐字抄自上游 +//! `DeliveryTaskController#changedAuthorityColumn()`(2026-10-24 核对)。 +//! 判定口径:**只拒「值真的变化」**——前端编辑弹窗会整行回传,按「字段出现即拒」 +//! 会误伤正常编辑。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::{DELIVERY_TASK_FROZEN, TableSpec}; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "DeliveryTask", + path: "/api/ssw/tdc/DeliveryTask", + table: "tdc_delivery_task", + keyword_columns: &[ + "f_task_no", + "f_contract_code", + "f_product_name", + "f_consumer_org_name", + ], + filter_columns: &[ + ("status", "f_status"), + ("contractId", "f_contract_id"), + ("productId", "f_product_id"), + ("deliveryType", "f_delivery_type"), + ("triggerType", "f_trigger_type"), + ("policyResult", "f_policy_result"), + ("reportStatus", "f_report_status"), + ("auditStatus", "f_audit_status"), + ("runStatus", "f_run_status"), + ("contractCode", "f_contract_code"), + ("spaceId", "f_space_id"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: Some( + "该入口已废弃:交付任务只能由发起方经平台发起(DATASET=提供方 / API·沙箱=使用方);\ + 直建会产生「平台无权威行」的孤儿任务并导致合约永久闸死", + ), + no_update: None, + no_delete: Some("交付任务记录是审计证据,不允许删除"), + frozen_columns: DELIVERY_TASK_FROZEN, + // 上游 `DeliveryTaskEntity` 对这两个属性标了 `@JsonIgnore`(工作台凭证,2026-10-25 核对)。 + hidden_fields: &["devUrl", "devToken"], + }; diff --git a/src/tdc/entity/destroy_log.rs b/src/tdc/entity/destroy_log.rs new file mode 100644 index 0000000..fccce69 --- /dev/null +++ b/src/tdc/entity/destroy_log.rs @@ -0,0 +1,26 @@ +//! `DestroyLog` 的实体元数据(对位上游 `ssw.tdc.entity.DestroyLogEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "DestroyLog", + path: "/api/ssw/tdc/DestroyLog", + table: "tdc_destroy_log", + keyword_columns: &["f_task_no", "f_resource_uri", "f_reason"], + filter_columns: &[ + ("taskId", "f_task_id"), + ("method", "f_method"), + ("operator", "f_operator"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: Some("销毁日志由系统自动记录,不可手工创建"), + no_update: None, + no_delete: Some("销毁日志是合规存证,不可删除"), + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/identity.rs b/src/tdc/entity/identity.rs new file mode 100644 index 0000000..a0803bb --- /dev/null +++ b/src/tdc/entity/identity.rs @@ -0,0 +1,38 @@ +//! `Identity` 的实体元数据(对位上游 `ssw.tdc.entity.IdentityEntity`)。 +//! +//! 🔴 `hidden_fields` 含 `secretKey` ⇒ 出参**整条删键**、入参**静默忽略** +//! (上游 `IdentityEntity.f_secret_key` 标了 `@JsonIgnore`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Identity", + path: "/api/ssw/tdc/Identity", + table: "tdc_identity", + keyword_columns: &[ + "f_name", + "f_identity_code", + "f_subject_name", + "f_tds_space_name", + ], + filter_columns: &[ + ("status", "f_status"), + ("registerStatus", "f_register_status"), + ("deployMode", "f_deploy_mode"), + ("tdsSpaceId", "f_tds_space_id"), + ("defaultMark", "f_default_mark"), + ], + tenant_column: None, + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + // 上游 `IdentityEntity.f_secret_key` 标了 `@JsonIgnore`(2026-10-25 核对): + // 「防 CRUD list/detail 泄露——operator 用 Identity/{id}/RotateSecret 取/重置」。 + hidden_fields: &["secretKey"], + }; diff --git a/src/registry.rs b/src/tdc/entity/mod.rs similarity index 66% rename from src/registry.rs rename to src/tdc/entity/mod.rs index c92fdef..758492a 100644 --- a/src/registry.rs +++ b/src/tdc/entity/mod.rs @@ -1,5 +1,11 @@ //! 18 个实体的表注册表 —— 通用 CRUD 引擎的**唯一**元数据来源。 //! +//! **布局(v3 spec §2.1)**:**每个实体一个文件**(18 个子模块),本文件只放 +//! ① 三种元数据结构([`TableSpec`] / [`CodeSpec`] / [`FrozenColumn`])、 +//! ② 跨实体共享的常量([`DELIVERY_TASK_FROZEN`] / [`DATASET_EXTRA_WHERE`])、 +//! ③ [`ALL_SPECS`] 汇总、④ 启动自检 [`validate`]、⑤ 按实体名查表的三张元数据清单 +//! ([`create_codes`] / [`create_defaults`] / [`create_now_columns`])。 +//! //! 数据来源:上游 `boot/ssw-tdc/ssw-tdc-controller` 下 18 个 `extends TdcCrudController` //! 的子类,逐个抄下 `keywordColumns()` / `filterColumns()` / `tenantColumn()` / //! `defaultOrderColumn()`;2026-10-24 用脚本对全仓 18 个控制器全量提取核对,零差异。 @@ -8,10 +14,10 @@ //! 1. `ApiConsumeLog` 的关键字列不用基类默认的 `f_name`(该表**没有**这一列, //! 上游一搜就 PG `42703`),改用 `f_order_code/f_app_id/f_product_id`。 //! 2. 过滤一律 `CAST(col AS TEXT) = $1`(上游把 varchar 绑给 smallint 列会 PG 报错), -//! 这条落在 `crud.rs`,注册表本身不变。 +//! 这条落在 `tdc/mapper.rs`,注册表本身不变。 -use crate::codec::CodeStyle; -use crate::db::{json_key_to_column, valid_table}; +use crate::tdc::util::code::CodeStyle; +use crate::platform::db::{json_key_to_column, valid_table}; /// 不可经编辑入口改写的「服务端权威列」。 #[derive(Debug, Clone, Copy)] @@ -268,406 +274,49 @@ AND (f_source_kind = 'DATASOURCE' OR f_source_kind IS NULL) \ AND EXISTS (SELECT 1 FROM tdc_datasource d WHERE d.f_id = tdc_resource.f_datasource_id \ AND d.f_status = 'ENABLED' AND (d.f_delete_mark IS NULL OR d.f_delete_mark = 0))"; +/// 全部可 CRUD 实体(上游 18 个 `TdcCrudController` 子类)—— **每个实体一个文件**。 +pub mod api_consume_log; +pub mod audit_log; +pub mod contract; +pub mod credential; +pub mod data_interface; +pub mod dataset; +pub mod datasource; +pub mod delivery_log; +pub mod delivery_task; +pub mod destroy_log; +pub mod identity; +pub mod notification; +pub mod order; +pub mod policy; +pub mod policy_check_log; +pub mod policy_template; +pub mod product; +pub mod resource; + /// 全部可 CRUD 实体(上游 18 个 `TdcCrudController` 子类,顺序按路由注册顺序)。 -pub static REGISTRY: &[TableSpec] = &[ - TableSpec { - api_name: "ApiConsumeLog", - path: "/api/ssw/tdc/ApiConsumeLog", - table: "tdc_api_consume_log", - keyword_columns: &["f_order_code", "f_app_id", "f_product_id"], - filter_columns: &[ - ("appId", "f_app_id"), - ("orderCode", "f_order_code"), - ("productId", "f_product_id"), - ("deliveryTaskId", "f_delivery_task_id"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: Some( - "计量明细只读:禁止经泛型 CRUD 新增/修改(「已用」的唯一来源,防旁路污染配额)", - ), - no_update: Some( - "计量明细只读:禁止经泛型 CRUD 新增/修改(「已用」的唯一来源,防旁路污染配额)", - ), - no_delete: Some("计量明细只读:禁止经泛型 CRUD 删除(审计证据不可篡改)"), - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "AuditLog", - path: "/api/ssw/tdc/AuditLog", - table: "tdc_audit_log", - keyword_columns: &["f_action", "f_actor_name", "f_target"], - filter_columns: &[ - ("logType", "f_log_type"), - ("bizType", "f_biz_type"), - ("bizId", "f_biz_id"), - ("actorType", "f_actor_type"), - ("actorId", "f_actor_id"), - ("result", "f_result"), - ("reportMark", "f_report_mark"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_log_time", - extra_where: None, - no_create: None, - no_update: Some("审计日志不允许修改"), - no_delete: Some("审计日志不允许删除"), - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Contract", - path: "/api/ssw/tdc/Contract", - table: "tdc_contract", - keyword_columns: &[ - "f_name", - "f_contract_code", - "f_product_name", - "f_peer_org_name", - ], - filter_columns: &[ - ("status", "f_status"), - ("role", "f_role"), - ("productId", "f_product_id"), - ("deliveryType", "f_delivery_type"), - ("syncStatus", "f_sync_status"), - ("tdsContractId", "f_tds_contract_id"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - // 上游 `ContractController#beforeDelete` **无条件**抛(权威归档在平台,副本只随联动清退) - no_delete: Some("本地合约副本不可删除(权威归档在平台,副本仅随空间/合约清退联动)"), - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Credential", - path: "/api/ssw/tdc/Credential", - table: "tdc_credential", - keyword_columns: &["f_subject_name", "f_credential_code"], - filter_columns: &[ - ("subjectType", "f_subject_type"), - ("subjectId", "f_subject_id"), - ("status", "f_status"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - // 🟡 **有意比上游更严的一处**:上游 `CredentialEntity.f_secret_key` **漏标** `@JsonIgnore` - // (该列是「预留 SK 密文(本期空)」,上游自注)⇒ 本仓补上去敏。 - // 该列本仓**从不写入**(恒 NULL)⇒ 对外行为零差异,纯属兜底。 - hidden_fields: &["secretKey"], - }, - TableSpec { - api_name: "DataInterface", - path: "/api/ssw/tdc/DataInterface", - table: "tdc_data_interface", - keyword_columns: &["f_name", "f_interface_code"], - filter_columns: &[("type", "f_type"), ("enabledMark", "f_enabled_mark")], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Dataset", - path: "/api/ssw/tdc/Dataset", - table: "tdc_resource", - keyword_columns: &["f_dataset_name"], - filter_columns: &[], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: Some(DATASET_EXTRA_WHERE), - no_create: Some("数据集为只读视图,不支持新增/编辑/删除"), - no_update: Some("数据集为只读视图,不支持新增/编辑/删除"), - no_delete: Some("数据集为只读视图,不支持新增/编辑/删除"), - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Datasource", - path: "/api/ssw/tdc/Datasource", - table: "tdc_datasource", - keyword_columns: &["f_name", "f_datasource_code", "f_host", "f_db_name"], - filter_columns: &[ - ("type", "f_type"), - ("status", "f_status"), - ("testStatus", "f_test_status"), - ("ownerDept", "f_owner_dept"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "DeliveryLog", - path: "/api/ssw/tdc/DeliveryLog", - table: "tdc_delivery_log", - keyword_columns: &["f_step", "f_message"], - filter_columns: &[ - ("taskId", "f_task_id"), - ("step", "f_step"), - ("level", "f_level"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_log_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: Some("交付日志是审计证据,不允许删除"), - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "DeliveryTask", - path: "/api/ssw/tdc/DeliveryTask", - table: "tdc_delivery_task", - keyword_columns: &[ - "f_task_no", - "f_contract_code", - "f_product_name", - "f_consumer_org_name", - ], - filter_columns: &[ - ("status", "f_status"), - ("contractId", "f_contract_id"), - ("productId", "f_product_id"), - ("deliveryType", "f_delivery_type"), - ("triggerType", "f_trigger_type"), - ("policyResult", "f_policy_result"), - ("reportStatus", "f_report_status"), - ("auditStatus", "f_audit_status"), - ("runStatus", "f_run_status"), - ("contractCode", "f_contract_code"), - ("spaceId", "f_space_id"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: Some( - "该入口已废弃:交付任务只能由发起方经平台发起(DATASET=提供方 / API·沙箱=使用方);\ - 直建会产生「平台无权威行」的孤儿任务并导致合约永久闸死", - ), - no_update: None, - no_delete: Some("交付任务记录是审计证据,不允许删除"), - frozen_columns: DELIVERY_TASK_FROZEN, - // 上游 `DeliveryTaskEntity` 对这两个属性标了 `@JsonIgnore`(工作台凭证,2026-10-25 核对)。 - hidden_fields: &["devUrl", "devToken"], - }, - TableSpec { - api_name: "DestroyLog", - path: "/api/ssw/tdc/DestroyLog", - table: "tdc_destroy_log", - keyword_columns: &["f_task_no", "f_resource_uri", "f_reason"], - filter_columns: &[ - ("taskId", "f_task_id"), - ("method", "f_method"), - ("operator", "f_operator"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: Some("销毁日志由系统自动记录,不可手工创建"), - no_update: None, - no_delete: Some("销毁日志是合规存证,不可删除"), - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Identity", - path: "/api/ssw/tdc/Identity", - table: "tdc_identity", - keyword_columns: &[ - "f_name", - "f_identity_code", - "f_subject_name", - "f_tds_space_name", - ], - filter_columns: &[ - ("status", "f_status"), - ("registerStatus", "f_register_status"), - ("deployMode", "f_deploy_mode"), - ("tdsSpaceId", "f_tds_space_id"), - ("defaultMark", "f_default_mark"), - ], - tenant_column: None, - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - // 上游 `IdentityEntity.f_secret_key` 标了 `@JsonIgnore`(2026-10-25 核对): - // 「防 CRUD list/detail 泄露——operator 用 Identity/{id}/RotateSecret 取/重置」。 - hidden_fields: &["secretKey"], - }, - TableSpec { - api_name: "Notification", - path: "/api/ssw/tdc/Notification", - table: "tdc_notify", - keyword_columns: &["f_title", "f_content", "f_biz_type"], - filter_columns: &[ - ("type", "f_type"), - ("level", "f_level"), - ("receiver", "f_receiver"), - ("readMark", "f_read_mark"), - ("bizType", "f_biz_type"), - ("bizId", "f_biz_id"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Order", - path: "/api/ssw/tdc/Order", - table: "tdc_order", - keyword_columns: &[ - "f_order_code", - "f_product_name", - "f_buyer_name", - "f_seller_name", - ], - filter_columns: &[ - ("status", "f_status"), - ("buyerId", "f_buyer_id"), - ("sellerId", "f_seller_id"), - ("productId", "f_product_id"), - ("deliveryType", "f_delivery_type"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Policy", - path: "/api/ssw/tdc/Policy", - table: "tdc_policy", - keyword_columns: &["f_name", "f_contract_id"], - filter_columns: &[ - ("contractId", "f_contract_id"), - ("policyType", "f_policy_type"), - ("enabledMark", "f_enabled_mark"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "PolicyCheckLog", - path: "/api/ssw/tdc/PolicyCheckLog", - table: "tdc_policy_check_log", - keyword_columns: &["f_check_no", "f_requester_code"], - filter_columns: &[ - ("contractId", "f_contract_id"), - ("productId", "f_product_id"), - ("taskId", "f_task_id"), - ("result", "f_result"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: Some("策略评估流水是审计证据,不允许删除"), - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "PolicyTemplate", - path: "/api/ssw/tdc/PolicyTemplate", - table: "tdc_policy_template", - keyword_columns: &["f_name"], - filter_columns: &[], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Product", - path: "/api/ssw/tdc/Product", - table: "tdc_product", - keyword_columns: &["f_name", "f_product_code", "f_resource_name", "f_tags"], - filter_columns: &[ - ("resourceId", "f_resource_id"), - ("identityId", "f_identity_id"), - ("tdsSpaceId", "f_tds_space_id"), - ("tdsProductId", "f_tds_product_id"), - ("category", "f_category"), - ("deliveryType", "f_delivery_type"), - ("publishStatus", "f_publish_status"), - ("status", "f_status"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, - TableSpec { - api_name: "Resource", - path: "/api/ssw/tdc/Resource", - table: "tdc_resource", - keyword_columns: &["f_name"], - filter_columns: &[ - ("datasourceId", "f_datasource_id"), - ("resourceType", "f_resource_type"), - ("category", "f_category"), - ("classifyLevel", "f_classify_level"), - ("sensitiveMark", "f_sensitive_mark"), - ("status", "f_status"), - ("sourceType", "f_source_type"), - ], - tenant_column: Some("f_tenant_id"), - default_order_column: "f_creator_time", - extra_where: None, - no_create: None, - no_update: None, - no_delete: None, - frozen_columns: &[], - hidden_fields: &[], - }, +/// +/// 🔴 每个实体一个文件([`super`] 下 18 个子模块)⇒ 加实体只需**新建一个文件** +/// + 在这里加一行 `pub mod xxx;` + 在 `ALL_SPECS` 里加一行 ⇒ 不用碰引擎。 +pub static ALL_SPECS: &[TableSpec] = &[ + api_consume_log::SPEC, + audit_log::SPEC, + contract::SPEC, + credential::SPEC, + data_interface::SPEC, + dataset::SPEC, + datasource::SPEC, + delivery_log::SPEC, + delivery_task::SPEC, + destroy_log::SPEC, + identity::SPEC, + notification::SPEC, + order::SPEC, + policy::SPEC, + policy_check_log::SPEC, + policy_template::SPEC, + product::SPEC, + resource::SPEC, ]; /// 实体 → 权限键(设计文档 §5.1「声明式权限键」)。 @@ -705,7 +354,7 @@ pub fn permission_key(api_name: &str) -> Option<&'static str> { /// 按实体名查注册表。 pub fn find(api_name: &str) -> Option<&'static TableSpec> { - REGISTRY.iter().find(|s| s.api_name == api_name) + ALL_SPECS.iter().find(|s| s.api_name == api_name) } /// 注册表自检:**所有拼进 SQL 的标识符**(表名、过滤列、关键字列、默认排序列、 @@ -714,7 +363,7 @@ pub fn find(api_name: &str) -> Option<&'static TableSpec> { /// ⚠️ `filter_columns` 的**键**(`pname`,如 `status`)是**请求参数名**、不是列名, /// **不**拿它过白名单。 pub fn validate() -> Result<(), String> { - for spec in REGISTRY { + for spec in ALL_SPECS { if valid_table(spec.table).is_none() { return Err(format!("注册表表名非法: {}", spec.table)); } @@ -861,9 +510,9 @@ mod tests { #[test] fn registry_has_exactly_18_entities_with_unique_paths() { - assert_eq!(REGISTRY.len(), 18); + assert_eq!(ALL_SPECS.len(), 18); let mut paths = HashSet::new(); - for s in REGISTRY { + for s in ALL_SPECS { assert!(paths.insert(s.path), "路径重复: {}", s.path); assert!( s.path.starts_with("/api/ssw/tdc/"), @@ -894,7 +543,7 @@ mod tests { ); assert_eq!(find("Credential").unwrap().hidden_fields, &["secretKey"]); // 其余 15 个实体一个都不许有不外泄字段(上游没有别的 @JsonIgnore)。 - for s in REGISTRY { + for s in ALL_SPECS { if matches!(s.api_name, "Identity" | "DeliveryTask" | "Credential") { continue; } @@ -915,7 +564,7 @@ mod tests { assert!(seen.insert(*name), "权限键重复: {}", name); assert!(!key.is_empty(), "权限键不得为空: {}", name); } - for s in REGISTRY { + for s in ALL_SPECS { assert!( permission_key(s.api_name).is_some(), "实体 {} 缺权限键", @@ -1056,7 +705,7 @@ mod tests { #[test] fn every_sql_identifier_in_the_registry_passes_the_whitelist() { assert!(validate().is_ok(), "注册表自检应通过"); - for spec in REGISTRY { + for spec in ALL_SPECS { assert!(valid_table(spec.table).is_some()); assert!(valid_table(spec.default_order_column).is_some()); for col in spec.keyword_columns { diff --git a/src/tdc/entity/notification.rs b/src/tdc/entity/notification.rs new file mode 100644 index 0000000..d966e37 --- /dev/null +++ b/src/tdc/entity/notification.rs @@ -0,0 +1,29 @@ +//! `Notification` 的实体元数据(对位上游 `ssw.tdc.entity.NotificationEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Notification", + path: "/api/ssw/tdc/Notification", + table: "tdc_notify", + keyword_columns: &["f_title", "f_content", "f_biz_type"], + filter_columns: &[ + ("type", "f_type"), + ("level", "f_level"), + ("receiver", "f_receiver"), + ("readMark", "f_read_mark"), + ("bizType", "f_biz_type"), + ("bizId", "f_biz_id"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/order.rs b/src/tdc/entity/order.rs new file mode 100644 index 0000000..20bdad7 --- /dev/null +++ b/src/tdc/entity/order.rs @@ -0,0 +1,33 @@ +//! `Order` 的实体元数据(对位上游 `ssw.tdc.entity.OrderEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Order", + path: "/api/ssw/tdc/Order", + table: "tdc_order", + keyword_columns: &[ + "f_order_code", + "f_product_name", + "f_buyer_name", + "f_seller_name", + ], + filter_columns: &[ + ("status", "f_status"), + ("buyerId", "f_buyer_id"), + ("sellerId", "f_seller_id"), + ("productId", "f_product_id"), + ("deliveryType", "f_delivery_type"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/policy.rs b/src/tdc/entity/policy.rs new file mode 100644 index 0000000..3257b1b --- /dev/null +++ b/src/tdc/entity/policy.rs @@ -0,0 +1,26 @@ +//! `Policy` 的实体元数据(对位上游 `ssw.tdc.entity.PolicyEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Policy", + path: "/api/ssw/tdc/Policy", + table: "tdc_policy", + keyword_columns: &["f_name", "f_contract_id"], + filter_columns: &[ + ("contractId", "f_contract_id"), + ("policyType", "f_policy_type"), + ("enabledMark", "f_enabled_mark"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/policy_check_log.rs b/src/tdc/entity/policy_check_log.rs new file mode 100644 index 0000000..08b99c8 --- /dev/null +++ b/src/tdc/entity/policy_check_log.rs @@ -0,0 +1,27 @@ +//! `PolicyCheckLog` 的实体元数据(对位上游 `ssw.tdc.entity.PolicyCheckLogEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "PolicyCheckLog", + path: "/api/ssw/tdc/PolicyCheckLog", + table: "tdc_policy_check_log", + keyword_columns: &["f_check_no", "f_requester_code"], + filter_columns: &[ + ("contractId", "f_contract_id"), + ("productId", "f_product_id"), + ("taskId", "f_task_id"), + ("result", "f_result"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: Some("策略评估流水是审计证据,不允许删除"), + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/policy_template.rs b/src/tdc/entity/policy_template.rs new file mode 100644 index 0000000..cc818e0 --- /dev/null +++ b/src/tdc/entity/policy_template.rs @@ -0,0 +1,22 @@ +//! `PolicyTemplate` 的实体元数据(对位上游 `ssw.tdc.entity.PolicyTemplateEntity`)。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "PolicyTemplate", + path: "/api/ssw/tdc/PolicyTemplate", + table: "tdc_policy_template", + keyword_columns: &["f_name"], + filter_columns: &[], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/product.rs b/src/tdc/entity/product.rs new file mode 100644 index 0000000..5f3d5c9 --- /dev/null +++ b/src/tdc/entity/product.rs @@ -0,0 +1,33 @@ +//! `Product` 的实体元数据(对位上游 `ssw.tdc.entity.ProductEntity`)。 +//! +//! 🔴 新建默认**未上架**(`f_status = DISABLED`)—— 照抄上游 `ProductServiceImpl:130-141`。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Product", + path: "/api/ssw/tdc/Product", + table: "tdc_product", + keyword_columns: &["f_name", "f_product_code", "f_resource_name", "f_tags"], + filter_columns: &[ + ("resourceId", "f_resource_id"), + ("identityId", "f_identity_id"), + ("tdsSpaceId", "f_tds_space_id"), + ("tdsProductId", "f_tds_product_id"), + ("category", "f_category"), + ("deliveryType", "f_delivery_type"), + ("publishStatus", "f_publish_status"), + ("status", "f_status"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/entity/resource.rs b/src/tdc/entity/resource.rs new file mode 100644 index 0000000..2cabe3e --- /dev/null +++ b/src/tdc/entity/resource.rs @@ -0,0 +1,32 @@ +//! `Resource` 的实体元数据(对位上游 `ssw.tdc.entity.ResourceEntity`)。 +//! +//! 🔴 新建默认**停用** + `mountStatus = UNMOUNTED` —— 照抄上游 `ResourceServiceImpl:305-334`。 +//! +//! 本文件只放**这一个**实体的 spec —— 通用元数据结构见 [`super::TableSpec`]。 + +use super::TableSpec; + +/// 本实体的完整元数据(注册表唯一真源)。 +pub const SPEC: TableSpec = TableSpec { + api_name: "Resource", + path: "/api/ssw/tdc/Resource", + table: "tdc_resource", + keyword_columns: &["f_name"], + filter_columns: &[ + ("datasourceId", "f_datasource_id"), + ("resourceType", "f_resource_type"), + ("category", "f_category"), + ("classifyLevel", "f_classify_level"), + ("sensitiveMark", "f_sensitive_mark"), + ("status", "f_status"), + ("sourceType", "f_source_type"), + ], + tenant_column: Some("f_tenant_id"), + default_order_column: "f_creator_time", + extra_where: None, + no_create: None, + no_update: None, + no_delete: None, + frozen_columns: &[], + hidden_fields: &[], + }; diff --git a/src/tdc/heartbeat/mod.rs b/src/tdc/heartbeat/mod.rs new file mode 100644 index 0000000..2ea1d5c --- /dev/null +++ b/src/tdc/heartbeat/mod.rs @@ -0,0 +1,3 @@ +//! 心跳占位(对位上游 `ssw.tdc.heartbeat`)。 + +pub const _PLACEHOLDER: &str = "占位模块:上游心跳不在本批范围"; diff --git a/src/tdc/mapper.rs b/src/tdc/mapper.rs new file mode 100644 index 0000000..e38692a --- /dev/null +++ b/src/tdc/mapper.rs @@ -0,0 +1,412 @@ +//! SQL 组装与执行、投影与序列化(对位上游 `ssw.tdc.mapper`)。 +//! +//! 本模块只做**表无关**的机械活:拼 WHERE、绑参数、把 `f_*` 列名翻成 camelCase JSON 键、 +//! 把请求体翻成 `(列名, 文本值)` 列表。**任何按实体名分叉的逻辑都不许出现在这里** +//! (v3 spec §2.3.2 接触点 ③ ⇒ `scripts/check-boundary.sh` 的 CP3 会当场红)。 +//! +//! 红线: +//! - 表名只来自注册表(静态白名单);客户端输入只进**绑定参数**,绝不拼进 SQL。 +//! - 所有 DB 访问持 `state.db_lock`(PGlite 单 in-process backend)。 +//! - 出参 camelCase(上游 Jackson 属性名),入参反查 `f_*` 列名。 +//! - 业务失败一律 HTTP 200 + body `code != 200`(走 [`ActionResult`] 业务信封)。 + +use std::collections::HashMap; + +use pglite::ToSql; +use serde_json::{Map, Value}; + +use crate::platform::db::{column_to_json_key, json_key_to_column, valid_table, ALIVE}; +use crate::tdc::entity::TableSpec; + +/// 系统列:请求体不得覆盖(对齐上游 `update` 里置 null 的那批 + 身份/排序列)。 +pub const SYSTEM_COLUMNS: &[&str] = &[ + "f_id", + "f_tenant_id", + "f_sort_code", + "f_creator_time", + "f_creator_user_id", + "f_last_modify_time", + "f_last_modify_user_id", + "f_delete_mark", + "f_delete_time", + "f_delete_user_id", +]; + +/// 分页默认条数(上游 `pageSize<=0 → 20`)。 +pub const DEFAULT_PAGE_SIZE: i64 = 20; +/// 分页上限(上游 `Math.min(pageSize, 500)`)。 +pub const MAX_PAGE_SIZE: i64 = 500; +/// `/All` 的上限(上游 `wrapper.last("limit 1000")`)。 +pub const ALL_LIMIT: i64 = 1000; + +/// 解析查询串:同名参数取**第一个**(对齐 `request.getParameter`),并做百分号解码。 +pub fn parse_query(raw: Option<&str>) -> HashMap { + let mut out: HashMap = HashMap::new(); + let raw = match raw { + Some(r) => r, + None => return out, + }; + for pair in raw.split('&') { + if pair.is_empty() { + continue; + } + let (k, v) = match pair.split_once('=') { + Some((k, v)) => (k, v), + None => (pair, ""), + }; + let key = percent_decode(k); + if out.contains_key(&key) { + continue; + } + out.insert(key, percent_decode(v)); + } + out +} + +fn percent_decode(s: &str) -> String { + let bytes = s.as_bytes(); + let mut out: Vec = Vec::with_capacity(bytes.len()); + let mut i = 0usize; + while i < bytes.len() { + match bytes[i] { + b'%' if i + 2 < bytes.len() => { + match u8::from_str_radix( + std::str::from_utf8(&bytes[i + 1..i + 3]).unwrap_or(""), + 16, + ) { + Ok(b) => { + out.push(b); + i += 3; + } + Err(_) => { + out.push(bytes[i]); + i += 1; + } + } + } + b'+' => { + out.push(b' '); + i += 1; + } + b => { + out.push(b); + i += 1; + } + } + } + String::from_utf8_lossy(&out).to_string() +} + +/// 取参数:trim 后空串 ⇒ `None`(对齐上游 `param()`)。 +pub fn param(params: &HashMap, name: &str) -> Option { + params + .get(name) + .map(|v| v.trim().to_string()) + .filter(|v| !v.is_empty()) +} + +/// 行数据(`f_*` 列名)⇒ 上游 Jackson 形状(camelCase 键)。 +pub fn row_to_json(row: &Value) -> Value { + let mut out = Map::new(); + if let Some(obj) = row.as_object() { + for (k, v) in obj { + out.insert(column_to_json_key(k), v.clone()); + } + } + Value::Object(out) +} + +/// 行数据 ⇒ 上游 Jackson 形状,并**删掉**该实体的不外泄字段。 +/// +/// 🔴 上游实体上标了 `@JsonIgnore` 的属性,序列化时**整条不出现**(不是 null)⇒ 本仓照抄。 +/// 清单见 [`TableSpec::hidden_fields`](键是 camelCase JSON 键)。 +pub fn row_to_json_spec(spec: &TableSpec, row: &Value) -> Value { + let mut out = row_to_json(row); + if spec.hidden_fields.is_empty() { + return out; + } + if let Some(obj) = out.as_object_mut() { + for key in spec.hidden_fields { + obj.remove(*key); + } + } + out +} + +/// 标量值 ⇒ 文本(用于「值真的变化」比较;非标量返回 `None`)。 +pub fn scalar_text(v: &Value) -> Option { + match v { + Value::String(s) => Some(s.clone()), + Value::Number(n) => Some(n.to_string()), + Value::Bool(b) => Some(b.to_string()), + _ => None, + } +} + +/// 请求体(camelCase 键)⇒ `(列名, 文本值)` 列表。 +/// +/// - `null` 值跳过(等价 MyBatis-Plus 的 `NOT_NULL` 合并策略:null 表示「不覆盖」); +/// - 系统列跳过; +/// - **不外泄字段跳过**(上游实体上标了 `@JsonIgnore` ⇒ Jackson **绑定不到**该属性 +/// ⇒ 客户端送什么都不会写库;不是拒,是「当它不存在」); +/// - 表里没有的键**静默忽略**(对齐 Spring Boot 默认 `FAIL_ON_UNKNOWN_PROPERTIES=false`)。 +pub fn body_to_columns( + body: &Value, + types: &HashMap, + hidden_fields: &[&str], +) -> Vec<(String, String)> { + let obj = match body.as_object() { + Some(o) => o, + None => return Vec::new(), + }; + let mut out = Vec::new(); + for (key, value) in obj { + if value.is_null() { + continue; + } + if hidden_fields.contains(&key.as_str()) { + continue; + } + let col = json_key_to_column(key); + if SYSTEM_COLUMNS.contains(&col.as_str()) { + continue; + } + if !types.contains_key(&col) { + continue; + } + let text = match value { + Value::String(s) => s.clone(), + Value::Bool(b) => b.to_string(), + Value::Number(n) => n.to_string(), + other => other.to_string(), + }; + out.push((col, text)); + } + out +} + +/// 组装 WHERE 子句与绑定参数(全部按 text 绑定,类型转换交给 SQL 里的 `CAST`)。 +/// +/// 🔴 `tenant_column` 非空时客户端传 `tenantId` ⇒ 拒绝(上游 `buildWrapper` 同口径)。 +pub fn build_where( + spec: &TableSpec, + params: &HashMap, +) -> Result<(String, Vec), String> { + let mut clauses: Vec = vec![ALIVE.to_string()]; + if let Some(extra) = spec.extra_where { + clauses.push(format!("({})", extra)); + } + if spec.tenant_column.is_some() && param(params, "tenantId").is_some() { + return Err( + "身份上下文不可由客户端指定(tenantId),请由固定实例/TDS 授权确定".to_string(), + ); + } + let mut binds: Vec = Vec::new(); + for (pname, col) in spec.filter_columns { + if let Some(v) = param(params, pname) { + binds.push(v); + let idx = binds.len(); + clauses.push(format!("CAST({} AS TEXT) = CAST(${} AS TEXT)", col, idx)); + } + } + if let Some(kw) = param(params, "keyword") { + if !spec.keyword_columns.is_empty() { + let mut parts = Vec::new(); + for col in spec.keyword_columns { + binds.push(format!("%{}%", kw)); + let idx = binds.len(); + parts.push(format!("CAST({} AS TEXT) LIKE CAST(${} AS TEXT)", col, idx)); + } + clauses.push(format!("({})", parts.join(" OR "))); + } + } + Ok((clauses.join(" AND "), binds)) +} + +pub fn bind_refs(binds: &[String]) -> Vec<&(dyn ToSql + Sync)> { + binds.iter().map(|s| s as &(dyn ToSql + Sync)).collect() +} + +/// 绑定参数 ⇒ `CAST(CAST($n AS text) AS <列类型>)`。 +/// +/// 🔴 **内层 `CAST($n AS text)` 是必需的**:Rust 侧只有 `String`,而 PG 会按 +/// `CAST($n AS <列类型>)` 把 `$n` 推断成那个类型(`smallint` / `int4` / `numeric` …) +/// ⇒ wire 层类型不匹配(`cannot convert between the Rust type String and the +/// Postgres type int2`)。先钉死成 text、再**显式**转成列类型(text→任意类型 +/// 的显式转换 PG 允许)⇒ 一律按 text 送、类型转换全部交给 SQL。 +pub fn cast_param(types: &HashMap, col: &str, idx: usize) -> String { + let ty = types + .get(col) + .cloned() + .unwrap_or_else(|| "text".to_string()); + format!("CAST(CAST(${} AS text) AS {})", idx, ty) +} + +/// 计数查询(走绑定参数,绝不把值拼进 SQL 文本)。 +/// +/// `like_mode = true` ⇒ `WHERE {col} LIKE CAST($1 AS text)`(取「当日同前缀行数」的序号基线); +/// 否则 ⇒ `WHERE {col} = CAST($1 AS text)`(查重)。 +/// +/// `alive == true` ⇒ 追加 `AND (f_delete_mark IS NULL OR f_delete_mark = 0)`(`ALIVE` 谓词)。 +/// ⚠️ `f_delete_mark` 是**字面量**(不是用户输入)⇒ 不用绑参。 +/// +/// 🔴 **查重口径(有意分歧,裁决后保留)**:四个编码列统一按「该列**等值计数**」判定 +/// (**不**加 `f_delete_mark` 谓词)。这与上游 Product/Resource/DataInterface 一致; +/// 上游 **Datasource** 走基类 `newUniqueCode` ⇒ 用 `existsBy` ⇒ 谓词是 `ALIVE` +/// (软删行**不算**占用),本仓对 Datasource **更严**。理由:本仓 4 个编码列的唯一索引 +/// 都是 `WHERE f_delete_mark IS NULL` 的**部分索引** ⇒ 软删行的码在索引层同样不占位 ⇒ +/// 「更严」只会导致**不复用**软删行的旧码(少一个可复用码), +/// **绝不会**造成插入冲突;差异对用户不可观测。 +pub async fn count_matching( + state: &crate::platform::state::AppState, + table: &str, + code_key: &str, + bind: &str, + like_mode: bool, + alive: bool, +) -> Result { + let col = json_key_to_column(code_key); + if valid_table(table).is_none() { + return Err(crate::tdc::service::crud::server_error(format!( + "注册表表名非法: {}", + table + ))); + } + if valid_table(&col).is_none() { + return Err(crate::tdc::service::crud::server_error(format!( + "注册表编码列非法: {}", + col + ))); + } + let op = if like_mode { "LIKE" } else { "=" }; + let alive_clause = if alive { + format!(" AND {}", ALIVE) + } else { + String::new() + }; + let sql = format!( + "SELECT count(*)::text FROM {} WHERE {} {} CAST($1 AS text){}", + table, col, op, alive_clause + ); + let raw = { + let _g = state.db_lock.lock().await; + crate::platform::db::query_scalar_text(state.db.as_ref(), &sql, &[&bind]).await + }; + match raw { + Ok(v) => Ok(v.and_then(|s| s.trim().parse::().ok()).unwrap_or(0)), + Err(e) => Err(crate::tdc::service::crud::server_error(e)), + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::platform::db::ALIVE; + use crate::tdc::entity; + + #[test] + fn parse_query_takes_first_occurrence_and_decodes() { + let q = parse_query(Some( + "keyword=abc&keyword=def&name=%E4%B8%AD%E6%96%87&empty=", + )); + assert_eq!(q.get("keyword").unwrap(), "abc"); + assert_eq!(q.get("name").unwrap(), "中文"); + assert_eq!(q.get("empty").unwrap(), ""); + assert_eq!(parse_query(None).len(), 0); + } + + #[test] + fn param_trims_and_maps_empty_to_none() { + let mut m = HashMap::new(); + m.insert("a".to_string(), " x ".to_string()); + m.insert("b".to_string(), " ".to_string()); + assert_eq!(param(&m, "a").as_deref(), Some("x")); + assert_eq!(param(&m, "b"), None); + assert_eq!(param(&m, "missing"), None); + } + + #[test] + fn row_to_json_converts_f_columns_to_camel_case() { + let row = serde_json::json!({"f_id": "1", "f_task_no": "T-1", "f_create_time": "x"}); + let out = row_to_json(&row); + assert_eq!(out["id"], "1"); + assert_eq!(out["taskNo"], "T-1"); + assert_eq!(out["createTime"], "x"); + assert!(out.get("f_id").is_none()); + } + + #[test] + fn body_to_columns_skips_null_system_and_unknown_keys() { + let mut types = HashMap::new(); + types.insert("f_name".to_string(), "character varying(200)".to_string()); + types.insert("f_id".to_string(), "character varying(50)".to_string()); + types.insert( + "f_creator_time".to_string(), + "timestamp without time zone".to_string(), + ); + let body = serde_json::json!({ + "name": "产品", + "id": "999", + "creatorTime": "2020-01-01", + "nope": "x", + "count": 3 + }); + let cols = body_to_columns(&body, &types, &[]); + assert_eq!(cols, vec![("f_name".to_string(), "产品".to_string())]); + } + + /// 🔴 不外泄字段(上游 `@JsonIgnore`)**入参也当它不存在**。 + #[test] + fn body_to_columns_skips_json_ignored_fields() { + let mut types = HashMap::new(); + types.insert( + "f_secret_key".to_string(), + "character varying(200)".to_string(), + ); + types.insert("f_name".to_string(), "character varying(200)".to_string()); + let body = serde_json::json!({"name": "身份", "secretKey": "SENTINEL"}); + let cols = body_to_columns(&body, &types, &["secretKey"]); + assert_eq!(cols, vec![("f_name".to_string(), "身份".to_string())]); + } + + #[test] + fn build_where_rejects_client_tenant_id() { + let spec = entity::find("Product").unwrap(); + let mut m = HashMap::new(); + m.insert("tenantId".to_string(), "x".to_string()); + let err = build_where(spec, &m).unwrap_err(); + assert_eq!( + err, + "身份上下文不可由客户端指定(tenantId),请由固定实例/TDS 授权确定" + ); + } + + #[test] + fn build_where_builds_keyword_or_filters() { + let spec = entity::find("Product").unwrap(); + let mut m = HashMap::new(); + m.insert("keyword".to_string(), "数据".to_string()); + m.insert("category".to_string(), "A".to_string()); + let (clause, binds) = build_where(spec, &m).unwrap(); + assert!(clause.starts_with(ALIVE)); + assert!(clause.contains("CAST(f_category AS TEXT) = CAST($1 AS TEXT)")); + assert!(clause.contains("CAST(f_name AS TEXT) LIKE CAST($2 AS TEXT)")); + assert!(clause.contains(" OR ")); + // 过滤参数先绑($1),随后**每个关键字列各绑一个**(OR 展开 ⇒ N 个占位符)。 + // Product 有 4 个关键字列(f_name/f_product_code/f_resource_name/f_tags)。 + assert_eq!(binds[0], "A".to_string()); + assert_eq!(binds.len(), 1 + spec.keyword_columns.len()); + assert!(binds[1..].iter().all(|b| b == "%数据%")); + } + + #[test] + fn identity_table_allows_tenant_id_param() { + let spec = entity::find("Identity").unwrap(); + let mut m = HashMap::new(); + m.insert("tenantId".to_string(), "x".to_string()); + assert!( + build_where(spec, &m).is_ok(), + "Identity 的 tenant_column 为 null,不该拒" + ); + } +} diff --git a/src/tdc/mod.rs b/src/tdc/mod.rs new file mode 100644 index 0000000..cc208b7 --- /dev/null +++ b/src/tdc/mod.rs @@ -0,0 +1,29 @@ +//! **业务层** —— 对位上游 `ssw.tdc.*` 包族。 +//! +//! | 本仓 | 上游 | 职责 | +//! |---|---|---| +//! | `entity/` | `ssw.tdc.entity` | 18 个实体的元数据(列清单 / 分档 / 隐藏字段 / 编码规则) | +//! | `mapper.rs` | `ssw.tdc.mapper` | SQL 组装与执行、投影与序列化 | +//! | `service/` | `ssw.tdc.service(+impl)` | 业务规则(分档判定 / 状态机 / 聚合详情 / 账号 / 身份) | +//! | `controller/` | `ssw.tdc.controller` | HTTP 端点(按上游控制器分文件) | +//! | `support/` | `ssw.tdc.support` | 公共放行清单 / 管理员闸门 / 内部令牌等 | +//! | `util/` | `ssw.tdc.util` | **业务**工具(业务编码生成器 `code.rs`) | +//! | `client/` | `ssw.tdc.client` | TDS 出向客户端 | +//! | `policy/` `engine/` `schedule/` `notify/` `heartbeat/` `sso/` | 同名包 | **占位**,后续批 | +//! +//! 🔴 **边界规约(v3 spec §2.3)**:`src/platform/` 里不许出现业务知识; +//! 本层**不许出现平台能力的第二份实现**。 + +pub mod client; +pub mod controller; +pub mod engine; +pub mod entity; +pub mod heartbeat; +pub mod mapper; +pub mod notify; +pub mod policy; +pub mod schedule; +pub mod service; +pub mod sso; +pub mod support; +pub mod util; diff --git a/src/tdc/notify/mod.rs b/src/tdc/notify/mod.rs new file mode 100644 index 0000000..4387337 --- /dev/null +++ b/src/tdc/notify/mod.rs @@ -0,0 +1,3 @@ +//! 站内通知占位(对位上游 `ssw.tdc.notify`)。 + +pub const _PLACEHOLDER: &str = "占位模块:上游通知投递不在本批范围"; diff --git a/src/tdc/policy/mod.rs b/src/tdc/policy/mod.rs new file mode 100644 index 0000000..e562b8b --- /dev/null +++ b/src/tdc/policy/mod.rs @@ -0,0 +1,6 @@ +//! 策略引擎占位(对位上游 `ssw.tdc.policy`)。 +//! +//! 当前仓内的策略相关能力 = 策略实体的 CRUD + `tdc_policy_check_log` 流水; +//! 上游的**策略求值引擎**不在本批范围。 + +pub const _PLACEHOLDER: &str = "占位模块:上游策略求值引擎不在本批范围"; diff --git a/src/tdc/schedule/mod.rs b/src/tdc/schedule/mod.rs new file mode 100644 index 0000000..14b37e6 --- /dev/null +++ b/src/tdc/schedule/mod.rs @@ -0,0 +1,3 @@ +//! 定时任务占位(对位上游 `ssw.tdc.schedule`)。 + +pub const _PLACEHOLDER: &str = "占位模块:上游定时任务不在本批范围"; diff --git a/src/account.rs b/src/tdc/service/account.rs similarity index 99% rename from src/account.rs rename to src/tdc/service/account.rs index 14c54e7..4f1f35e 100644 --- a/src/account.rs +++ b/src/tdc/service/account.rs @@ -12,7 +12,7 @@ use std::time::{SystemTime, UNIX_EPOCH}; use serde::{Deserialize, Serialize}; -use crate::cipher::md5_hex; +use crate::platform::cipher::md5_hex; /// 新建账号的初始口令(上游取 `base_sys_config.newUserDefaultPassword`,本端固定值)。 pub const DEFAULT_NEW_USER_PASSWORD: &str = "123456"; @@ -106,7 +106,7 @@ impl AccountStore { bootstrap_account.trim() }; file.accounts.push(Account { - id: crate::ids::next_id(), + id: crate::platform::ids::next_id(), account: account.to_string(), real_name: "管理员".to_string(), gender: 1, @@ -181,7 +181,7 @@ impl AccountStore { return Err("账号已存在".to_string()); } let row = Account { - id: crate::ids::next_id(), + id: crate::platform::ids::next_id(), account: account.to_string(), real_name: real_name.trim().to_string(), gender, diff --git a/src/crud.rs b/src/tdc/service/crud.rs similarity index 64% rename from src/crud.rs rename to src/tdc/service/crud.rs index c0c3939..598af61 100644 --- a/src/crud.rs +++ b/src/tdc/service/crud.rs @@ -2,240 +2,34 @@ //! //! 上游 18 个控制器全部 `extends TdcCrudController`,只覆写「元数据」(关键字列 / 过滤列 / //! 租户列 / 默认排序列)与少量动作钩子 ⇒ 本仓把公共部分抽成本引擎,**元数据**放 -//! [`crate::registry`]。 +//! [`crate::tdc::entity`],**SQL 机械活**放 [`crate::tdc::mapper`],本模块只留**业务规则**。 //! //! 红线: //! - 表名只来自注册表(静态白名单);客户端输入只进**绑定参数**,绝不拼进 SQL。 //! - 所有 DB 访问持 `state.db_lock`(PGlite 单 in-process backend)。 //! - 出参 camelCase(上游 Jackson 属性名),入参反查 `f_*` 列名。 //! - 业务失败一律 HTTP 200 + body `code != 200`(走 [`ActionResult`] 业务信封)。 +//! +//! 🔴 **零 `match api_name`**(v3 spec §2.3.2 接触点 ③):任何按实体名的分叉只能读 +//! `TableSpec` 字段 ⇒ `scripts/check-boundary.sh` 的 CP3 会当场红。 -use std::collections::{HashMap, HashSet}; +use std::collections::HashMap; use axum::response::{IntoResponse, Response}; use chrono::{DateTime, Local}; -use pglite::ToSql; -use serde_json::{Map, Value}; +use serde_json::Value; -use crate::auth::{require_menu_permission, Principal}; -use crate::codec::{day_prefix_at, format_code_at, CodeStyle}; -use crate::db::{ - column_to_json_key, column_types, json_key_to_column, query_json_params, query_scalar_text, - valid_table, ALIVE, +use crate::platform::auth::{require_menu_permission, Principal}; +use crate::platform::db::{query_json_params, query_scalar_text, ALIVE}; +use crate::platform::envelope::{ActionResult, Pagination, CODE_SERVER_ERROR}; +use crate::platform::ids::next_id; +use crate::platform::state::AppState; +use crate::tdc::entity::{self, CodeSpec, TableSpec}; +use crate::tdc::mapper::{ + bind_refs, body_to_columns, build_where, cast_param, count_matching, row_to_json, + row_to_json_spec, scalar_text, ALL_LIMIT, DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE, }; -use crate::envelope::{ActionResult, Pagination, CODE_SERVER_ERROR}; -use crate::ids::next_id; -use crate::registry::{self, CodeSpec, TableSpec}; -use crate::state::AppState; - -/// 系统列:请求体不得覆盖(对齐上游 `update` 里置 null 的那批 + 身份/排序列)。 -pub const SYSTEM_COLUMNS: &[&str] = &[ - "f_id", - "f_tenant_id", - "f_sort_code", - "f_creator_time", - "f_creator_user_id", - "f_last_modify_time", - "f_last_modify_user_id", - "f_delete_mark", - "f_delete_time", - "f_delete_user_id", -]; - -/// 分页默认条数(上游 `pageSize<=0 → 20`)。 -pub const DEFAULT_PAGE_SIZE: i64 = 20; -/// 分页上限(上游 `Math.min(pageSize, 500)`)。 -pub const MAX_PAGE_SIZE: i64 = 500; -/// `/All` 的上限(上游 `wrapper.last("limit 1000")`)。 -pub const ALL_LIMIT: i64 = 1000; - -/// 解析查询串:同名参数取**第一个**(对齐 `request.getParameter`),并做百分号解码。 -pub fn parse_query(raw: Option<&str>) -> HashMap { - let mut out: HashMap = HashMap::new(); - let raw = match raw { - Some(r) => r, - None => return out, - }; - for pair in raw.split('&') { - if pair.is_empty() { - continue; - } - let (k, v) = match pair.split_once('=') { - Some((k, v)) => (k, v), - None => (pair, ""), - }; - let key = percent_decode(k); - if out.contains_key(&key) { - continue; - } - out.insert(key, percent_decode(v)); - } - out -} - -fn percent_decode(s: &str) -> String { - let bytes = s.as_bytes(); - let mut out: Vec = Vec::with_capacity(bytes.len()); - let mut i = 0usize; - while i < bytes.len() { - match bytes[i] { - b'%' if i + 2 < bytes.len() => { - match u8::from_str_radix( - std::str::from_utf8(&bytes[i + 1..i + 3]).unwrap_or(""), - 16, - ) { - Ok(b) => { - out.push(b); - i += 3; - } - Err(_) => { - out.push(bytes[i]); - i += 1; - } - } - } - b'+' => { - out.push(b' '); - i += 1; - } - b => { - out.push(b); - i += 1; - } - } - } - String::from_utf8_lossy(&out).to_string() -} - -/// 取参数:trim 后空串 ⇒ `None`(对齐上游 `param()`)。 -pub fn param(params: &HashMap, name: &str) -> Option { - params - .get(name) - .map(|v| v.trim().to_string()) - .filter(|v| !v.is_empty()) -} - -/// 行数据(`f_*` 列名)⇒ 上游 Jackson 形状(camelCase 键)。 -pub fn row_to_json(row: &Value) -> Value { - let mut out = Map::new(); - if let Some(obj) = row.as_object() { - for (k, v) in obj { - out.insert(column_to_json_key(k), v.clone()); - } - } - Value::Object(out) -} - -/// 行数据 ⇒ 上游 Jackson 形状,并**删掉**该实体的不外泄字段。 -/// -/// 🔴 上游实体上标了 `@JsonIgnore` 的属性,序列化时**整条不出现**(不是 null)⇒ 本仓照抄。 -/// 清单见 [`TableSpec::hidden_fields`](键是 camelCase JSON 键)。 -pub fn row_to_json_spec(spec: &TableSpec, row: &Value) -> Value { - let mut out = row_to_json(row); - if spec.hidden_fields.is_empty() { - return out; - } - if let Some(obj) = out.as_object_mut() { - for key in spec.hidden_fields { - obj.remove(*key); - } - } - out -} - -/// 标量值 ⇒ 文本(用于「值真的变化」比较;非标量返回 `None`)。 -fn scalar_text(v: &Value) -> Option { - match v { - Value::String(s) => Some(s.clone()), - Value::Number(n) => Some(n.to_string()), - Value::Bool(b) => Some(b.to_string()), - _ => None, - } -} - -/// 请求体(camelCase 键)⇒ `(列名, 文本值)` 列表。 -/// -/// - `null` 值跳过(等价 MyBatis-Plus 的 `NOT_NULL` 合并策略:null 表示「不覆盖」); -/// - 系统列跳过; -/// - **不外泄字段跳过**(上游实体上标了 `@JsonIgnore` ⇒ Jackson **绑定不到**该属性 -/// ⇒ 客户端送什么都不会写库;不是拒,是「当它不存在」); -/// - 表里没有的键**静默忽略**(对齐 Spring Boot 默认 `FAIL_ON_UNKNOWN_PROPERTIES=false`)。 -pub fn body_to_columns( - body: &Value, - types: &HashMap, - hidden_fields: &[&str], -) -> Vec<(String, String)> { - let obj = match body.as_object() { - Some(o) => o, - None => return Vec::new(), - }; - let mut out = Vec::new(); - for (key, value) in obj { - if value.is_null() { - continue; - } - if hidden_fields.contains(&key.as_str()) { - continue; - } - let col = json_key_to_column(key); - if SYSTEM_COLUMNS.contains(&col.as_str()) { - continue; - } - if !types.contains_key(&col) { - continue; - } - let text = match value { - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - }; - out.push((col, text)); - } - out -} - -/// 组装 WHERE 子句与绑定参数(全部按 text 绑定,类型转换交给 SQL 里的 `CAST`)。 -/// -/// 🔴 `tenant_column` 非空时客户端传 `tenantId` ⇒ 拒绝(上游 `buildWrapper` 同口径)。 -fn build_where( - spec: &TableSpec, - params: &HashMap, -) -> Result<(String, Vec), String> { - let mut clauses: Vec = vec![ALIVE.to_string()]; - if let Some(extra) = spec.extra_where { - clauses.push(format!("({})", extra)); - } - if spec.tenant_column.is_some() && param(params, "tenantId").is_some() { - return Err( - "身份上下文不可由客户端指定(tenantId),请由固定实例/TDS 授权确定".to_string(), - ); - } - let mut binds: Vec = Vec::new(); - for (pname, col) in spec.filter_columns { - if let Some(v) = param(params, pname) { - binds.push(v); - let idx = binds.len(); - clauses.push(format!("CAST({} AS TEXT) = CAST(${} AS TEXT)", col, idx)); - } - } - if let Some(kw) = param(params, "keyword") { - if !spec.keyword_columns.is_empty() { - let mut parts = Vec::new(); - for col in spec.keyword_columns { - binds.push(format!("%{}%", kw)); - let idx = binds.len(); - parts.push(format!("CAST({} AS TEXT) LIKE CAST(${} AS TEXT)", col, idx)); - } - clauses.push(format!("({})", parts.join(" OR "))); - } - } - Ok((clauses.join(" AND "), binds)) -} - -fn bind_refs(binds: &[String]) -> Vec<&(dyn ToSql + Sync)> { - binds.iter().map(|s| s as &(dyn ToSql + Sync)).collect() -} +use crate::tdc::util::code::{day_prefix_at, format_code_at, CodeStyle}; /// 当前操作人(**操作人 id**):内部令牌通道的 `X-Internal-Operator` > 会话身份 > 本地账号 id > 本地引导身份 > `SYSTEM`。 /// @@ -263,7 +57,7 @@ pub fn operator(state: &AppState, principal: Option<&Principal>) -> String { /// /// 🔴 **不得回显数据库原文**(PG 错误里含表名 / 列名 / 约束名 / `Failing row contains (...)` /// **整行数据**)⇒ 客户端只看到「服务异常,请稍后重试」,排障信息走服务端日志。 -fn server_error(e: impl std::fmt::Display) -> Response { +pub fn server_error(e: impl std::fmt::Display) -> Response { eprintln!("[tdc] 内部错误: {}", e); ActionResult::fail_code(CODE_SERVER_ERROR, "服务异常,请稍后重试".to_string()).into_response() } @@ -333,56 +127,6 @@ fn body_text(body: &Value, key: &str) -> Option { } } -/// 计数查询(走绑定参数,绝不把值拼进 SQL 文本)。 -/// -/// `like_mode = true` ⇒ `WHERE {col} LIKE CAST($1 AS text)`(取「当日同前缀行数」的序号基线); -/// 否则 ⇒ `WHERE {col} = CAST($1 AS text)`(查重)。 -/// -/// `alive == true` ⇒ 追加 `AND (f_delete_mark IS NULL OR f_delete_mark = 0)`(`ALIVE` 谓词)。 -/// ⚠️ `f_delete_mark` 是**字面量**(不是用户输入)⇒ 不用绑参。 -/// -/// 🔴 **查重口径(有意分歧,裁决后保留)**:四个编码列统一按「该列**等值计数**」判定 -/// (**不**加 `f_delete_mark` 谓词)。这与上游 Product/Resource/DataInterface 一致; -/// 上游 **Datasource** 走基类 `newUniqueCode` ⇒ 用 `existsBy` ⇒ 谓词是 `ALIVE` -/// (软删行**不算**占用),本仓对 Datasource **更严**。理由:本仓 4 个编码列的唯一索引 -/// 都是 `WHERE f_delete_mark IS NULL` 的**部分索引** ⇒ 软删行的码在索引层同样不占位 ⇒ -/// 「更严」只会导致**不复用**软删行的旧码(少一个可复用码), -/// **绝不会**造成插入冲突;差异对用户不可观测。 -async fn count_matching( - state: &AppState, - table: &str, - code_key: &str, - bind: &str, - like_mode: bool, - alive: bool, -) -> Result { - let col = json_key_to_column(code_key); - if valid_table(table).is_none() { - return Err(server_error(format!("注册表表名非法: {}", table))); - } - if valid_table(&col).is_none() { - return Err(server_error(format!("注册表编码列非法: {}", col))); - } - let op = if like_mode { "LIKE" } else { "=" }; - let alive_clause = if alive { - format!(" AND {}", ALIVE) - } else { - String::new() - }; - let sql = format!( - "SELECT count(*)::text FROM {} WHERE {} {} CAST($1 AS text){}", - table, col, op, alive_clause - ); - let raw = { - let _g = state.db_lock.lock().await; - query_scalar_text(state.db.as_ref(), &sql, &[&bind]).await - }; - match raw { - Ok(v) => Ok(v.and_then(|s| s.trim().parse::().ok()).unwrap_or(0)), - Err(e) => Err(server_error(e)), - } -} - /// 「当日同前缀行数」基线(序号的起点,`used`)。 /// /// 🔴 上游**逐实体不同**:DataInterface 的 `countByCodePrefix` **带 `ALIVE`** @@ -439,7 +183,7 @@ async fn generate_code( /// /// 🔴 **重试次数与失败文案都读 `CodeSpec`**(上游逐实体不同:Product/Resource 5 次、 /// DataInterface/Datasource 3 次;文案也各不相同)—— 不再硬编码。 -async fn generate_code_with( +pub async fn generate_code_with( state: &AppState, spec: &TableSpec, code: &CodeSpec, @@ -583,7 +327,7 @@ pub async fn detail( }; match rows.first() { Some(row) => ActionResult::ok(row_to_json_spec(spec, row)).into_response(), - None => ActionResult::fail("记录不存在或已删除").into_response(), + None => ActionResult::fail(detail_not_found_msg(spec.api_name)).into_response(), } } @@ -619,7 +363,7 @@ pub async fn require_write_permission( let p = match principal { Some(p) => p, None => { - return Err(crate::auth::reject( + return Err(crate::platform::auth::reject( axum::http::StatusCode::FORBIDDEN, "缺少有效凭证(需登录或内部凭证)", )) @@ -627,22 +371,22 @@ pub async fn require_write_permission( }; let identity_code = match p { Principal::Internal { .. } => return Ok(()), - // 🔴 `Principal` 是**三变体**枚举(`src/auth.rs`):`Internal` / `Session` / `Account`。 + // 🔴 `Principal` 是**三变体**枚举(`platform/auth.rs`):`Internal` / `Session` / `Account`。 // 漏掉 `Account` 分支 ⇒ E0004 non-exhaustive match,**编译不过**。 // 本地账号(Task 12 引入)没有 `tdc_identity.f_capability` 来源 ⇒ 与 // `capabilities()` 返回 `None` 的情形同 footing,**fail-open 放行**。 Principal::Account { .. } => return Ok(()), Principal::Session { identity_code, .. } => identity_code.clone(), }; - let key = registry::permission_key(spec.api_name).unwrap_or(spec.api_name); - let caps = crate::domain::identity::capabilities(state, &identity_code).await; + let key = entity::permission_key(spec.api_name).unwrap_or(spec.api_name); + let caps = crate::tdc::service::identity::capabilities(state, &identity_code).await; match caps { None => Ok(()), Some(set) => { if set.iter().any(|c| c == "*" || c == "all" || c == key) { Ok(()) } else { - Err(crate::auth::reject( + Err(crate::platform::auth::reject( axum::http::StatusCode::FORBIDDEN, &format!("当前身份无「{}」的操作权限", key), )) @@ -666,7 +410,7 @@ pub async fn create( } let types = { let _g = state.db_lock.lock().await; - match column_types(state.db.as_ref(), spec.table).await { + match crate::platform::db::column_types(state.db.as_ref(), spec.table).await { Ok(t) => t, Err(e) => return server_error(e), } @@ -681,13 +425,13 @@ pub async fn create( vals.push(cast_param(&types, "f_id", 1)); // 🔴 `skip`:已被引擎消费(不再由 body 循环写入)的列 —— 否则同列 INSERT 两次 ⇒ 报错。 - let mut skip: HashSet = HashSet::new(); + let mut skip: std::collections::HashSet = std::collections::HashSet::new(); // ① 服务端生成的编码列 —— **必须先于 body 列循环被消费**: // `f_product_code` 等列在 DDL 里 NOT NULL 且无 DEFAULT,而上游前端新建时**不送** // ⇒ 服务端生成;body **显式给了非空值就不覆盖**(上游「空值即生成」规则)。 - for cs in registry::create_codes(spec.api_name) { - let col = json_key_to_column(cs.key); + for cs in entity::create_codes(spec.api_name) { + let col = crate::platform::db::json_key_to_column(cs.key); skip.insert(col.clone()); let value = match body_text(body, cs.key) { Some(v) => v, @@ -709,7 +453,7 @@ pub async fn create( ("actorId", actor_id), ("actorName", actor_name), ] { - let col = json_key_to_column(key); + let col = crate::platform::db::json_key_to_column(key); if !types.contains_key(&col) { continue; } @@ -733,12 +477,12 @@ pub async fn create( } // 服务端补默认值(body 显式给了该键且**值非 null** ⇒ 不补;被引擎覆写的列 ⇒ 跳过)。 - for (key, raw) in registry::create_defaults(spec.api_name) { + for (key, raw) in entity::create_defaults(spec.api_name) { // body 显式给了该键且**值非 null** ⇒ 才算业务已给(上游:字段为 null ⇒ 照样补默认值) if body.get(key).map(|v| !v.is_null()).unwrap_or(false) { continue; } - let col = json_key_to_column(key); + let col = crate::platform::db::json_key_to_column(key); if skip.contains(&col) { continue; } @@ -747,12 +491,12 @@ pub async fn create( cols.push(col.clone()); vals.push(cast_param(&types, &col, idx)); } - for key in registry::create_now_columns(spec.api_name) { + for key in entity::create_now_columns(spec.api_name) { // 同上:显式 null **不得**抑制服务端补的 now() if body.get(key).map(|v| !v.is_null()).unwrap_or(false) { continue; } - let col = json_key_to_column(key); + let col = crate::platform::db::json_key_to_column(key); if skip.contains(&col) { continue; } @@ -812,7 +556,7 @@ pub async fn update( }; let current = match current { Some(v) => v, - None => return ActionResult::fail("记录不存在或已删除").into_response(), + None => return ActionResult::fail(detail_not_found_msg(spec.api_name)).into_response(), }; // 冻结列:只拒「值真的变化」(上游 `changedAuthorityColumn` 口径)。 @@ -823,13 +567,13 @@ pub async fn update( let hidden_columns: Vec = spec .hidden_fields .iter() - .map(|k| json_key_to_column(k)) + .map(|k| crate::platform::db::json_key_to_column(k)) .collect(); for fc in spec.frozen_columns { if hidden_columns.iter().any(|c| c == fc.column) { continue; } - let key = column_to_json_key(fc.column); + let key = crate::platform::db::column_to_json_key(fc.column); if let Some(incoming) = body.get(&key) { if !incoming.is_null() { let cur_txt = current.get(fc.column).and_then(scalar_text); @@ -847,7 +591,7 @@ pub async fn update( let types = { let _g = state.db_lock.lock().await; - match column_types(state.db.as_ref(), spec.table).await { + match crate::platform::db::column_types(state.db.as_ref(), spec.table).await { Ok(t) => t, Err(e) => return server_error(e), } @@ -907,14 +651,14 @@ pub async fn delete( Err(e) => return server_error(e), }; if current.is_none() { - return ActionResult::fail("记录不存在或已删除").into_response(); + return ActionResult::fail(detail_not_found_msg(spec.api_name)).into_response(); } if let Some(msg) = spec.no_delete { return ActionResult::fail(msg).into_response(); } let types = { let _g = state.db_lock.lock().await; - match column_types(state.db.as_ref(), spec.table).await { + match crate::platform::db::column_types(state.db.as_ref(), spec.table).await { Ok(t) => t, Err(e) => return server_error(e), } @@ -943,21 +687,6 @@ pub async fn delete( } } -/// 绑定参数 ⇒ `CAST(CAST($n AS text) AS <列类型>)`。 -/// -/// 🔴 **内层 `CAST($n AS text)` 是必需的**:Rust 侧只有 `String`,而 PG 会按 -/// `CAST($n AS <列类型>)` 把 `$n` 推断成那个类型(`smallint` / `int4` / `numeric` …) -/// ⇒ wire 层类型不匹配(`cannot convert between the Rust type String and the -/// Postgres type int2`)。先钉死成 text、再**显式**转成列类型(text→任意类型 -/// 的显式转换 PG 允许)⇒ 一律按 text 送、类型转换全部交给 SQL。 -fn cast_param(types: &HashMap, col: &str, idx: usize) -> String { - let ty = types - .get(col) - .cloned() - .unwrap_or_else(|| "text".to_string()); - format!("CAST(CAST(${} AS text) AS {})", idx, ty) -} - /// 有子表聚合的实体 —— 上游 `ResourceService.withChildren`。 /// /// 🔴 目前**只有资源侧**(`Resource` / `Dataset` 共用 `tdc_resource`)有子表; @@ -988,7 +717,7 @@ fn detail_not_found_msg(api_name: &str) -> &'static str { /// `GET /api/ssw/tdc/{Entity}/{id}/Detail` —— 上游 `ResourceController` / `DatasetController` /// 的**只读聚合体**(`ResourceService.withChildren`):资源行 + 两张子表。 /// -/// 与 [`detail`] 的差别**只有**「多挂两个子表」;无子表的实体完全等价于 `detail()`。 +/// 与 [`detail`] 的差别**只有**「多挂子表」;无子表的实体完全等价于 `detail()`。 pub async fn detail_aggregate( state: &AppState, spec: &'static TableSpec, @@ -1043,125 +772,18 @@ pub async fn detail_aggregate( #[cfg(test)] mod tests { use super::*; - use crate::config::Config; - use crate::registry; - use crate::session::SessionStore; - use crate::state::BootstrapIdentity; + use crate::platform::config::Config; + use crate::platform::session::SessionStore; + use crate::platform::state::BootstrapIdentity; + use crate::tdc::entity; use pglite::PGlite; - use serde_json::json; use std::sync::Arc; - #[test] - fn parse_query_takes_first_occurrence_and_decodes() { - let q = parse_query(Some( - "keyword=abc&keyword=def&name=%E4%B8%AD%E6%96%87&empty=", - )); - assert_eq!(q.get("keyword").unwrap(), "abc"); - assert_eq!(q.get("name").unwrap(), "中文"); - assert_eq!(q.get("empty").unwrap(), ""); - assert_eq!(parse_query(None).len(), 0); - } - - #[test] - fn param_trims_and_maps_empty_to_none() { - let mut m = HashMap::new(); - m.insert("a".to_string(), " x ".to_string()); - m.insert("b".to_string(), " ".to_string()); - assert_eq!(param(&m, "a").as_deref(), Some("x")); - assert_eq!(param(&m, "b"), None); - assert_eq!(param(&m, "missing"), None); - } - - #[test] - fn row_to_json_converts_f_columns_to_camel_case() { - let row = json!({"f_id": "1", "f_task_no": "T-1", "f_create_time": "x"}); - let out = row_to_json(&row); - assert_eq!(out["id"], "1"); - assert_eq!(out["taskNo"], "T-1"); - assert_eq!(out["createTime"], "x"); - assert!(out.get("f_id").is_none()); - } - - #[test] - fn body_to_columns_skips_null_system_and_unknown_keys() { - let mut types = HashMap::new(); - types.insert("f_name".to_string(), "character varying(200)".to_string()); - types.insert("f_id".to_string(), "character varying(50)".to_string()); - types.insert( - "f_creator_time".to_string(), - "timestamp without time zone".to_string(), - ); - let body = json!({ - "name": "产品", - "id": "999", - "creatorTime": "2020-01-01", - "nope": "x", - "count": 3 - }); - let cols = body_to_columns(&body, &types, &[]); - assert_eq!(cols, vec![("f_name".to_string(), "产品".to_string())]); - } - - /// 🔴 不外泄字段(上游 `@JsonIgnore`)**入参也当它不存在**。 - #[test] - fn body_to_columns_skips_json_ignored_fields() { - let mut types = HashMap::new(); - types.insert( - "f_secret_key".to_string(), - "character varying(200)".to_string(), - ); - types.insert("f_name".to_string(), "character varying(200)".to_string()); - let body = json!({"name": "身份", "secretKey": "SENTINEL"}); - let cols = body_to_columns(&body, &types, &["secretKey"]); - assert_eq!(cols, vec![("f_name".to_string(), "身份".to_string())]); - } - - #[test] - fn build_where_rejects_client_tenant_id() { - let spec = registry::find("Product").unwrap(); - let mut m = HashMap::new(); - m.insert("tenantId".to_string(), "x".to_string()); - let err = build_where(spec, &m).unwrap_err(); - assert_eq!( - err, - "身份上下文不可由客户端指定(tenantId),请由固定实例/TDS 授权确定" - ); - } - - #[test] - fn build_where_builds_keyword_or_filters() { - let spec = registry::find("Product").unwrap(); - let mut m = HashMap::new(); - m.insert("keyword".to_string(), "数据".to_string()); - m.insert("category".to_string(), "A".to_string()); - let (clause, binds) = build_where(spec, &m).unwrap(); - assert!(clause.starts_with(ALIVE)); - assert!(clause.contains("CAST(f_category AS TEXT) = CAST($1 AS TEXT)")); - assert!(clause.contains("CAST(f_name AS TEXT) LIKE CAST($2 AS TEXT)")); - assert!(clause.contains(" OR ")); - // 过滤参数先绑($1),随后**每个关键字列各绑一个**(OR 展开 ⇒ N 个占位符)。 - // Product 有 4 个关键字列(f_name/f_product_code/f_resource_name/f_tags)。 - assert_eq!(binds[0], "A".to_string()); - assert_eq!(binds.len(), 1 + spec.keyword_columns.len()); - assert!(binds[1..].iter().all(|b| b == "%数据%")); - } - - #[test] - fn identity_table_allows_tenant_id_param() { - let spec = registry::find("Identity").unwrap(); - let mut m = HashMap::new(); - m.insert("tenantId".to_string(), "x".to_string()); - assert!( - build_where(spec, &m).is_ok(), - "Identity 的 tenant_column 为 null,不该拒" - ); - } - #[test] fn only_resource_side_entities_have_child_tables() { - let res = registry::find("Resource").unwrap(); - let ds = registry::find("Dataset").unwrap(); - let prod = registry::find("Product").unwrap(); + let res = entity::find("Resource").unwrap(); + let ds = entity::find("Dataset").unwrap(); + let prod = entity::find("Product").unwrap(); assert_eq!( child_tables(res), &[ @@ -1187,7 +809,7 @@ mod tests { async fn code_generation_gives_up_after_the_entity_specific_retries() { // ⚠️ pglite-rs 每进程只允许一个 PGlite ⇒ 本单元测试二进制内**只有这一条**开库。 let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - crate::db::ensure_schema(db.as_ref()) + crate::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); let mut config = Config::from_env(std::env::current_dir().unwrap_or_default()); @@ -1224,8 +846,8 @@ mod tests { let _g = state.db_lock.lock().await; db.query(insert_sql, &[]).await.expect("插入测试行失败"); } - let spec = registry::find(api).expect("实体应在注册表里"); - let code = ®istry::create_codes(api)[0]; + let spec = entity::find(api).expect("实体应在注册表里"); + let code = &entity::create_codes(api)[0]; let attempts = std::cell::Cell::new(0u32); let resp = generate_code_with(&state, spec, code, |_| { attempts.set(attempts.get() + 1); diff --git a/src/domain/identity.rs b/src/tdc/service/identity.rs similarity index 98% rename from src/domain/identity.rs rename to src/tdc/service/identity.rs index abb3b26..d0f4237 100644 --- a/src/domain/identity.rs +++ b/src/tdc/service/identity.rs @@ -14,11 +14,11 @@ use axum::response::{IntoResponse, Response}; use axum::Json; use serde_json::{json, Value}; -use crate::auth::Principal; -use crate::db::query_json_params; -use crate::envelope::{ActionResult, CODE_SERVER_ERROR}; -use crate::ids::next_id; -use crate::state::{AppState, BootstrapIdentity}; +use crate::platform::auth::Principal; +use crate::platform::db::query_json_params; +use crate::platform::envelope::{ActionResult, CODE_SERVER_ERROR}; +use crate::platform::ids::next_id; +use crate::platform::state::{AppState, BootstrapIdentity}; /// 冻结态(登录拒)。 pub const STATUS_FROZEN: &str = "FROZEN"; @@ -455,7 +455,7 @@ pub async fn capabilities(state: &AppState, identity_code: &str) -> Option> = OnceCell::const_new(); async fn shared_db() -> Arc { DB.get_or_init(|| async { let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - tdc_connector::db::ensure_schema(db.as_ref()) + tdc_connector::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); db @@ -63,7 +63,7 @@ async fn build(tag: &str) -> (Router, Arc) { let identity_id = format!("TEST-OP-{}", tag); { // 🔴 锁的持有者必须活过 `await` ⇒ 先把 `Arc` 绑到变量上(否则临时值当场析构)。 - let db_lock = tdc_connector::state::process_db_lock(); + let db_lock = tdc_connector::platform::state::process_db_lock(); let _g = db_lock.lock().await; db.exec(&format!( "INSERT INTO tdc_identity (f_id, f_identity_code, f_name) \ diff --git a/tests/api_smoke.rs b/tests/api_smoke.rs index 9507139..5ab6a3b 100644 --- a/tests/api_smoke.rs +++ b/tests/api_smoke.rs @@ -10,12 +10,12 @@ use axum::Router; use http_body_util::BodyExt; use pglite::PGlite; use serde_json::{json, Value}; -use tdc_connector::auth::{auth_middleware, AuthState}; -use tdc_connector::config::Config; -use tdc_connector::routes::build_router; -use tdc_connector::routes::mw::json_method_not_allowed; -use tdc_connector::session::SessionStore; -use tdc_connector::state::{AppState, BootstrapIdentity}; +use tdc_connector::platform::auth::{auth_middleware, AuthState}; +use tdc_connector::platform::config::Config; +use tdc_connector::tdc::controller::build_router; +use tdc_connector::platform::mw::json_method_not_allowed; +use tdc_connector::platform::session::SessionStore; +use tdc_connector::platform::state::{AppState, BootstrapIdentity}; use tokio::sync::OnceCell; use tower::ServiceExt; @@ -24,7 +24,7 @@ static DB: OnceCell> = OnceCell::const_new(); async fn shared_db() -> Arc { DB.get_or_init(|| async { let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - tdc_connector::db::ensure_schema(db.as_ref()) + tdc_connector::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); db @@ -189,7 +189,7 @@ async fn crud_routes_are_guarded_and_use_the_business_envelope() { async fn every_registry_entity_has_a_working_list_route() { let (app, token, _state) = build().await; let mut seen = 0usize; - for spec in tdc_connector::registry::REGISTRY { + for spec in tdc_connector::tdc::entity::ALL_SPECS { seen += 1; let (status, body) = call(&app, get(spec.path, Some(token.as_str()))).await; assert_eq!(status, 200, "{} 列表路由未挂上:{:?}", spec.api_name, body); @@ -610,7 +610,7 @@ async fn identity_secret_key_is_never_exposed_over_http() { // ④ 库里那一列仍是空(**只判空,不回显值** —— 免得把密钥写进 transcript) let stored = { let _g = state.db_lock.lock().await; - tdc_connector::db::query_scalar_text( + tdc_connector::platform::db::query_scalar_text( state.db.as_ref(), "SELECT f_secret_key FROM tdc_identity WHERE f_id = CAST($1 AS text)", &[&new_id], diff --git a/tests/auth_flow.rs b/tests/auth_flow.rs index eb3e52e..a23976c 100644 --- a/tests/auth_flow.rs +++ b/tests/auth_flow.rs @@ -10,12 +10,12 @@ use axum::extract::State; use axum::Router; use pglite::PGlite; use serde_json::{json, Value}; -use tdc_connector::auth::{auth_middleware, AuthState}; -use tdc_connector::config::Config; -use tdc_connector::domain::identity; -use tdc_connector::routes::build_router; -use tdc_connector::session::SessionStore; -use tdc_connector::state::{AppState, BootstrapIdentity}; +use tdc_connector::platform::auth::{auth_middleware, AuthState}; +use tdc_connector::platform::config::Config; +use tdc_connector::tdc::service::identity; +use tdc_connector::tdc::controller::build_router; +use tdc_connector::platform::session::SessionStore; +use tdc_connector::platform::state::{AppState, BootstrapIdentity}; use tokio::sync::{Mutex, OnceCell}; static DB: OnceCell> = OnceCell::const_new(); @@ -25,7 +25,7 @@ static SERIAL: Mutex<()> = Mutex::const_new(()); async fn shared_db() -> Arc { DB.get_or_init(|| async { let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - tdc_connector::db::ensure_schema(db.as_ref()) + tdc_connector::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); db diff --git a/tests/bootstrap_fail.rs b/tests/bootstrap_fail.rs index e20af03..dc4c081 100644 --- a/tests/bootstrap_fail.rs +++ b/tests/bootstrap_fail.rs @@ -6,15 +6,15 @@ use std::sync::Arc; use pglite::PGlite; -use tdc_connector::config::Config; -use tdc_connector::domain::identity::bootstrap_identity; -use tdc_connector::session::SessionStore; -use tdc_connector::state::{AppState, BootstrapIdentity}; +use tdc_connector::platform::config::Config; +use tdc_connector::tdc::service::identity::bootstrap_identity; +use tdc_connector::platform::session::SessionStore; +use tdc_connector::platform::state::{AppState, BootstrapIdentity}; #[tokio::test] async fn bootstrap_insert_failure_yields_no_secret() { let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - tdc_connector::db::ensure_schema(db.as_ref()) + tdc_connector::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); // 让 INSERT 必然失败:把目标表删掉 diff --git a/tests/crud_engine.rs b/tests/crud_engine.rs index 9e43f1c..67bf462 100644 --- a/tests/crud_engine.rs +++ b/tests/crud_engine.rs @@ -7,12 +7,12 @@ use std::sync::Arc; use pglite::PGlite; use serde_json::{json, Value}; -use tdc_connector::auth::Principal; -use tdc_connector::config::Config; -use tdc_connector::crud; -use tdc_connector::registry; -use tdc_connector::session::SessionStore; -use tdc_connector::state::{AppState, BootstrapIdentity}; +use tdc_connector::platform::auth::Principal; +use tdc_connector::platform::config::Config; +use tdc_connector::tdc::service::crud; +use tdc_connector::tdc::entity; +use tdc_connector::platform::session::SessionStore; +use tdc_connector::platform::state::{AppState, BootstrapIdentity}; use tokio::sync::OnceCell; static DB: OnceCell> = OnceCell::const_new(); @@ -26,11 +26,11 @@ static DB: OnceCell> = OnceCell::const_new(); static PRODUCT_LOCK: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(()); /// 数「当日同前缀」的行数(**含软删行** —— 与 Product/Resource 的基线口径一致:不带 `ALIVE`)。 -async fn count_today_products(state: &tdc_connector::state::AppState, pattern: &str) -> u64 { +async fn count_today_products(state: &tdc_connector::platform::state::AppState, pattern: &str) -> u64 { let sql = "SELECT count(*)::text FROM tdc_product WHERE f_product_code LIKE CAST($1 AS text)"; let raw = { let _g = state.db_lock.lock().await; - tdc_connector::db::query_scalar_text(state.db.as_ref(), sql, &[&pattern]) + tdc_connector::platform::db::query_scalar_text(state.db.as_ref(), sql, &[&pattern]) .await .expect("计数失败") }; @@ -40,7 +40,7 @@ async fn count_today_products(state: &tdc_connector::state::AppState, pattern: & async fn shared_db() -> Arc { DB.get_or_init(|| async { let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - tdc_connector::db::ensure_schema(db.as_ref()) + tdc_connector::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); db @@ -83,7 +83,7 @@ async fn body_of(resp: axum::response::Response) -> Value { async fn product_crud_roundtrip() { let state = test_state().await; let _p = PRODUCT_LOCK.lock().await; - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); // 新增 let resp = crud::create( @@ -168,14 +168,14 @@ async fn readonly_and_guarded_entities_reject_writes() { let state = test_state().await; // Dataset:派生态只读 - let spec = registry::find("Dataset").unwrap(); + let spec = entity::find("Dataset").unwrap(); let resp = crud::create(&state, spec, &json!({"name": "x"}), Some(&principal())).await; let body = body_of(resp).await; assert_eq!(body["code"], 400); assert_eq!(body["msg"], "数据集为只读视图,不支持新增/编辑/删除"); // DeliveryTask:直建入口已废弃 - let spec = registry::find("DeliveryTask").unwrap(); + let spec = entity::find("DeliveryTask").unwrap(); let resp = crud::create(&state, spec, &json!({"taskNo": "T-1"}), Some(&principal())).await; let body = body_of(resp).await; assert_eq!(body["code"], 400); @@ -185,7 +185,7 @@ async fn readonly_and_guarded_entities_reject_writes() { .starts_with("该入口已废弃:交付任务只能由发起方经平台发起")); // AuditLog:允许写,但不许改/删 - let spec = registry::find("AuditLog").unwrap(); + let spec = entity::find("AuditLog").unwrap(); let resp = crud::create( &state, spec, @@ -218,7 +218,7 @@ async fn readonly_and_guarded_entities_reject_writes() { #[tokio::test] async fn delivery_task_frozen_columns_cannot_be_changed() { let state = test_state().await; - let spec = registry::find("DeliveryTask").unwrap(); + let spec = entity::find("DeliveryTask").unwrap(); // 写入口被上游废弃 ⇒ 测试里直接插一行 { @@ -273,7 +273,7 @@ async fn delivery_task_frozen_columns_cannot_be_changed() { #[tokio::test] async fn resource_detail_aggregate_carries_field_rules_and_mask_rules() { let state = test_state().await; - let spec = registry::find("Resource").unwrap(); + let spec = entity::find("Resource").unwrap(); { let _g = state.db_lock.lock().await; @@ -347,8 +347,8 @@ async fn resource_detail_aggregate_carries_field_rules_and_mask_rules() { /// /// 返回 `(新记录 id, 字段值)` —— id 是 `create` 响应 `data` 里的**新记录 id**。 async fn create_and_read( - state: &tdc_connector::state::AppState, - spec: &'static tdc_connector::registry::TableSpec, + state: &tdc_connector::platform::state::AppState, + spec: &'static tdc_connector::tdc::entity::TableSpec, body: &Value, field: &str, principal: &Principal, @@ -384,7 +384,7 @@ fn seq_of(code: &str, prefix: &str) -> u64 { async fn product_code_is_generated_server_side() { let state = test_state().await; let _p = PRODUCT_LOCK.lock().await; - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); let (_id, code) = create_and_read( &state, @@ -414,7 +414,7 @@ async fn product_code_is_generated_server_side() { async fn explicit_product_code_is_not_overwritten() { let state = test_state().await; let _p = PRODUCT_LOCK.lock().await; - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); let (_id, code) = create_and_read( &state, spec, @@ -430,7 +430,7 @@ async fn explicit_product_code_is_not_overwritten() { #[tokio::test] async fn datasource_code_uses_the_six_char_tail_shape() { let state = test_state().await; - let spec = registry::find("Datasource").unwrap(); + let spec = entity::find("Datasource").unwrap(); let (_id, code) = create_and_read( &state, spec, @@ -453,7 +453,7 @@ async fn datasource_code_uses_the_six_char_tail_shape() { async fn missing_required_field_is_a_business_failure_not_a_500() { let state = test_state().await; let _p = PRODUCT_LOCK.lock().await; - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); // 不给 `name`(`f_name` NOT NULL 无 DEFAULT)⇒ 23502 let resp = crud::create(&state, spec, &json!({}), Some(&principal())).await; let body = body_of(resp).await; @@ -480,7 +480,7 @@ async fn missing_required_field_is_a_business_failure_not_a_500() { #[tokio::test] async fn audit_actor_comes_from_the_login_principal() { let state = test_state().await; - let spec = registry::find("AuditLog").unwrap(); + let spec = entity::find("AuditLog").unwrap(); // 本地账号 ⇒ USER / 账号 id / 账号名 let account = Principal::Account { @@ -532,7 +532,7 @@ async fn audit_actor_comes_from_the_login_principal() { #[tokio::test] async fn contract_delete_reports_missing_before_the_delete_guard() { let state = test_state().await; - let spec = registry::find("Contract").unwrap(); + let spec = entity::find("Contract").unwrap(); // 不存在的 id ⇒ 「记录不存在或已删除」(**先于**禁删守卫) let resp = crud::delete(&state, spec, "NO-SUCH-ID", Some(&principal())).await; @@ -569,7 +569,7 @@ async fn contract_delete_reports_missing_before_the_delete_guard() { /// 等于**上游原文**,且**逐实体不同** /// (上游 Product/Resource 重试 5 次、DataInterface/Datasource 重试 3 次;文案也各不相同)。 /// -/// ⚠️ **本用例只守「注册表常量」**(`registry::create_codes`),**不触引擎**。 +/// ⚠️ **本用例只守「注册表常量」**(`entity::create_codes`),**不触引擎**。 /// 引擎真的读了 `retries` / `fail_msg`(含「重试耗尽」分支)由 `src/crud.rs` 里的 /// **单元测试**守(`code_generation_gives_up_after_the_entity_specific_retries`, /// 它注入恒冲突候选 ⇒ 真的走到耗尽分支)。 @@ -592,7 +592,7 @@ async fn registry_declares_per_entity_code_retry_policy() { ), ]; for (api, retries, fail_msg) in expected { - let codes = registry::create_codes(api); + let codes = entity::create_codes(api); assert_eq!(codes.len(), 1, "{} 应恰好一个编码列", api); assert_eq!(codes[0].retries, retries, "{} 的重试次数", api); assert_eq!(codes[0].fail_msg, fail_msg, "{} 的失败文案", api); @@ -616,7 +616,7 @@ async fn registry_declares_per_entity_code_retry_policy() { async fn product_code_sequence_starts_at_baseline_plus_one() { let state = test_state().await; let _p = PRODUCT_LOCK.lock().await; - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); let (_id1, code1) = create_and_read( &state, @@ -667,7 +667,7 @@ async fn new_rows_carry_the_upstream_creation_defaults() { let _p = PRODUCT_LOCK.lock().await; // Product:默认 DISABLED - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); let (_id, status) = create_and_read( &state, spec, @@ -679,7 +679,7 @@ async fn new_rows_carry_the_upstream_creation_defaults() { assert_eq!(status, "DISABLED", "Product 新建默认未上架"); // Resource:默认 DISABLED + UNMOUNTED - let spec = registry::find("Resource").unwrap(); + let spec = entity::find("Resource").unwrap(); let (_id, status) = create_and_read( &state, spec, @@ -700,7 +700,7 @@ async fn new_rows_carry_the_upstream_creation_defaults() { assert_eq!(mount, "UNMOUNTED", "Resource 新建默认未挂载"); // Datasource:默认 UNTESTED - let spec = registry::find("Datasource").unwrap(); + let spec = entity::find("Datasource").unwrap(); let (_id, test_status) = create_and_read( &state, spec, @@ -717,7 +717,7 @@ async fn new_rows_carry_the_upstream_creation_defaults() { async fn creator_user_id_records_the_operator_id_not_the_account_name() { let state = test_state().await; let _p = PRODUCT_LOCK.lock().await; - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); let account = Principal::Account { account_id: "U-9".to_string(), account: "李四".to_string(), @@ -741,7 +741,7 @@ async fn creator_user_id_records_the_operator_id_not_the_account_name() { #[tokio::test] async fn explicit_null_does_not_suppress_the_server_side_default() { let state = test_state().await; - let spec = registry::find("AuditLog").unwrap(); + let spec = entity::find("AuditLog").unwrap(); // 无 operator 的内部令牌 ⇒ actor 推导不出来 ⇒ 走 `create_defaults` 的兜底 let internal = Principal::Internal { operator: None }; let (_id, actor_type) = create_and_read( @@ -766,7 +766,7 @@ async fn explicit_null_does_not_suppress_the_server_side_default() { #[tokio::test] async fn data_interface_baseline_ignores_soft_deleted_rows() { let state = test_state().await; - let spec = registry::find("DataInterface").unwrap(); + let spec = entity::find("DataInterface").unwrap(); let (id1, code1) = create_and_read( &state, @@ -805,7 +805,7 @@ async fn data_interface_baseline_ignores_soft_deleted_rows() { async fn internal_errors_do_not_echo_the_database_message() { let state = test_state().await; let _p = PRODUCT_LOCK.lock().await; - let spec = registry::find("Product").unwrap(); + let spec = entity::find("Product").unwrap(); let resp = crud::create( &state, spec, @@ -833,7 +833,7 @@ async fn internal_errors_do_not_echo_the_database_message() { #[tokio::test] async fn json_ignored_fields_are_neither_exposed_nor_writable() { let state = test_state().await; - let spec = registry::find("Identity").unwrap(); + let spec = entity::find("Identity").unwrap(); // 读库里那一列(**只判空,不回显值** —— 免得把密钥写进 transcript)。 let read_secret = |id: &str| { @@ -842,7 +842,7 @@ async fn json_ignored_fields_are_neither_exposed_nor_writable() { async move { let sql = "SELECT f_secret_key FROM tdc_identity WHERE f_id = CAST($1 AS text)"; let _g = state.db_lock.lock().await; - tdc_connector::db::query_scalar_text(state.db.as_ref(), sql, &[&id]) + tdc_connector::platform::db::query_scalar_text(state.db.as_ref(), sql, &[&id]) .await .expect("查询失败") } diff --git a/tests/permission_gate.rs b/tests/permission_gate.rs index ca01b7a..d69b80c 100644 --- a/tests/permission_gate.rs +++ b/tests/permission_gate.rs @@ -6,13 +6,13 @@ use std::sync::Arc; use axum::http::StatusCode; use pglite::PGlite; -use tdc_connector::auth::Principal; -use tdc_connector::config::Config; -use tdc_connector::crud::require_write_permission; -use tdc_connector::domain::identity; -use tdc_connector::registry; -use tdc_connector::session::SessionStore; -use tdc_connector::state::{AppState, BootstrapIdentity}; +use tdc_connector::platform::auth::Principal; +use tdc_connector::platform::config::Config; +use tdc_connector::tdc::service::crud::require_write_permission; +use tdc_connector::tdc::service::identity; +use tdc_connector::tdc::entity; +use tdc_connector::platform::session::SessionStore; +use tdc_connector::platform::state::{AppState, BootstrapIdentity}; use tokio::sync::OnceCell; static DB: OnceCell> = OnceCell::const_new(); @@ -20,7 +20,7 @@ static DB: OnceCell> = OnceCell::const_new(); async fn shared_db() -> Arc { DB.get_or_init(|| async { let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - tdc_connector::db::ensure_schema(db.as_ref()) + tdc_connector::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); db @@ -74,7 +74,7 @@ async fn missing_capability_fails_open() { let caps = identity::capabilities(&state, "NO-CAP").await; assert!(caps.is_none(), "空能力集应解析为 None(⇒ fail-open)"); - let spec = registry::find("Product").expect("Product 应在注册表里"); + let spec = entity::find("Product").expect("Product 应在注册表里"); let r = require_write_permission(&state, spec, Some(&session("NO-CAP"))).await; assert!(r.is_ok(), "能力集解析不出时必须 fail-open 放行"); } @@ -87,7 +87,7 @@ async fn parsed_capability_is_enforced_on_write() { let caps = identity::capabilities(&state, "ONLY-PRODUCT").await; assert_eq!(caps, Some(vec!["product".to_string()])); - let product = registry::find("Product").expect("Product 应在注册表里"); + let product = entity::find("Product").expect("Product 应在注册表里"); assert!( require_write_permission(&state, product, Some(&session("ONLY-PRODUCT"))) .await @@ -95,7 +95,7 @@ async fn parsed_capability_is_enforced_on_write() { "命中权限键应放行" ); - let contract = registry::find("Contract").expect("Contract 应在注册表里"); + let contract = entity::find("Contract").expect("Contract 应在注册表里"); assert!( require_write_permission(&state, contract, Some(&session("ONLY-PRODUCT"))) .await @@ -108,7 +108,7 @@ async fn parsed_capability_is_enforced_on_write() { async fn wildcard_capability_allows_everything() { upsert_identity("ROOT", Some("*")).await; let state = test_state().await; - let spec = registry::find("Contract").expect("Contract 应在注册表里"); + let spec = entity::find("Contract").expect("Contract 应在注册表里"); assert!( require_write_permission(&state, spec, Some(&session("ROOT"))) .await @@ -120,7 +120,7 @@ async fn wildcard_capability_allows_everything() { #[tokio::test] async fn internal_principal_bypasses_the_gate() { let state = test_state().await; - let spec = registry::find("Contract").expect("Contract 应在注册表里"); + let spec = entity::find("Contract").expect("Contract 应在注册表里"); assert!( require_write_permission(&state, spec, Some(&Principal::Internal { operator: None })) .await @@ -145,23 +145,23 @@ async fn crud_write_paths_enforce_the_permission_key() { // 复用别的用例的 `f_identity_code` 会撞主键。 upsert_identity("CAP-PRODUCT-ONLY", Some("product")).await; let state = test_state().await; - let contract = registry::find("Contract").expect("Contract 应在注册表里"); + let contract = entity::find("Contract").expect("Contract 应在注册表里"); let p = session("CAP-PRODUCT-ONLY"); let body = serde_json::json!({}); - let r = tdc_connector::crud::create(&state, contract, &body, Some(&p)).await; + let r = tdc_connector::tdc::service::crud::create(&state, contract, &body, Some(&p)).await; assert_eq!( r.status(), StatusCode::FORBIDDEN, "create 未命中权限键必须 403" ); - let r = tdc_connector::crud::update(&state, contract, "NOT-EXIST", &body, Some(&p)).await; + let r = tdc_connector::tdc::service::crud::update(&state, contract, "NOT-EXIST", &body, Some(&p)).await; assert_eq!( r.status(), StatusCode::FORBIDDEN, "update 未命中权限键必须 403" ); - let r = tdc_connector::crud::delete(&state, contract, "NOT-EXIST", Some(&p)).await; + let r = tdc_connector::tdc::service::crud::delete(&state, contract, "NOT-EXIST", Some(&p)).await; assert_eq!( r.status(), StatusCode::FORBIDDEN, diff --git a/tests/spa_fallback.rs b/tests/spa_fallback.rs index 277b042..3eb1743 100644 --- a/tests/spa_fallback.rs +++ b/tests/spa_fallback.rs @@ -11,7 +11,7 @@ use axum::http::{header, Request, StatusCode}; use http_body_util::BodyExt; use tower::ServiceExt; -use tdc_connector::routes::fallback::spa_fallback; +use tdc_connector::platform::fallback::spa_fallback; /// 仓库里的 `static/`(SPA 构建产物)。 fn static_dir() -> PathBuf { diff --git a/tests/tds_biz.rs b/tests/tds_biz.rs index 16e67cd..4ef49fe 100644 --- a/tests/tds_biz.rs +++ b/tests/tds_biz.rs @@ -20,13 +20,13 @@ use axum::Router; use http_body_util::BodyExt; use pglite::PGlite; use serde_json::{json, Value}; -use tdc_connector::auth::{auth_middleware, AuthState}; -use tdc_connector::config::Config; -use tdc_connector::routes::build_router; -use tdc_connector::routes::mw::json_method_not_allowed; -use tdc_connector::session::SessionStore; -use tdc_connector::state::{AppState, BootstrapIdentity}; -use tdc_connector::tds::TdsClient; +use tdc_connector::platform::auth::{auth_middleware, AuthState}; +use tdc_connector::platform::config::Config; +use tdc_connector::tdc::controller::build_router; +use tdc_connector::platform::mw::json_method_not_allowed; +use tdc_connector::platform::session::SessionStore; +use tdc_connector::platform::state::{AppState, BootstrapIdentity}; +use tdc_connector::tdc::client::tds::TdsClient; use tokio::sync::OnceCell; use tower::ServiceExt; @@ -155,7 +155,7 @@ static DB: OnceCell> = OnceCell::const_new(); async fn shared_db() -> Arc { DB.get_or_init(|| async { let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败")); - tdc_connector::db::ensure_schema(db.as_ref()) + tdc_connector::platform::db::ensure_schema(db.as_ref()) .await .expect("建表失败"); // 建一条带 TDS 绑定的默认身份(目录查询要 `f_tds_space_id`,账单要 `f_tds_connector_id`)。 @@ -450,7 +450,7 @@ async fn billing_list_unwraps_the_envelope_and_local_compare_reads_only_the_loca let sql = "INSERT INTO tdc_api_consume_log \ (f_id, f_app_id, f_contract_id, f_call_time, f_status, f_rows) \ VALUES ('LOG-LC-1','APP-1','CONTRACT-LC', now(), 'OK', 7)"; - let lock = tdc_connector::state::process_db_lock(); + let lock = tdc_connector::platform::state::process_db_lock(); let _g = lock.lock().await; db.exec(sql).await.expect("插入本地计量失败"); }