From ba8883dfb0ec1a217743a28b30e55d3df90ea051 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 31 Oct 2026 22:16:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(face-b):=20=E5=BA=94=E7=94=A8=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20/=20=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=20/=20?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=90=BD=E5=9C=B0=EF=BC=88=E9=9D=A2=20B=20?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=203=EF=BC=8C+26=20=E7=AB=AF=E7=82=B9?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - schema:新增 base_system_top / base_sys_config / base_tag(DDL 逐字对齐官方 JNPF-PostgreSQL.sql),tables 23 → 26;ensure_schema 改为逐表探 to_regclass ⇒ 老库自动补后加的表(此前见到 base_user 就早退,新表永远不出现) - 应用中心(SystemController):列表/详情/增删改/复制/置顶/偏好 + 应用授权三件套, 列表返 ListVO 且 isTop 由 base_system_top 现场拼;删除守两道官方闸(主系统、 应用下还有 base_module);复制只复制应用行 ⇒ 记 partial - 系统配置(SysConfigController):键值表逐键 upsert,读回做数字/布尔还原; 库为空时给 39 键默认对象(前端 state.baseForm = res.data 后立刻读 .logCleanPeriod, data 不能是 null);企业微信/钉钉/第三方同步恒返 400 + 人话,不假装成功 - 标签(TagController):ListVO + selector(enCode 空 ⇒ 全部)+ CRUD,编码唯一 - 修 check-contract-scan.py 静默失效:面 B 文件已改名 face_b,尺子只认 jnpf ⇒ 整片面 B 的守卫检查没在跑(CC6 warning 从 20+ 降到 2) - 契约登记三处同步:[ENDPOINT] 26 行 / [OFFICIAL] 26 条(5 条 partial)/ B 146→177; 测试 495 → 499 --- CLAUDE.md | 4 +- HANDOFF.md | 41 +- PLAN.md | 2 +- crates/sspf-store/src/db.rs | 56 +- docs/contract.md | 64 +- scripts/check-contract-scan.py | 8 +- src/backend/db/schema.sql | 67 + src/backend/src/main.rs | 10 +- src/backend/src/platform/face_b.rs | 1662 ++++++++++++++++++++++++ src/backend/src/routes.rs | 111 +- src/backend/tests/batch3_it.rs | 346 +++++ src/backend/tests/schema_upgrade_it.rs | 44 + 12 files changed, 2390 insertions(+), 25 deletions(-) create mode 100644 src/backend/tests/batch3_it.rs create mode 100644 src/backend/tests/schema_upgrade_it.rs diff --git a/CLAUDE.md b/CLAUDE.md index f564f44..ebb7f3d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -222,7 +222,7 @@ ssw-platform/ 每把尺子结尾比对「实际断言数 vs 契约登记数」,对不上即失败 —— 尺子不会被悄悄改弱。 **加任何业务模块 / 改任何契约 / 加任何 crate 依赖 / 改任何内部标识 / 加任何表,十二道闸门必须全绿才算完成。** -🔴 **`cargo test --workspace` 当前 495 条**(内核 + contract 13 + store 17 + sdk 2 + pack-asset 5 + mcp 52 + adapter-baseline 19 + lowcode 112 + 集成测试)—— +🔴 **`cargo test --workspace` 当前 499 条**(内核 + contract 13 + store 17 + sdk 2 + pack-asset 5 + mcp 52 + adapter-baseline 19 + lowcode 112 + 集成测试)—— 拆 crate 后总数会变,**不许把断言数写死**,跑一遍看实际值。 cipher 自证(免 node):`./target/release/ssw-platform --enc 123456`。 @@ -276,7 +276,7 @@ cp .env.example .env && ./run.sh install && ./run.sh dev ```bash cargo build --release # 编译(workspace 根,含 crates/* 与 packs/*) -cargo test --workspace # 单测(当前 495 条) +cargo test --workspace # 单测(当前 499 条) bash run.sh dev # 起后端(30010) + 前端(5173) bash scripts/perm-smoke.sh # 面 A 43 条 bash scripts/perm-smoke-jnpf.sh # 面 B 23 条 diff --git a/HANDOFF.md b/HANDOFF.md index 69a56af..a5593d5 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -32,10 +32,15 @@ 🔴 **判断**:419 里约 **250 条属于「本仓没这个模块」**,真做也只是恒空 stub。 剩下的真价值集中在 `permission` 那 62 条。所以**下一轮按这个顺序做**: -1. `permission/Users/Current/*` 个人设置(14 条,个人中心要用) -2. `permission/Standing` / `PermissionGroup` / `Action`(15 条) -3. `system/System` + `system/SysConfig`(17 条,系统配置页) -4. 剩下的 `message`/`file`/`extend`/低代码模块 ⇒ **批量恒空 stub**(只为消红条,不建表) +1. `permission/Users/Current/*` 个人设置(14 条,个人中心要用)—— ✅ 批次 1(实际 23 条) +2. `permission/Standing` / `PermissionGroup` / `Action`(15 条)—— ✅ 批次 2(实际 21 条) +3. `system/System` + `system/SysConfig`(17 条,系统配置页)—— ✅ 批次 3(实际 25 条) +4. 剩下的 `message`/`file`/`extend`/低代码模块 ⇒ **批量恒空 stub**(只为消红条,不建表) ← **下一个** + +**2026-10-31 22:00 实测**(`python3 scripts/fe-gap.py`):合计 **172 / 900**(19.1%); +`permission` 111/137(81.0%)、`system` **41/196(20.9%,批次 3 从 17 涨到 41)**; +剩下体量最大的仍是 `workFlow`(104) / `onlineDev`(101) / `systemData`(91) / `aiCenter`(75) / +`extend`(64) / `msgCenter`(50) —— **基本都属于「本仓没这个模块」**。 --- @@ -59,7 +64,7 @@ - 机构管理 `/permission/organize` 也正常渲染(空状态,零报错)。 **第二波(04:00–05:00)又干了一批,现在数字是这样:** -- 契约端点 **176 条**(面 B **146** 条);`tables` 12 → **21**(新增 `base_group`、 +- 契约端点 **207 条**(面 B **177** 条);`tables` → **26**(新增 `base_group`、 `base_position`、`base_dictionary_type`、`base_dictionary_data`、`base_user_extra`、 `base_sign_img`、`base_standing`、`base_permission_group`、`base_action`)。 - 六闸全绿:`check-module 114` / `check-boundary 11` / `check-contract 10` / @@ -98,6 +103,26 @@ **反自证全部做过**:逐个把修复回退 ⇒ 测试精确复现原始报错(`cannot convert between String and _text` / `42P18` / 关联残留 n=1 / uuid 串)⇒ 恢复后 4 条全过。 +### 批次 3(2026-10-31 21:40–22:10)—— 应用中心 + 系统配置 + +**31 条面 B 端点**:`/api/system/System`(13:列表/详情/新建/改/删/复制/置顶/偏好/开发者授权×3/Selector/userAuthList) ++ `/api/system/SysConfig`(8:参数读写/第三方配置读写/管理员列表/设置/企业微信·钉钉连通性测试) ++ `/api/system/SynThirdInfo`(4:同步/统计/清空/失败清单) ++ `/api/system/Tag`(6:列表/详情/新建/改/删/selector —— 应用中心页一进来就拉 `selector?enCode=AppTags`)。 + +- 新表三张(官方 DDL 逐字):`base_system_top`(置顶按 `f_user_id + f_type` 记账)、 + `base_sys_config`(`f_category + f_key → f_value` 的键值表)、`base_tag`(标签)。 +- 🔴 **老库补表**:`Db::ensure_schema` 原先见到 `base_user` 就早退 ⇒ 后加的表在老库上 + **永远不存在**。现在会按 `schema.sql` 逐表探 `to_regclass`,缺哪张补哪张 + (DDL 仍以 `schema.sql` 为唯一真源,不另写迁移脚本);单独测试见 + `tests/schema_upgrade_it.rs`。 +- 🔴 **尺子自身的 bug 修了**:`check-contract-scan.py` 判面 B 守卫时只认模块名 + `jnpf` 与函数 `require_login_jnpf` —— 文件早已改名 `face_b.rs` / `require_login_face_b` + ⇒ 整片面 B 的 CC6 守卫检查**静默失效**(只打 warning)。两个名字都认之后恢复生效。 +- 复制应用**只复制应用行**(菜单/表单资源不复制)⇒ `[OFFICIAL]` 记 `partial`; + 应用授权的 `devUsers` 存 `f_user_id` 逗号串、不写 `base_authorize` ⇒ 也记 `partial`。 +- 企业微信/钉钉连通性测试**恒业务失败**(未接 SDK)—— 刻意不假装成功。 + ### 🔴 上一版说「页面从未渲染过一次」——**这个未知已经消除**。 ### 🔴 上一批(第一批)踩到并解决的 4 个真 bug @@ -246,8 +271,10 @@ xop run --secret GU=git_local_user --secret GP=git_local_pass -- bash -c ' ✅ **批次 1 做完(实际 23 条)**——新表 `base_user_extra` / `base_sign_img` 2. ~~`permission/Standing`(6) / `PermissionGroup`(6) / `Action`(3)~~ ✅ **批次 2 做完(实际 21 条)**——新表 `base_standing` / `base_permission_group` / `base_action` -3. `system/System`(11) + `system/SysConfig`(6) 系统配置页 ← **下一个** -4. `message`(53) / `file`(32) / `extend`(53) / 低代码模块 ⇒ **批量恒空 stub** +3. ~~`system/System`(11) + `system/SysConfig`(6) 系统配置页~~ ← **下一个** + ✅ **批次 3 做完(实际 31 条,含 Tag)**——新表 `base_system_top` / `base_sys_config`; + 应用中心 CRUD + 置顶 + 应用授权 + 系统参数/第三方配置键值表 + 管理员设置 + 同步统计。 +4. `message`(53) / `file`(32) / `extend`(53) / 低代码模块 ⇒ **批量恒空 stub** ← **下一个** **实现模板(照抄就行)**:`ORGANIZE_WRITE_FIELDS` / `POSITION_WRITE_FIELDS` 那一套 —— 列白名单 + `now()` 不占参数位 + 只 SET body 里出现的键 + 读回不选 `f_password`。 diff --git a/PLAN.md b/PLAN.md index f4393cc..3e62179 100644 --- a/PLAN.md +++ b/PLAN.md @@ -251,7 +251,7 @@ ssw-platform/ | 能力 | 现状 | 目标 | 差距 | |---|---|---|---| -| 面 B 契约端点 | ✅ 147 条 | 全量(含 lowcode/flow/file/message) | 补 ~250 条(多在 lowcode 域) | +| 面 B 契约端点 | ✅ 177 条 | 全量(含 lowcode/flow/file/message) | 补 ~250 条(多在 lowcode 域) | | `base_*` DDL | ✅ 21 张逐字对齐 | 全量 331 张中的必需集 | 按域补 | | 平台/业务分层 | ✅ `check-boundary.sh` 钉住 | 升级为 crate 级隔离 | **P0 已拆 contract / store / sdk;asset 包可独立编译;`jnpf.rs`→`face_b.rs`** | | 低代码元数据引擎 | ✅ **P2-b 完成**:解析 + 校验 + 建表 + 动态 CRUD(6 个工具) | visualdev 同构 + 动态 CRUD + 发布 | 读 release / 单据号 / 乐观锁 → P2-c | diff --git a/crates/sspf-store/src/db.rs b/crates/sspf-store/src/db.rs index fa66117..e10fd74 100644 --- a/crates/sspf-store/src/db.rs +++ b/crates/sspf-store/src/db.rs @@ -105,7 +105,9 @@ impl Db { .scalar_text_inner("SELECT to_regclass('public.base_user')::text") .await?; if existing.is_some() { - return Ok(()); + // 🔴 老库:`schema.sql` 后加的表不会自动出现(早期实现见到 `base_user` 就早退) + // ⇒ 每次启动都补齐缺失的表(幂等,见 `ensure_missing_tables_inner`)。 + return self.ensure_missing_tables_inner().await; } for stmt in split_sql_statements(SCHEMA_SQL) { self.pg.exec(&stmt).await?; @@ -113,6 +115,42 @@ impl Db { Ok(()) } + /// 老库补齐:**只建缺失的表**。 + /// + /// 判据与 DDL 都来自 [`SCHEMA_SQL`](唯一真源):逐条 `CREATE TABLE ` 探 + /// `to_regclass`,缺哪张就把该语句改写成 `CREATE TABLE IF NOT EXISTS` 后执行 + /// ⇒ 不需要单独的迁移脚本,也不会重复建表。 + /// + /// 🔴 只补**表**,不补索引:本仓后加的表都不带索引;将来给老表加索引要另走迁移。 + async fn ensure_missing_tables_inner(&self) -> Result<(), pglite::Error> { + let mut missing: Vec = Vec::new(); + for table in ddl_tables() { + let probe = format!("SELECT to_regclass('public.{table}')::text"); + if self.scalar_text_inner(&probe).await?.is_none() { + missing.push(table); + } + } + if missing.is_empty() { + return Ok(()); + } + for stmt in split_sql_statements(SCHEMA_SQL) { + let t = stmt.trim_start(); + let Some(rest) = t.strip_prefix("CREATE TABLE ") else { + continue; + }; + let name: String = rest + .chars() + .take_while(|c| c.is_ascii_alphanumeric() || *c == '_') + .collect(); + if !missing.iter().any(|m| m == &name) { + continue; + } + let ddl = t.replacen("CREATE TABLE ", "CREATE TABLE IF NOT EXISTS ", 1); + self.pg.exec(&ddl).await?; + } + Ok(()) + } + /// 查一批行 ⇒ JSON 数组(每行一个对象)。 /// /// 🔴 调用方给的 SQL **必须自带 `AS ` 别名** —— @@ -1165,30 +1203,31 @@ mod tests { #[test] fn schema_sql_has_expected_table_count() { - // schema.sql 必须包含 23 张表的 CREATE TABLE - // (19 张 base_*:8 张官方 + base_system + base_group + base_position + // schema.sql 必须包含 26 张表的 CREATE TABLE + // (21 张 base_*:8 张官方 + base_system + base_group + base_position // + 字典分类/字典数据 + base_sign_img + base_user_extra // + base_standing + base_permission_group + base_action + // + base_system_top + base_sys_config(应用中心/系统配置)+ base_tag(标签) // + base_visual_dev / base_visual_release(P2 低代码),+ 4 张业务表)。 // // 🔴 这个数字**故意写死**:加表必须同时改这里与 main.rs 的 BASE_TABLES, // 两处都改才算登记完成(漏一处就是「孤儿 DDL」或「白名单多一项」)。 let count = SCHEMA_SQL.matches("CREATE TABLE ").count(); - assert_eq!(count, 23, "schema.sql 的 CREATE TABLE 数量应为 23"); + assert_eq!(count, 26, "schema.sql 的 CREATE TABLE 数量应为 26"); } /// 🔴 [`ddl_tables`] 的解析必须与上面那条计数一致(不能只数到 12 却解析出别的)。 #[test] fn ddl_tables_parses_every_create_table() { let tables = ddl_tables(); - assert_eq!(tables.len(), 23, "ddl_tables 应解析出 23 张表"); + assert_eq!(tables.len(), 26, "ddl_tables 应解析出 26 张表"); assert!(tables.iter().all(|t| !t.is_empty())); assert_eq!( tables.iter().collect::>().len(), - 23, + 26, "表名不许重复" ); - // 8 张 base_* 必须都在(业务表由业务层 spec 派生,不在本文件写死)。 + // 基础 base_* 必须都在(业务表由业务层 spec 派生,不在本文件写死)。 for base in [ "base_user", "base_role", @@ -1198,6 +1237,9 @@ mod tests { "base_role_relation", "base_user_relation", "base_system", + "base_system_top", + "base_sys_config", + "base_tag", ] { assert!( tables.iter().any(|t| t == base), diff --git a/docs/contract.md b/docs/contract.md index 151f3d7..cad0136 100644 --- a/docs/contract.md +++ b/docs/contract.md @@ -1177,6 +1177,37 @@ B POST /api/permission/Users/SetPositionBatch permission.user platform B POST /api/permission/Users/workHandover permission.user platform B GET /api/permission/Users/{id}/SelectorByUserPosId permission.user platform B GET /api/system/System/getDevUser permission.user platform +B GET /api/system/System 登录 platform +B POST /api/system/System appCenter platform +B GET /api/system/System/Selector 登录 platform +B GET /api/system/System/userAuthList 登录 platform +B POST /api/system/System/actionTop 登录 platform +B GET /api/system/System/getAppAuthorization/{id} 登录 platform +B POST /api/system/System/saveAppAuthorization appConfig.baseConfig platform +B POST /api/system/System/changeAppAuthorization appConfig.baseConfig platform +B GET /api/system/System/{id} 登录 platform +B PUT /api/system/System/{id} appConfig.baseConfig platform +B DELETE /api/system/System/{id} appCenter platform +B POST /api/system/System/{id}/Actions/Copy appCenter platform +B POST /api/system/System/preferenceSave/{id} appConfig.baseConfig platform +B GET /api/system/SysConfig sysConfig.parameter platform +B PUT /api/system/SysConfig sysConfig.parameter platform +B GET /api/system/SysConfig/socials sysConfig.parameter platform +B PUT /api/system/SysConfig/socials sysConfig.parameter platform +B GET /api/system/SysConfig/getAdminList sysConfig.parameter platform +B PUT /api/system/SysConfig/setAdminList sysConfig.parameter platform +B POST /api/system/SysConfig/{type}/testQyWebChatConnect sysConfig.parameter platform +B POST /api/system/SysConfig/testDingTalkConnect sysConfig.parameter platform +B GET /api/system/Tag 登录 platform +B POST /api/system/Tag 登录 platform +B GET /api/system/Tag/selector 登录 platform +B GET /api/system/Tag/{id} 登录 platform +B PUT /api/system/Tag/{id} 登录 platform +B DELETE /api/system/Tag/{id} 登录 platform +B POST /api/system/SynThirdInfo sysConfig.parameter platform +B GET /api/system/SynThirdInfo/getSynThirdTotal/{type} sysConfig.parameter platform +B GET /api/system/SynThirdInfo/clearAllSyn sysConfig.parameter platform +B GET /api/system/SynThirdInfo/getHandleNum sysConfig.parameter platform B DELETE /api/permission/socials/{id} permission.user platform B GET /api/system/DictionaryData/All 登录 platform B GET /api/system/HomeData 登录 platform @@ -1317,7 +1348,7 @@ A DELETE /api/ssw/asset/DataResource/Delete asset/DataResource asset [FACE] # face 条数 说明 A 28 面 A 专属(+ 2 条共用 ⇒ 面 A 合计 30 条) -B 146 面 B 专属(官方 JNPF 形状) +B 177 面 B 专属(官方 JNPF 形状) AB 2 两面共用(CurrentUser / Authority Data —— 按判别头分流) [OFFICIAL] @@ -1370,6 +1401,37 @@ POST /api/permission/Users/SetPositionBatch implemented user.ts:105 面 B 已落 POST /api/permission/Users/workHandover implemented user.ts:85 面 B 已落地:置 `f_handover_mark=1`;工作流/流程任务不迁 ⇒ 只落能落的部分 GET /api/permission/Users/{id}/SelectorByUserPosId implemented user.ts:93 面 B 已落地:同 `f_position_id` 的其它用户(ListVO) GET /api/system/System/getDevUser implemented system.ts:53 面 B 已落地:`QueryUserSelect` 的 `:api` ⇒ ListVO;无「开发者」列 ⇒ 退化为全体用户(管理员优先) +GET /api/system/System implemented SystemController.java:153 面 B 已落地:ListVO;`filterMain` 默认排除主系统,`type` 1/2/3 已按创建者/授权过滤 +POST /api/system/System implemented SystemController.java:318 面 B 已落地:`enCode` 唯一校验,`enCode` 为空时服务端生成;返回 `data=enCode`(官方行为) +GET /api/system/System/Selector implemented SystemController.java:430 面 B 已落地:裸数组,排除主系统;`keyword` 过滤 +GET /api/system/System/userAuthList implemented SystemController.java:415 面 B 已落地:裸数组;管理员=全部,普通用户按 `f_user_id`/`f_authorize_id` 过滤 +POST /api/system/System/actionTop implemented SystemController.java:445 面 B 已落地:按 `f_user_id + f_type + f_object_id` 记账(base_system_top),取消置顶走软删 +GET /api/system/System/getAppAuthorization/{id} partial SystemController.java:179 面 B 已落地:AppAuthorizeVo 形状(isAllDevUser/fullName/createUserId/devUsers);devUsers 来自 `f_user_id` 逗号串,不读 base_authorize +POST /api/system/System/saveAppAuthorization partial SystemController.java:235 面 B 已落地:只落 `f_user_id`(逗号串);不写 base_authorize 关系(本仓无应用级授权表) +POST /api/system/System/changeAppAuthorization partial SystemController.java:243 面 B 已落地:`changeAppAuthorization` = 改 `f_creator_user_id` + `f_user_id` +GET /api/system/System/{id} implemented SystemController.java:291 面 B 已落地:SystemVO 13 字段 +PUT /api/system/System/{id} implemented SystemController.java:332 面 B 已落地:只 SET body 出现的键;`f_is_main` 不可改 +DELETE /api/system/System/{id} implemented SystemController.java:355 面 B 已落地:主系统禁删、有菜单的应用禁删(官方 SYS040),软删 +POST /api/system/System/{id}/Actions/Copy partial SystemController.java:603 面 B 已落地:复制应用行(新 id + `{编码}_copy`);菜单/表单等资源不复制(官方 importCopy 会连 visualdev/portal/report 一起复制) +POST /api/system/System/preferenceSave/{id} implemented SystemController.java:304 面 B 已落地:只写 `f_preference_json` +GET /api/system/SysConfig implemented SysConfigController.java:87 面 B 已落地:`base_sys_config`(category=SysConfig)键值行拼回对象,库为空时给完整默认值(前端直接 `.logCleanPeriod` ⇒ 不能返 null) +PUT /api/system/SysConfig implemented SysConfigController.java:108 面 B 已落地:逐键 upsert;数字/布尔按文本存、读回时还原类型 +GET /api/system/SysConfig/socials implemented SysConfigController.java:152 面 B 已落地:category=SocialsConfig,默认值 ∪ 库值 +PUT /api/system/SysConfig/socials implemented SysConfigController.java:177 面 B 已落地:逐键 upsert +GET /api/system/SysConfig/getAdminList implemented SysConfigController.java:274 面 B 已落地:`f_is_administrator=1` 的用户,UserAdminVO = id/account/realName +PUT /api/system/SysConfig/setAdminList implemented SysConfigController.java:288 面 B 已落地:`adminIds` 追加为超级管理员(不清除既有) +POST /api/system/SysConfig/{type}/testQyWebChatConnect implemented SysConfigController.java:227 面 B 已落地:未接企业微信 SDK ⇒ 恒 `400` + 人话(不假装成功) +POST /api/system/SysConfig/testDingTalkConnect implemented SysConfigController.java:254 面 B 已落地:未接钉钉 SDK ⇒ 恒 `400` + 人话 +POST /api/system/SynThirdInfo partial SynThirdInfoController.java:243 面 B 已落地:未启用第三方同步 ⇒ 恒 `400`;不写同步记录 +GET /api/system/SynThirdInfo/getSynThirdTotal/{type} implemented SynThirdInfoController.java:165 面 B 已落地:SynThirdTotal 两条(组织/用户),统计恒零 +GET /api/system/SynThirdInfo/clearAllSyn implemented SynThirdInfoController.java:230 面 B 已落地:无同步记录可清 ⇒ 恒成功 +GET /api/system/SynThirdInfo/getHandleNum implemented SynThirdInfoController.java:192 面 B 已落地:PageListVO,恒空列表 +GET /api/system/Tag implemented TagController.java:56 面 B 已落地:ListVO(无 pagination);支持 `keyword` 过滤 +POST /api/system/Tag implemented TagController.java:66 面 B 已落地:名称/编码唯一校验,`f_type` 强制 1(自定义) +GET /api/system/Tag/selector implemented TagController.java:116 面 B 已落地:`enCode` 为空 ⇒ 全部;应用中心页启动即调(404 会闪红条) +GET /api/system/Tag/{id} implemented TagController.java:109 面 B 已落地:详情 +PUT /api/system/Tag/{id} implemented TagController.java:84 面 B 已落地:只 SET body 出现的键;名称判重 +DELETE /api/system/Tag/{id} implemented TagController.java:102 面 B 已落地:软删 DELETE /api/permission/socials/{id} implemented socialsUser.ts:21 面 B 已落地:本仓无 `base_socials_users` 表 ⇒ 无绑可解,恒成功(只返 msg) GET /api/system/DictionaryData/All implemented dictionary.ts:38-40 面 B 已落地:恒 `{list:[]}`(无 base_dictionary 表);前端 `store/base.ts:48` 取 `res.data.list` ⇒ 不能是裸数组 GET /api/system/HomeData implemented homeData.ts:8 面 B 已落地:恒 `[]`(前端 `dashboard/index.vue:104` 读 `res.data.length` ⇒ 必须是数组) diff --git a/scripts/check-contract-scan.py b/scripts/check-contract-scan.py index 3695b87..3c2f471 100644 --- a/scripts/check-contract-scan.py +++ b/scripts/check-contract-scan.py @@ -215,7 +215,7 @@ def resolve_const(orig, masked, name): def guard_of_platform(plat_files, mod, fn): """平台层 handler 的守卫 ⇒ 菜单 key / 点权限编码 / 登录 / 无;推不出 ⇒ None。 - `plat_files` = {"sys": (orig, masked), "jnpf": (orig, masked), ...} + `plat_files` = {"sys": (orig, masked), "face_b": (orig, masked), ...} """ if mod == "auth" and fn == "login_handler": return "无" @@ -247,11 +247,13 @@ def guard_of_platform(plat_files, mod, fn): if re.search(r"require_login(_any)?\s*\(", body): return "登录" return None - if mod == "jnpf": + # 🔴 面 B 的实现文件 2026-10-26 从 `jnpf.rs` 改名为 `face_b.rs` + # ⇒ 这里**两个名字都认**(只认旧名会让整片面 B 的守卫检查静默失效)。 + if mod in ("jnpf", "face_b"): m = re.search(r"guard\(\s*&state\s*,\s*&headers\s*,\s*([A-Z_][A-Z0-9_]*)\s*\)", body) if m: return resolve_const(orig, masked, m.group(1)) - if re.search(r"require_login_jnpf\s*\(", body): + if re.search(r"require_login_(jnpf|face_b)\s*\(", body): return "登录" return None return None diff --git a/src/backend/db/schema.sql b/src/backend/db/schema.sql index 2d28a8f..81f9aca 100644 --- a/src/backend/db/schema.sql +++ b/src/backend/db/schema.sql @@ -452,6 +452,73 @@ CREATE TABLE base_system ( PRIMARY KEY (f_id, f_tenant_id) ); +-- 应用置顶(应用中心的「置顶」按钮)—— 列与官方 JNPF 7.0 逐字一致 +-- (官方 database/PostgreSQL/JNPF-PostgreSQL.sql 第 4327 行,`base_system_top`)。 +-- 🔴 置顶是**按用户 + 类型**记的(`f_user_id` + `f_type`),不是全局一个标记。 +CREATE TABLE base_system_top ( + f_id VARCHAR(50) NOT NULL, + f_user_id VARCHAR(50), + f_stand_id VARCHAR(50), + f_object_id VARCHAR(50), + f_type VARCHAR(50), + f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_creator_user_id VARCHAR(50), + f_last_modify_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_last_modify_user_id VARCHAR(50), + f_delete_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_delete_user_id VARCHAR(50), + f_delete_mark INTEGER, + f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); + +-- 系统配置(键值表)—— 列与官方 JNPF 7.0 逐字一致 +-- (官方 database/PostgreSQL/JNPF-PostgreSQL.sql 第 4145 行,`base_sys_config`)。 +-- 🔴 官方把 SysConfigModel 的**每个字段**拆成一行(f_key = 字段名,f_value = 值), +-- 分类用 `f_category`(系统参数 = `SysConfig`,第三方同步 = `SocialsConfig`)。 +CREATE TABLE base_sys_config ( + f_id VARCHAR(50) NOT NULL, + f_full_name VARCHAR(50), + f_key VARCHAR(50), + f_value TEXT, + f_category VARCHAR(50), + f_sort_code BIGINT, + f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_creator_user_id VARCHAR(50), + f_last_modify_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_last_modify_user_id VARCHAR(50), + f_delete_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_delete_user_id VARCHAR(50), + f_delete_mark INTEGER, + f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); + +-- 标签(应用中心的「标签」页签、流程/表单的多处标签)—— 列与官方 JNPF 7.0 逐字一致 +-- (官方 database/PostgreSQL/JNPF-PostgreSQL.sql 第 4358 行,`base_tag`)。 +-- 🔴 官方 `f_type` 常量 1 = 自定义(`TagController.addTag` 里强制写 1)。 +CREATE TABLE base_tag ( + f_id VARCHAR(50) NOT NULL, + f_full_name VARCHAR(200), + f_type INTEGER, + f_parent_id VARCHAR(255), + f_icon VARCHAR(255), + f_enabled_mark INTEGER, + f_sort_code BIGINT, + f_description VARCHAR(500), + f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_creator_user_id VARCHAR(50), + f_last_modify_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_last_modify_user_id VARCHAR(50), + f_delete_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_delete_user_id VARCHAR(50), + f_delete_mark INTEGER, + f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + f_en_code VARCHAR(255), + f_background_color VARCHAR(255), + PRIMARY KEY (f_id, f_tenant_id) +); + -- ============================================================================ -- 业务表 3 张(demo_item / shop_product / book_shop_book) -- diff --git a/src/backend/src/main.rs b/src/backend/src/main.rs index e9b75f5..89e5d62 100644 --- a/src/backend/src/main.rs +++ b/src/backend/src/main.rs @@ -42,8 +42,9 @@ use ssw_platform::routes; /// /// 多应用 MVP 新增了平台表 `base_system`(`SystemEntity` 注册表, /// 承载 `App-Code` → `systemId` 的映射);P2 低代码新增 `base_visual_dev` / -/// `base_visual_release`(功能定义与发布快照),故清单现在是 **19 张**。 -const BASE_TABLES: [&str; 19] = [ +/// `base_visual_release`(功能定义与发布快照);应用中心/系统配置批次新增 +/// `base_system_top` / `base_sys_config` / `base_tag`,故清单现在是 **22 张**。 +const BASE_TABLES: [&str; 22] = [ "base_group", "base_user", "base_role", @@ -61,6 +62,11 @@ const BASE_TABLES: [&str; 19] = [ "base_standing", "base_permission_group", "base_action", + // 🔴 应用中心 / 系统配置(2026-10-31 批次):置顶表 + 键值配置表, + // 都是**官方 DDL 逐字**的平台表。 + "base_system_top", + "base_sys_config", + "base_tag", // 🔴 低代码两张表是**平台表**不是业务表:它们存的是「功能定义」, // 任何业务模块都会用,属于引擎基础设施。 "base_visual_dev", diff --git a/src/backend/src/platform/face_b.rs b/src/backend/src/platform/face_b.rs index 9fac131..125ec0d 100644 --- a/src/backend/src/platform/face_b.rs +++ b/src/backend/src/platform/face_b.rs @@ -7043,6 +7043,1668 @@ pub async fn standing_delete_object( ok(Value::Null) } +// ---------------------------------------------------------------- 应用中心(/api/system/System) +// +// 官方真源:`SystemController.java`(`@RequestMapping("/api/system/System")`)。 +// 形状真源:`SystemListVO.java` / `SystemVO.java` / `AppAuthorizeVo.java` / `SystemTopModel.java`。 +// +// 🔴 **应用中心页(`views/appCenter/index.vue`)只读三件事**: +// `data.list`(列表)/ `res.msg`(提示)/ `res.data.url`(导出下载)⇒ 形状错一个就白屏。 +// 🔴 **列表项的 `isAdministrator` 一类字段一律数字**(官方 VO 是 Integer),本文件的 +// `hasUpdate` / `hasDelete` 也照官方给 `0|1`。 + +/// `@SaCheckPermission("appCenter")`(官方 `SystemController` create/delete/copy)。 +const EN_APP_CENTER: &str = "appCenter"; + +/// `@SaCheckPermission("appConfig.baseConfig")`(官方 update / preferenceSave)。 +const EN_APP_CONFIG: &str = "appConfig.baseConfig"; + +/// `@SaCheckPermission({"sysConfig.parameter","sysConfig.strategy"})`(OR ⇒ 取第一个)。 +const EN_SYS_CONFIG: &str = "sysConfig.parameter"; + +/// 官方 `SystemListVO` 的原料(`id/fullName/enCode/icon/sortCode/backgroundColor/userId`)。 +/// +/// 🔴 `creatorUserId` 与 `isMain` 是**内部字段**(算 `hasDelete` / 过滤主系统用), +/// 出参前会摘掉 —— 官方 VO 里没有它们。 +const SYSTEM_LIST_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_icon AS \"icon\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ + f_background_color AS \"backgroundColor\", f_user_id AS \"userId\", \ + f_creator_user_id AS \"creatorUserId\", COALESCE(f_is_main, 0) AS \"isMain\""; + +/// 官方 `SystemVO`(详情 / 编辑回填)。 +const SYSTEM_VO_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_portal_id AS \"portalId\", f_app_portal_id AS \"appPortalId\", \ + f_icon AS \"icon\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_enabled_mark, 1) AS \"enabledMark\", f_description AS \"description\", \ + f_property_json AS \"propertyJson\", f_preference_json AS \"preferenceJson\", \ + f_background_color AS \"backgroundColor\", f_tag_id AS \"tagId\""; + +/// `SystemCrModel` / `SystemUpModel` ⇒ 列(camelCase ↔ `f_*`)。 +/// +/// 🔴 **驼峰不是机械转下划线**:`enCode ↔ f_en_code`、`portalId ↔ f_portal_id` 之类 +/// 一律照官方实体字段抄;白名单外的键**直接忽略**(防止 body 注入任意列)。 +const SYSTEM_WRITE_FIELDS: [(&str, &str, &str); 12] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("portalId", "f_portal_id", ""), + ("appPortalId", "f_app_portal_id", ""), + ("icon", "f_icon", ""), + ("sortCode", "f_sort_code", "::bigint"), + ("enabledMark", "f_enabled_mark", "::integer"), + ("description", "f_description", ""), + ("propertyJson", "f_property_json", ""), + ("preferenceJson", "f_preference_json", ""), + ("backgroundColor", "f_background_color", ""), + ("tagId", "f_tag_id", ""), +]; + +/// 当前用户在当前应用中心置顶的 id 集合。 +async fn load_system_tops(state: &AppState, user: &TokenUser) -> HashSet { + let sql = "SELECT f_object_id AS \"id\" FROM base_system_top \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_user_id = $1::text AND f_type = 'appCenter'"; + match state.db.query_json_params(sql, &[&user.user_id]).await { + Ok(rows) => rows + .iter() + .filter_map(|r| r["id"].as_str().map(str::to_string)) + .collect(), + Err(e) => { + eprintln!("[face-b] 置顶查询失败(按未置顶处理): {e}"); + HashSet::new() + } + } +} + +/// `GET /api/system/System` —— 应用列表(`ListVO`)。 +/// +/// 查询参数:`keyword` / `enabledMark` / `type`(1 全部 / 2 我创建的 / 3 授权给我的)/ +/// `sort`(ASC|DESC)/ `tagId` / `filterMain`(默认 true ⇒ 不含主系统)。 +pub async fn system_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let keyword = crate::platform::sys::query_param(&raw, "keyword") + .trim() + .to_string(); + let enabled_mark = crate::platform::sys::query_param(&raw, "enabledMark") + .trim() + .to_string(); + let tag_id = crate::platform::sys::query_param(&raw, "tagId").trim().to_string(); + let sort = crate::platform::sys::query_param(&raw, "sort").trim().to_uppercase(); + let filter_main = { + let v = crate::platform::sys::query_param(&raw, "filterMain") + .trim() + .to_lowercase(); + v != "false" && v != "0" + }; + let list_type: i64 = crate::platform::sys::query_param(&raw, "type") + .trim() + .parse() + .unwrap_or(1); + + let mut conds: Vec = vec!["COALESCE(f_delete_mark, 0) = 0".to_string()]; + let mut values: Vec> = Vec::new(); + if filter_main { + conds.push("COALESCE(f_is_main, 0) = 0".to_string()); + } + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!( + "(f_full_name ILIKE ${n}::text OR f_en_code ILIKE ${n}::text)" + )); + } + if !enabled_mark.is_empty() { + values.push(Some(enabled_mark)); + conds.push(format!( + "COALESCE(f_enabled_mark, 1) = ${}::integer", + values.len() + )); + } + if !tag_id.is_empty() && tag_id != "-1" { + values.push(Some(format!("%{tag_id}%"))); + conds.push(format!("COALESCE(f_tag_id, '') LIKE ${}::text", values.len())); + } + match list_type { + 2 => { + values.push(Some(user.account.clone())); + conds.push(format!("f_creator_user_id = ${}::text", values.len())); + } + // 「授权给我的」:管理员看全部;普通用户看 `f_user_id` / `f_authorize_id` 里点名的。 + 3 if user.is_admin != 1 => { + values.push(Some(format!("%{}%", user.user_id))); + let n = values.len(); + conds.push(format!( + "(COALESCE(f_user_id, '') LIKE ${n}::text OR COALESCE(f_authorize_id, '') LIKE ${n}::text)" + )); + } + _ => {} + } + let order = if sort == "ASC" { "ASC" } else { "DESC" }; + let sql = format!( + "SELECT {SYSTEM_LIST_PROJECTION} FROM base_system WHERE {} \ + ORDER BY COALESCE(f_sort_code, 0) ASC, f_creator_time {order} NULLS LAST", + conds.join(" AND ") + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "应用列表查询"), + }; + let tops = load_system_tops(&state, &user).await; + let list: Vec = rows + .into_iter() + .map(|row| shape_system_list_item(row, &user, &tops)) + .collect(); + ok(list_vo(list)) +} + +/// 列表项 ⇒ 官方 `SystemListVO`(**摘掉内部字段** + 按用户算 `hasUpdate/hasDelete/isTop`)。 +fn shape_system_list_item(mut row: Value, user: &TokenUser, tops: &HashSet) -> Value { + { + let Some(obj) = row.as_object_mut() else { + return row; + }; + let id = obj + .get("id") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let creator = obj + .get("creatorUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + obj.remove("creatorUserId"); + obj.remove("isMain"); + // 官方的 `hasDelete` = 管理员或应用创建者;`hasUpdate` = 管理员或有授权(本仓退化为创建者)。 + let owned = user.is_admin == 1 || creator == user.account; + let flag = if owned { 1 } else { 0 }; + obj.insert("hasUpdate".to_string(), json!(flag)); + obj.insert("hasDelete".to_string(), json!(flag)); + obj.insert("isTop".to_string(), json!(tops.contains(&id))); + } + row +} + +/// `GET /api/system/System/userAuthList` —— 「授权给我的应用」(`data` 是**裸数组**)。 +pub async fn system_user_auth_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let keyword = crate::platform::sys::query_param(&raw, "keyword") + .trim() + .to_string(); + let mut conds = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "COALESCE(f_is_main, 0) = 0".to_string(), + ]; + let mut values: Vec> = Vec::new(); + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!( + "(f_full_name ILIKE ${n}::text OR f_en_code ILIKE ${n}::text)" + )); + } + if user.is_admin != 1 { + values.push(Some(format!("%{}%", user.user_id))); + let n = values.len(); + conds.push(format!( + "(COALESCE(f_user_id, '') LIKE ${n}::text OR COALESCE(f_authorize_id, '') LIKE ${n}::text)" + )); + } + let sql = format!( + "SELECT {SYSTEM_LIST_PROJECTION} FROM base_system WHERE {} \ + ORDER BY COALESCE(f_sort_code, 0) ASC", + conds.join(" AND ") + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "授权应用查询"), + }; + let tops = load_system_tops(&state, &user).await; + let list: Vec = rows + .into_iter() + .map(|row| shape_system_list_item(row, &user, &tops)) + .collect(); + ok(Value::Array(list)) +} + +/// `GET /api/system/System/Selector` —— 全部应用(**裸数组**,供下拉/流程监控选应用)。 +pub async fn system_selector( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword") + .trim() + .to_string(); + let (sql, values) = if keyword.is_empty() { + ( + format!( + "SELECT {SYSTEM_LIST_PROJECTION} FROM base_system \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND COALESCE(f_is_main, 0) = 0 \ + ORDER BY COALESCE(f_sort_code, 0) ASC" + ), + Vec::new(), + ) + } else { + ( + format!( + "SELECT {SYSTEM_LIST_PROJECTION} FROM base_system \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND COALESCE(f_is_main, 0) = 0 \ + AND f_full_name ILIKE $1::text ORDER BY COALESCE(f_sort_code, 0) ASC" + ), + vec![Some(format!("%{keyword}%"))], + ) + }; + let rows = match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "应用下拉查询"), + }; + let list: Vec = rows + .into_iter() + .map(|mut row| { + if let Some(obj) = row.as_object_mut() { + obj.remove("creatorUserId"); + obj.remove("isMain"); + obj.insert("hasUpdate".to_string(), json!(0)); + obj.insert("hasDelete".to_string(), json!(0)); + obj.insert("isTop".to_string(), json!(false)); + } + row + }) + .collect(); + ok(Value::Array(list)) +} + +/// `GET /api/system/System/{id}` —— 应用详情(`SystemVO`)。 +pub async fn system_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {SYSTEM_VO_PROJECTION} FROM base_system \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1" + ); + let rows = match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "应用详情查询"), + }; + match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "应用不存在"), + } +} + +/// `POST /api/system/System` —— 新建应用(返回 `data` = `enCode`,官方行为)。 +pub async fn system_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_APP_CENTER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "系统名称不能为空"); + } + let en_code = obj + .get("enCode") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + // 官方允许编码为空(服务端生成)⇒ 这里给一个可读的兜底。 + let en_code = if en_code.is_empty() { + format!("app_{}", new_uuid().replace('-', "")[..8].to_string()) + } else { + en_code + }; + if let Err(resp) = ensure_en_code_free(&state, &en_code, None).await { + return resp; + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name", "f_en_code"]; + let mut casts: Vec<&str> = vec!["", "", "", ""]; + let mut values: Vec> = vec![ + Some(new_id), + Some("0".to_string()), + Some(full_name), + Some(en_code.clone()), + ]; + for (json_key, column, cast) in SYSTEM_WRITE_FIELDS { + if column == "f_full_name" || column == "f_en_code" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + columns.push("f_is_main"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account)); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_system ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建应用"); + } + ok(json!(en_code)) +} + +/// 编码唯一性(`isExistEnCode`):软删的行不参与判重。 +async fn ensure_en_code_free( + state: &AppState, + en_code: &str, + exclude_id: Option<&str>, +) -> Result<(), Json> { + let sql = "SELECT f_id AS \"id\" FROM base_system \ + WHERE f_en_code = $1::text AND COALESCE(f_delete_mark, 0) = 0 \ + AND ($2::text IS NULL OR f_id <> $2::text) LIMIT 1"; + let exclude = exclude_id.map(str::to_string); + let code = en_code.to_string(); + let rows = match state + .db + .query_json_params(sql, &[&code, &exclude]) + .await + { + Ok(rows) => rows, + Err(e) => { + eprintln!("[face-b] 应用编码判重失败: {e}"); + return Err(fail(code::EXCEPTION, "系统异常,请联系管理员")); + } + }; + if rows.is_empty() { + Ok(()) + } else { + Err(fail(code::FAIL, "编码已存在,请修改")) + } +} + +/// `PUT /api/system/System/{id}` —— 改应用(**只 SET body 里出现的键**)。 +pub async fn system_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_APP_CONFIG).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_system \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) if rows.is_empty() => return fail(code::FAIL, "应用不存在"), + Ok(_) => {} + Err(e) => return db_error(e, "应用查询"), + } + if let Some(Value::String(en_code)) = obj.get("enCode") { + if let Err(resp) = ensure_en_code_free(&state, en_code, Some(&id)).await { + return resp; + } + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in SYSTEM_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account)); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_system SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改应用"); + } + ok(Value::Null) +} + +/// `DELETE /api/system/System/{id}` —— 删应用(**主系统 / 有菜单的应用不许删**,软删)。 +pub async fn system_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_APP_CENTER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let rows = match state + .db + .query_json_params( + "SELECT COALESCE(f_is_main, 0) AS \"isMain\" FROM base_system \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "应用查询"), + }; + let Some(row) = rows.into_iter().next() else { + return fail(code::FAIL, "应用不存在"); + }; + if row["isMain"].as_i64().unwrap_or(0) == 1 { + return fail(code::FAIL, "主系统不能删除"); + } + match state + .db + .query_json_params( + "SELECT COUNT(*)::text AS \"n\" FROM base_module \ + WHERE f_system_id = $1::text AND COALESCE(f_delete_mark, 0) = 0", + &[&id], + ) + .await + { + Ok(rows) if rows.first().and_then(|r| r["n"].as_str()) != Some("0") => { + return fail(code::FAIL, "该应用下还有菜单,不能删除"); + } + Ok(_) => {} + Err(e) => return db_error(e, "应用菜单检查"), + } + let values = [Some(user.account), Some(id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_system SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "删除应用"); + } + ok(Value::Null) +} + +/// `POST /api/system/System/{id}/Actions/Copy` —— 复制应用。 +/// +/// 🔴 **v1 只复制应用行**(新 id + `{编码}_copy`);菜单/表单等资源的复制**未做** +/// (官方 `importCopy` 会连 visualdev / portal / 报表 / 打印一起复制)⇒ 已知错位。 +pub async fn system_copy( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_APP_CENTER).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let rows = match state + .db + .query_json_params( + "SELECT f_en_code AS \"enCode\", f_full_name AS \"fullName\" FROM base_system \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "应用查询"), + }; + let Some(row) = rows.into_iter().next() else { + return fail(code::FAIL, "应用不存在"); + }; + let src_code = row["enCode"].as_str().unwrap_or("app").to_string(); + let src_name = row["fullName"].as_str().unwrap_or("应用").to_string(); + + // 编码唯一:`_copy` → `_copy2` → … + let mut en_code = format!("{src_code}_copy"); + for n in 2..=20 { + match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_system \ + WHERE f_en_code = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&en_code], + ) + .await + { + Ok(rows) if rows.is_empty() => break, + Ok(_) => en_code = format!("{src_code}_copy{n}"), + Err(e) => return db_error(e, "应用编码判重"), + } + } + let new_id = new_uuid(); + let values = [ + Some(new_id), + Some(format!("{src_name}(副本)")), + Some(en_code), + Some(user.account), + Some(id), + ]; + if let Err(e) = state + .db + .exec_params( + "INSERT INTO base_system (f_id, f_tenant_id, f_full_name, f_en_code, f_icon, \ + f_sort_code, f_enabled_mark, f_description, f_property_json, f_portal_id, \ + f_app_portal_id, f_preference_json, f_background_color, f_tag_id, f_is_main, \ + f_creator_user_id, f_creator_time, f_delete_mark) \ + SELECT $1::text, '0', $2::text, $3::text, f_icon, f_sort_code, f_enabled_mark, \ + f_description, f_property_json, f_portal_id, f_app_portal_id, f_preference_json, \ + f_background_color, f_tag_id, 0, $4::text, now(), 0 \ + FROM base_system WHERE f_id = $5::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "复制应用"); + } + ok(Value::Null) +} + +/// `POST /api/system/System/actionTop` —— 置顶 / 取消置顶(按用户 + 类型记账)。 +pub async fn system_action_top( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let object_id = obj + .get("id") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if object_id.is_empty() { + return fail(code::FAIL, "置顶数据id必填"); + } + let top_type = obj + .get("type") + .and_then(Value::as_str) + .filter(|s| !s.trim().is_empty()) + .unwrap_or("appCenter") + .to_string(); + let action = obj.get("actionType").and_then(Value::as_i64).unwrap_or(1); + if action == 0 { + let values = [Some(user.user_id), Some(top_type), Some(object_id)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_system_top SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text \ + WHERE f_user_id = $1::text AND f_type = $2::text AND f_object_id = $3::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "取消置顶"); + } + return ok(Value::Null); + } + let exists = state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_system_top WHERE COALESCE(f_delete_mark, 0) = 0 \ + AND f_user_id = $1::text AND f_type = $2::text AND f_object_id = $3::text LIMIT 1", + &[&user.user_id, &top_type, &object_id], + ) + .await; + match exists { + Ok(rows) if !rows.is_empty() => return ok(Value::Null), + Ok(_) => {} + Err(e) => return db_error(e, "置顶查询"), + } + // 🔴 `f_id` 是**第 1 个参数**,`f_object_id` 是第 4 个 —— 占位符顺序必须与 + // `values` 的追加顺序逐字对齐(历史上这里错过一次 ⇒ 只剩「关联残留」)。 + let values = [ + Some(new_uuid()), + Some(user.user_id.clone()), + Some(top_type), + Some(object_id), + ]; + if let Err(e) = state + .db + .exec_params( + "INSERT INTO base_system_top (f_id, f_tenant_id, f_user_id, f_stand_id, \ + f_object_id, f_type, f_creator_user_id, f_creator_time, f_delete_mark) \ + VALUES ($1::text, '0', $2::text, '0', $4::text, $3::text, $2::text, now(), 0)", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "置顶"); + } + ok(Value::Null) +} + +/// `POST /api/system/System/preferenceSave/{id}` —— 保存应用主题偏好(只写 `f_preference_json`)。 +pub async fn system_preference_save( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_APP_CONFIG).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let pref = value_to_text(obj.get("preferenceJson")); + let values = [pref, Some(user.account), Some(id.clone())]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_system SET f_preference_json = $1::text, \ + f_last_modify_user_id = $2::text, f_last_modify_time = now() \ + WHERE f_id = $3::text AND COALESCE(f_delete_mark, 0) = 0", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "保存应用偏好"); + } + ok(Value::Null) +} + +/// `GET /api/system/System/getAppAuthorization/{id}` —— 应用授权信息(`AppAuthorizeVo`)。 +pub async fn system_app_auth_get( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let id = id.trim().to_string(); + let rows = match state + .db + .query_json_params( + "SELECT f_full_name AS \"fullName\", f_user_id AS \"userId\", \ + f_creator_user_id AS \"createUserId\" FROM base_system \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "应用授权查询"), + }; + let Some(row) = rows.into_iter().next() else { + return fail(code::FAIL, "应用不存在"); + }; + let dev_ids: Vec = row["userId"] + .as_str() + .unwrap_or_default() + .split(',') + .map(str::trim) + .filter(|s| !s.is_empty()) + .map(str::to_string) + .collect(); + let full_name = { + let uid = row["createUserId"].as_str().unwrap_or_default().to_string(); + match state + .db + .query_json_params( + "SELECT f_real_name AS \"name\" FROM base_user WHERE f_id = $1::text LIMIT 1", + &[&uid], + ) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r["name"].as_str()) + .unwrap_or_default() + .to_string(), + Err(_) => String::new(), + } + }; + ok(json!({ + "isAllDevUser": if dev_ids.is_empty() { 1 } else { 0 }, + "fullName": full_name, + "createUserId": row["createUserId"], + "devUsers": dev_ids, + })) +} + +/// `POST /api/system/System/saveAppAuthorization` —— 保存应用开发者授权。 +pub async fn system_app_auth_save( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_APP_CONFIG).await { + Ok(u) => u, + Err(resp) => return resp, + }; + system_app_auth_write(state, body, false, user).await +} + +/// `POST /api/system/System/changeAppAuthorization` —— 移交应用创建人。 +pub async fn system_app_auth_change( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_APP_CONFIG).await { + Ok(u) => u, + Err(resp) => return resp, + }; + system_app_auth_write(state, body, true, user).await +} + +/// 授权写的公共实现(`change == true` 时**连创建人一起改**)。 +/// +/// 🔴 守卫在**两个入口**里各做一次(不是在这里)—— 契约扫描器只看 handler 本体, +/// 守卫藏在被调函数里会让 `CC6` 推不出来(只能人工核对)。 +async fn system_app_auth_write( + state: AppState, + body: Bytes, + change_owner: bool, + user: TokenUser, +) -> Json { + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let system_id = obj + .get("systemId") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if system_id.is_empty() { + return fail(code::FAIL, "应用id不能为空"); + } + let is_all = obj.get("isAllDevUser").and_then(Value::as_i64).unwrap_or(0); + let dev_users: Vec = obj + .get("devUsers") + .and_then(Value::as_array) + .map(|arr| { + arr.iter() + .filter_map(Value::as_str) + .map(str::to_string) + .collect() + }) + .unwrap_or_default(); + let dev_text = if is_all == 1 { + String::new() + } else { + dev_users.join(",") + }; + let create_user = obj + .get("createUserId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + + let mut sets = vec!["f_user_id = $1::text".to_string()]; + let mut values: Vec> = vec![Some(dev_text)]; + if change_owner && !create_user.is_empty() { + values.push(Some(create_user)); + sets.push(format!("f_creator_user_id = ${}::text", values.len())); + } + values.push(Some(user.account)); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(system_id)); + let sql = format!( + "UPDATE base_system SET {} WHERE f_id = ${}::text AND COALESCE(f_delete_mark, 0) = 0", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "保存应用授权"); + } + ok(Value::Null) +} + +// ---------------------------------------------------------------- 系统配置(/api/system/SysConfig) +// +// 官方把 `SysConfigModel`(72 个字段)**拆成键值行**存在 `base_sys_config`: +// `f_category='SysConfig'`,`f_key` = 字段名,`f_value` = 值。 +// ⇒ 本仓不做「逐字段建列」,GET 时按行拼回对象、PUT 时逐键 upsert。 + +/// 系统参数的分类标识(官方 `sysconfigService.getList("SysConfig")`)。 +const SYS_CONFIG_CATEGORY: &str = "SysConfig"; + +/// 第三方同步配置的分类标识(官方 `getSocialsConfig`)。 +const SOCIALS_CONFIG_CATEGORY: &str = "SocialsConfig"; + +/// 系统参数默认值(库为空时也要给前端一个**完整可渲染**的对象)。 +/// +/// 🔴 前端 `views/sysConfig/parameter/index.vue:61` 直接 `state.baseForm = res.data`, +/// `data` 为 `null` 会在下一行 `.logCleanPeriod` 上抛异常 ⇒ **必须是对象**。 +fn sys_config_defaults() -> Value { + json!({ + "sysName": "JNPF", + "sysDescription": "JNPF 快速开发平台", + "sysVersion": "7.0.0", + "copyright": "Copyright © 2026", + "companyName": "", + "companyCode": "", + "companyAddress": "", + "companyContacts": "", + "companyTelePhone": "", + "companyEmail": "", + "loginIcon": "", + "navigationIcon": "", + "logoIcon": "", + "appIcon": "", + "title": "JNPF", + "singleLogin": 1, + "passwordErrorsNumber": 5, + "maxLoginNum": 3, + "lockType": 1, + "lockTime": 5, + "enableVerificationCode": 0, + "verificationCodeNumber": 4, + "tokenTimeout": "120", + "lastLoginTimeSwitch": 1, + "whitelistSwitch": 0, + "whiteListIp": "", + "emailSsl": 1, + "logClean": true, + "logCleanPeriod": 1, + "linkTime": 24, + "unClickNum": 1, + "addSignLevel": 1, + "pageSize": "30", + "sysTheme": "1", + "isLog": "1", + "passwordIsUpdatedRegularly": 0, + "passwordStrengthLimit": 0, + "disableOldPassword": 0, + "mandatoryModificationOfInitialPassword": 0, + }) +} + +/// 第三方同步配置的默认值(未配置时前端也要能渲染开关)。 +fn socials_defaults() -> Value { + json!({ + "qyhDisabled": false, + "dingDisabled": false, + "fsDisabled": false, + "qyhCorpId": "", + "qyhAgentId": "", + "qyhCorpSecret": "", + "qyhIsSynOrg": 0, + "qyhIsSynUser": 0, + "dingAppKey": "", + "dingAppSecret": "", + "dingAgentId": "", + "dingIsSynOrg": 0, + "dingIsSynUser": 0, + "fsAppId": "", + "fsAppSecret": "", + "fsIsSynOrg": 0, + "fsIsSynUser": 0, + }) +} + +/// 键值行 ⇒ 对象(值做轻量还原:`1|0` ⇒ 数字、`true|false` ⇒ 布尔)。 +async fn load_config_object(state: &AppState, category: &str) -> Result> { + let category = category.to_string(); + let rows = match state + .db + .query_json_params( + "SELECT f_key AS \"key\", f_value AS \"value\" FROM base_sys_config \ + WHERE f_category = $1::text AND COALESCE(f_delete_mark, 0) = 0", + &[&category], + ) + .await + { + Ok(rows) => rows, + Err(e) => return Err(db_error(e, "系统配置查询")), + }; + let mut obj = Map::new(); + for row in rows { + let (Some(k), Some(v)) = (row["key"].as_str(), row["value"].as_str()) else { + continue; + }; + obj.insert(k.to_string(), config_value(v)); + } + Ok(Value::Object(obj)) +} + +/// 库里存的字符串 ⇒ JSON 值(数字/布尔还原,其余按字符串)。 +fn config_value(raw: &str) -> Value { + if raw == "true" { + return json!(true); + } + if raw == "false" { + return json!(false); + } + if let Ok(n) = raw.parse::() { + return json!(n); + } + json!(raw) +} + +/// `GET /api/system/SysConfig` —— 系统参数(默认值 ∪ 库里的值)。 +pub async fn sys_config_get( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + let stored = match load_config_object(&state, SYS_CONFIG_CATEGORY).await { + Ok(v) => v, + Err(resp) => return resp, + }; + let mut merged = sys_config_defaults(); + if let (Some(base), Some(extra)) = (merged.as_object_mut(), stored.as_object()) { + for (k, v) in extra { + base.insert(k.clone(), v.clone()); + } + } + ok(merged) +} + +/// `PUT /api/system/SysConfig` —— 保存系统参数(逐键 upsert)。 +pub async fn sys_config_update( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_SYS_CONFIG).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + if let Err(resp) = upsert_config(&state, &user, SYS_CONFIG_CATEGORY, &obj).await { + return resp; + } + ok(Value::Null) +} + +/// 逐键 upsert(`f_category + f_key` 是业务键,没有唯一索引 ⇒ 先查后写)。 +async fn upsert_config( + state: &AppState, + user: &TokenUser, + category: &str, + obj: &Map, +) -> Result<(), Json> { + for (key, value) in obj { + // `id` 一类的只读键不落库(前端提交整个表单时可能带上)。 + if key == "id" { + continue; + } + let text = value_to_text(Some(value)).unwrap_or_default(); + let category = category.to_string(); + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_sys_config \ + WHERE f_category = $1::text AND f_key = $2::text \ + AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + &[&category, key], + ) + .await + { + Ok(rows) => rows, + Err(e) => return Err(db_error(e, "系统配置查询")), + }; + let result = if let Some(row) = rows.into_iter().next() { + let id = row["id"].as_str().unwrap_or_default().to_string(); + let values = [Some(text), Some(user.account.clone()), Some(id)]; + state + .db + .exec_params( + "UPDATE base_sys_config SET f_value = $1::text, \ + f_last_modify_user_id = $2::text, f_last_modify_time = now() \ + WHERE f_id = $3::text", + ¶ms_of(&values), + ) + .await + } else { + let values = [ + Some(new_uuid()), + Some(key.clone()), + Some(text), + Some(category.to_string()), + Some(user.account.clone()), + ]; + state + .db + .exec_params( + "INSERT INTO base_sys_config (f_id, f_tenant_id, f_key, f_value, \ + f_category, f_creator_user_id, f_creator_time, f_delete_mark) \ + VALUES ($1::text, '0', $2::text, $3::text, $4::text, $5::text, now(), 0)", + ¶ms_of(&values), + ) + .await + }; + if let Err(e) = result { + return Err(db_error(e, "保存系统配置")); + } + } + Ok(()) +} + +/// `GET /api/system/SysConfig/socials` —— 第三方同步配置(默认值 ∪ 库里的值)。 +pub async fn sys_config_socials_get( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + let stored = match load_config_object(&state, SOCIALS_CONFIG_CATEGORY).await { + Ok(v) => v, + Err(resp) => return resp, + }; + let mut merged = socials_defaults(); + if let (Some(base), Some(extra)) = (merged.as_object_mut(), stored.as_object()) { + for (k, v) in extra { + base.insert(k.clone(), v.clone()); + } + } + ok(merged) +} + +/// `PUT /api/system/SysConfig/socials` —— 保存第三方同步配置。 +pub async fn sys_config_socials_update( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_SYS_CONFIG).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + if let Err(resp) = upsert_config(&state, &user, SOCIALS_CONFIG_CATEGORY, &obj).await { + return resp; + } + ok(Value::Null) +} + +/// `GET /api/system/SysConfig/getAdminList` —— 超级管理员列表(`UserAdminVO`:id/account/realName)。 +pub async fn sys_config_admin_list( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_account AS \"account\", f_real_name AS \"realName\" \ + FROM base_user WHERE COALESCE(f_is_administrator, 0) = 1 \ + AND COALESCE(f_delete_mark, 0) = 0 ORDER BY f_account ASC", + &[], + ) + .await + { + Ok(rows) => ok(json!(rows)), + Err(e) => db_error(e, "管理员列表查询"), + } +} + +/// `PUT /api/system/SysConfig/setAdminList` —— 追加超级管理员(官方 `setAdminListByIds`)。 +pub async fn sys_config_admin_set( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_SYS_CONFIG).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids: Vec = obj + .get("adminIds") + .and_then(Value::as_array) + .map(|arr| { + arr.iter() + .filter_map(Value::as_str) + .map(str::to_string) + .collect() + }) + .unwrap_or_default(); + if ids.is_empty() { + return fail(code::FAIL, "请选择超级管理员"); + } + let joined = ids.join(","); + let values = [Some(joined), Some(user.account)]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_user SET f_is_administrator = 1, f_last_modify_user_id = $2::text, \ + f_last_modify_time = now() \ + WHERE f_id = ANY(string_to_array($1::text, ','))", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "设置超级管理员"); + } + ok(Value::Null) +} + +/// `POST /api/system/SysConfig/{type}/testQyWebChatConnect` —— 企业微信连通性测试。 +/// +/// 🔴 **本仓未接企业微信 SDK** ⇒ 一律业务失败(`400` + 人话),**不能假装成功**: +/// 假装成功会让用户以为配置好了,然后在同步时才发现根本没通。 +pub async fn sys_config_test_qy( + State(state): State, + headers: HeaderMap, + Path(_kind): Path, + _body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + fail(code::FAIL, "未接入企业微信,请先在企业微信侧配置应用") +} + +/// `POST /api/system/SysConfig/testDingTalkConnect` —— 钉钉连通性测试(同上,不假装成功)。 +pub async fn sys_config_test_ding( + State(state): State, + headers: HeaderMap, + _body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + fail(code::FAIL, "未接入钉钉,请先在企业微信/钉钉侧配置应用") +} + +/// `POST /api/system/SynThirdInfo` —— 触发组织/用户同步。 +/// +/// 🔴 未接第三方 SDK ⇒ **业务失败**(同上,不假装同步成功)。 +pub async fn syn_third_info_sync( + State(state): State, + headers: HeaderMap, + _body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + fail(code::FAIL, "未启用第三方同步") +} + +/// `GET /api/system/SynThirdInfo/getSynThirdTotal/{type}` —— 同步统计(恒零,形状对齐)。 +/// +/// `SynThirdTotal` = `{synType, recordTotal, synSuccessCount, synFailCount, unSynCount, synDate}`。 +pub async fn syn_third_info_total( + State(state): State, + headers: HeaderMap, + Path(third_type): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + let syn_type = if third_type.trim() == "2" { "2" } else { "1" }; + ok(json!([ + { + "synType": format!("{syn_type}-1"), + "recordTotal": 0, + "synSuccessCount": 0, + "synFailCount": 0, + "unSynCount": 0, + "synDate": Value::Null, + }, + { + "synType": format!("{syn_type}-2"), + "recordTotal": 0, + "synSuccessCount": 0, + "synFailCount": 0, + "unSynCount": 0, + "synDate": Value::Null, + } + ])) +} + +/// `GET /api/system/SynThirdInfo/clearAllSyn?type=` —— 清空同步记录(本仓没有可清的)。 +pub async fn syn_third_info_clear( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + ok(Value::Null) +} + +/// `GET /api/system/SynThirdInfo/getHandleNum` —— 同步失败/未同步清单(`PageListVO`,恒空)。 +pub async fn syn_third_info_handle_num( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_SYS_CONFIG).await { + return resp; + } + let paging = Paging::of(&raw); + ok(page_list(paging.current_page, paging.page_size, 0, Vec::new())) +} + +// ---------------------------------------------------------------- 标签(/api/system/Tag) +// +// 官方真源:`TagController.java`(`@RequestMapping("/api/system/Tag")`)。 +// 应用中心页**一进页面就调** `GET /api/system/Tag/selector?enCode=AppTags` +// (`views/appCenter/index.vue:45`)⇒ 不实现就必闪一条 404。 +// +// 🔴 官方列表是 `ListVO`(`{list:[…]}`),不是 `PageListVO` —— 没有 `pagination`。 + +/// `TagListModel` / `TagSelectorVo` 的原料。 +const TAG_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + COALESCE(f_type, 1) AS \"type\", COALESCE(f_parent_id, '0') AS \"parentId\", \ + f_icon AS \"icon\", COALESCE(f_enabled_mark, 1) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", f_description AS \"description\", \ + f_en_code AS \"enCode\", f_background_color AS \"backgroundColor\""; + +/// `TagCrModel` / `TagUrModel` ⇒ 列。 +const TAG_WRITE_FIELDS: [(&str, &str, &str); 7] = [ + ("fullName", "f_full_name", ""), + ("parentId", "f_parent_id", ""), + ("icon", "f_icon", ""), + ("sortCode", "f_sort_code", "::bigint"), + ("enabledMark", "f_enabled_mark", "::integer"), + ("description", "f_description", ""), + ("enCode", "f_en_code", ""), +]; + +/// `GET /api/system/Tag` —— 标签列表(`ListVO`,支持 `keyword` / `enCode` 过滤)。 +pub async fn tag_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let keyword = crate::platform::sys::query_param(&raw, "keyword") + .trim() + .to_string(); + let mut conds = vec!["COALESCE(f_delete_mark, 0) = 0".to_string()]; + let mut values: Vec> = Vec::new(); + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!( + "(f_full_name ILIKE ${n}::text OR COALESCE(f_en_code, '') ILIKE ${n}::text)" + )); + } + let sql = format!( + "SELECT {TAG_PROJECTION} FROM base_tag WHERE {} \ + ORDER BY COALESCE(f_sort_code, 0) ASC, f_creator_time ASC", + conds.join(" AND ") + ); + match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "标签列表查询"), + } +} + +/// `GET /api/system/Tag/selector?enCode=` —— 标签下拉(`enCode` 为空 ⇒ 全部)。 +pub async fn tag_selector( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let en_code = crate::platform::sys::query_param(&raw, "enCode") + .trim() + .to_string(); + let (sql, values) = if en_code.is_empty() { + ( + format!( + "SELECT {TAG_PROJECTION} FROM base_tag WHERE COALESCE(f_delete_mark, 0) = 0 \ + AND COALESCE(f_enabled_mark, 1) = 1 ORDER BY COALESCE(f_sort_code, 0) ASC" + ), + Vec::new(), + ) + } else { + ( + format!( + "SELECT {TAG_PROJECTION} FROM base_tag WHERE COALESCE(f_delete_mark, 0) = 0 \ + AND COALESCE(f_enabled_mark, 1) = 1 AND f_en_code = $1::text \ + ORDER BY COALESCE(f_sort_code, 0) ASC" + ), + vec![Some(en_code)], + ) + }; + match state.db.query_json_params(&sql, ¶ms_of(&values)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "标签下拉查询"), + } +} + +/// `GET /api/system/Tag/{id}` —— 标签详情。 +pub async fn tag_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {TAG_PROJECTION} FROM base_tag WHERE f_id = $1::text \ + AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "标签不存在"), + }, + Err(e) => db_error(e, "标签详情查询"), + } +} + +/// `POST /api/system/Tag` —— 新建标签(名称/编码唯一,`f_type` 强制 1)。 +pub async fn tag_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "标签名称缺失"); + } + if let Err(resp) = ensure_tag_unique(&state, &full_name, None, None).await { + return resp; + } + if let Some(en_code) = obj.get("enCode").and_then(Value::as_str) { + if !en_code.trim().is_empty() { + if let Err(resp) = ensure_tag_unique(&state, "", None, Some(en_code)).await { + return resp; + } + } + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name", "f_type"]; + let mut casts: Vec<&str> = vec!["", "", "", "::integer"]; + let mut values: Vec> = vec![ + Some(new_id), + Some("0".to_string()), + Some(full_name), + Some("1".to_string()), + ]; + for (json_key, column, cast) in TAG_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + if !obj.contains_key("parentId") { + columns.push("f_parent_id"); + casts.push(""); + values.push(Some("0".to_string())); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account)); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_tag ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建标签"); + } + ok(Value::Null) +} + +/// 标签唯一性:`fullName`(同父节点)/ `enCode` 二选一判。 +async fn ensure_tag_unique( + state: &AppState, + full_name: &str, + exclude_id: Option<&str>, + en_code: Option<&str>, +) -> Result<(), Json> { + let exclude = exclude_id.map(str::to_string); + let (sql, param, msg) = match en_code { + Some(code) => ( + "SELECT f_id AS \"id\" FROM base_tag WHERE f_en_code = $1::text \ + AND COALESCE(f_delete_mark, 0) = 0 \ + AND ($2::text IS NULL OR f_id <> $2::text) LIMIT 1", + code.to_string(), + "标签编码已存在", + ), + None => ( + "SELECT f_id AS \"id\" FROM base_tag WHERE f_full_name = $1::text \ + AND COALESCE(f_delete_mark, 0) = 0 \ + AND ($2::text IS NULL OR f_id <> $2::text) LIMIT 1", + full_name.to_string(), + "标签名称已存在", + ), + }; + match state + .db + .query_json_params(sql, &[¶m, &exclude]) + .await + { + Ok(rows) if rows.is_empty() => Ok(()), + Ok(_) => Err(fail(code::FAIL, msg)), + Err(e) => { + eprintln!("[face-b] 标签判重失败: {e}"); + Err(fail(code::EXCEPTION, "系统异常,请联系管理员")) + } + } +} + +/// `PUT /api/system/Tag/{id}` —— 改标签(只 SET body 里出现的键)。 +pub async fn tag_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + if let Some(name) = obj.get("fullName").and_then(Value::as_str) { + if name.trim().is_empty() { + return fail(code::FAIL, "标签名称缺失"); + } + if let Err(resp) = ensure_tag_unique(&state, name, Some(&id), None).await { + return resp; + } + } + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in TAG_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account)); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_tag SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改标签"); + } + ok(Value::Null) +} + +/// `DELETE /api/system/Tag/{id}` —— 删标签(软删)。 +pub async fn tag_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let values = [Some(user.account), Some(id.trim().to_string())]; + if let Err(e) = state + .db + .exec_params( + "UPDATE base_tag SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text", + ¶ms_of(&values), + ) + .await + { + return db_error(e, "删除标签"); + } + ok(Value::Null) +} + #[cfg(test)] mod tests { use super::*; diff --git a/src/backend/src/routes.rs b/src/backend/src/routes.rs index a4ef34d..deaeb68 100644 --- a/src/backend/src/routes.rs +++ b/src/backend/src/routes.rs @@ -200,6 +200,89 @@ pub fn build_router(state: AppState) -> axum::Router { "/api/system/System/getDevUser", get(face_b::system_get_dev_user), ) + // ---- 应用中心(官方 `SystemController.java`)---- + // 🔴 一条 `.route()` 只挂一个方法(契约扫描器只看第一个方法)。 + .route("/api/system/System", get(face_b::system_list)) + .route("/api/system/System", post(face_b::system_create)) + .route("/api/system/System/Selector", get(face_b::system_selector)) + .route( + "/api/system/System/userAuthList", + get(face_b::system_user_auth_list), + ) + .route( + "/api/system/System/actionTop", + post(face_b::system_action_top), + ) + .route( + "/api/system/System/getAppAuthorization/{id}", + get(face_b::system_app_auth_get), + ) + .route( + "/api/system/System/saveAppAuthorization", + post(face_b::system_app_auth_save), + ) + .route( + "/api/system/System/changeAppAuthorization", + post(face_b::system_app_auth_change), + ) + .route("/api/system/System/{id}", get(face_b::system_info)) + .route("/api/system/System/{id}", put(face_b::system_update)) + .route("/api/system/System/{id}", delete(face_b::system_delete)) + .route( + "/api/system/System/{id}/Actions/Copy", + post(face_b::system_copy), + ) + .route( + "/api/system/System/preferenceSave/{id}", + post(face_b::system_preference_save), + ) + // ---- 标签(应用中心页一进来就拉 selector)---- + .route("/api/system/Tag", get(face_b::tag_list)) + .route("/api/system/Tag", post(face_b::tag_create)) + .route("/api/system/Tag/selector", get(face_b::tag_selector)) + .route("/api/system/Tag/{id}", get(face_b::tag_info)) + .route("/api/system/Tag/{id}", put(face_b::tag_update)) + .route("/api/system/Tag/{id}", delete(face_b::tag_delete)) + // ---- 系统配置 + 第三方同步(官方 `SysConfigController` / `SynThirdInfoController`)---- + .route("/api/system/SysConfig", get(face_b::sys_config_get)) + .route("/api/system/SysConfig", put(face_b::sys_config_update)) + .route( + "/api/system/SysConfig/socials", + get(face_b::sys_config_socials_get), + ) + .route( + "/api/system/SysConfig/socials", + put(face_b::sys_config_socials_update), + ) + .route( + "/api/system/SysConfig/getAdminList", + get(face_b::sys_config_admin_list), + ) + .route( + "/api/system/SysConfig/setAdminList", + put(face_b::sys_config_admin_set), + ) + .route( + "/api/system/SysConfig/{type}/testQyWebChatConnect", + post(face_b::sys_config_test_qy), + ) + .route( + "/api/system/SysConfig/testDingTalkConnect", + post(face_b::sys_config_test_ding), + ) + .route("/api/system/SynThirdInfo", post(face_b::syn_third_info_sync)) + .route( + "/api/system/SynThirdInfo/getSynThirdTotal/{type}", + get(face_b::syn_third_info_total), + ) + .route( + "/api/system/SynThirdInfo/clearAllSyn", + get(face_b::syn_third_info_clear), + ) + .route( + "/api/system/SynThirdInfo/getHandleNum", + get(face_b::syn_third_info_handle_num), + ) .route("/api/permission/socials/{id}", delete(face_b::socials_delete)) // ---- 前端每页都拉的公共接口(本仓无对应表 ⇒ 保守空形状,但必须是 200)---- .route( @@ -952,7 +1035,7 @@ mod tests { // 🔴 表数**故意写死**:它同时校验「schema.sql 建了预期的表」与 // 「health 报的是真数」。加表要同步改这里 + main.rs 的 BASE_TABLES // + crates/sspf-store 的两条 DDL 断言(共四处,漏一处就红)。 - assert_eq!(body["tables"], 23); + assert_eq!(body["tables"], 26); assert_eq!(body["version"], env!("CARGO_PKG_VERSION")); } @@ -967,7 +1050,7 @@ mod tests { let port = serve(new_state(db().await)).await; // 🔴 按**路径**列(同一路径多个方法只算一条)—— 每条都用 PATCH 探 405。 - const FACE_B_REGISTERED: [&str; 110] = [ + const FACE_B_REGISTERED: [&str; 133] = [ "/api/permission/Users", "/api/permission/Users/any-id", "/api/permission/Users/BatchDelete", @@ -1078,6 +1161,30 @@ mod tests { "/api/permission/PermissionGroup/PermissionMember/any-id", "/api/permission/Action", "/api/permission/Action/any-id", + // —— 应用中心 + 系统配置(批次 3)—— + "/api/system/System", + "/api/system/System/Selector", + "/api/system/System/userAuthList", + "/api/system/System/actionTop", + "/api/system/System/getAppAuthorization/any-id", + "/api/system/System/saveAppAuthorization", + "/api/system/System/changeAppAuthorization", + "/api/system/System/any-id", + "/api/system/System/any-id/Actions/Copy", + "/api/system/System/preferenceSave/any-id", + "/api/system/SysConfig", + "/api/system/SysConfig/socials", + "/api/system/SysConfig/getAdminList", + "/api/system/SysConfig/setAdminList", + "/api/system/SysConfig/any-type/testQyWebChatConnect", + "/api/system/SysConfig/testDingTalkConnect", + "/api/system/SynThirdInfo", + "/api/system/SynThirdInfo/getSynThirdTotal/any-type", + "/api/system/SynThirdInfo/clearAllSyn", + "/api/system/SynThirdInfo/getHandleNum", + "/api/system/Tag", + "/api/system/Tag/selector", + "/api/system/Tag/any-id", ]; for path in FACE_B_REGISTERED { diff --git a/src/backend/tests/batch3_it.rs b/src/backend/tests/batch3_it.rs new file mode 100644 index 0000000..6fc52d6 --- /dev/null +++ b/src/backend/tests/batch3_it.rs @@ -0,0 +1,346 @@ +//! 批次 3(应用中心 `/api/system/System` + 系统配置 `/api/system/SysConfig`)集成测试。 +//! +//! 🔴 **钉住的契约点**(每一条都对应官方 VO/控制器的一处要求): +//! ① `GET /System` 的 `data` 是 `ListVO`(`{list:[…]}`),**不是**裸数组; +//! 列表项 `hasUpdate`/`hasDelete` 是**数字**(官方 VO 是 Integer),且**不含** +//! 内部字段 `creatorUserId` / `isMain`。 +//! ② `POST /System` 返回 `data = enCode`(官方 `ActionResult.success(msg, entity.getEnCode())`) +//! —— 前端拿它拼「新建后跳表单设计器」的地址。 +//! ③ `PUT /System/{id}` **只 SET body 里出现的键**(只发 fullName ⇒ enCode 必须保持原值)。 +//! ④ 主系统禁删(官方 `SYS102`);编码重复 ⇒ `400`。 +//! ⑤ `actionTop` 是**按用户 + 类型**记账的:置顶后列表 `isTop=true`,取消后 `false`。 +//! ⑥ `SysConfig` 是**键值表**:PUT 后 GET 必须按类型还原(数字/布尔不能变字符串)。 +//! +//! 🔴 pglite-rs 0.2.7 是**进程级全局标志** ⇒ 全文件共用一个临时库 + 一把互斥锁。 + +use std::path::PathBuf; +use std::sync::Arc; + +use serde_json::{json, Value}; +use ssw_platform::bootstrap::ensure_base; +use ssw_platform::platform::config::Config; +use ssw_platform::platform::db::Db; +use ssw_platform::platform::seed::first_seed; +use ssw_platform::platform::session::SessionStore; +use ssw_platform::platform::state::AppState; +use ssw_platform::routes::build_app; +use tokio::io::{AsyncReadExt, AsyncWriteExt}; +use tokio::net::TcpStream; +use tokio::sync::{Mutex, OnceCell}; + +static DB: OnceCell = OnceCell::const_new(); +static LOCK: Mutex<()> = Mutex::const_new(()); + +async fn db() -> &'static Db { + DB.get_or_init(|| async { + let db = Db::open_temp().await.expect("打开 pglite 临时库失败"); + db.ensure_schema().await.expect("ensure_schema 失败"); + ensure_base(&db).await.expect("ensure_base 失败"); + first_seed(&db, "123456").await.expect("first_seed 失败"); + db + }) + .await +} + +async fn serve(state: AppState) -> u16 { + let listener = tokio::net::TcpListener::bind("127.0.0.1:0") + .await + .expect("绑定失败"); + let port = listener.local_addr().expect("取本地地址失败").port(); + let server = tokio::spawn(async move { + let _ = axum::serve(listener, build_app(state)).await; + }); + tokio::task::yield_now().await; + std::mem::forget(server); + port +} + +/// 面 B 请求(带 `Vue-Version: 3`)。 +async fn call( + port: u16, + method: &str, + path: &str, + token: &str, + body: Option<&str>, +) -> (String, Value) { + let mut stream = TcpStream::connect(("127.0.0.1", port)) + .await + .expect("连接失败"); + let payload = body.unwrap_or(""); + let req = format!( + "{method} {path} HTTP/1.1\r\n\ + Host: 127.0.0.1\r\n\ + Vue-Version: 3\r\n\ + App-Code: mainSystem\r\n\ + Authorization: {token}\r\n\ + Content-Type: application/json\r\n\ + Content-Length: {}\r\n\ + Connection: close\r\n\r\n{payload}", + payload.len() + ); + stream.write_all(req.as_bytes()).await.expect("写请求失败"); + let mut buf = Vec::new(); + tokio::time::timeout( + std::time::Duration::from_secs(10), + stream.read_to_end(&mut buf), + ) + .await + .expect("读响应超时") + .expect("读响应失败"); + let text = String::from_utf8_lossy(&buf).to_string(); + let (head, body) = text.split_once("\r\n\r\n").expect("响应必须有头体分隔"); + let status = head.lines().next().unwrap_or_default().to_string(); + let json: Value = serde_json::from_str(body.trim()).unwrap_or(Value::Null); + (status, json) +} + +async fn login(port: u16) -> String { + let enc = ssw_platform::platform::cipher::encrypt_password("123456"); + let payload = format!("account=admin&password={enc}"); + let mut stream = TcpStream::connect(("127.0.0.1", port)) + .await + .expect("连接失败"); + let req = format!( + "POST /api/oauth/Login HTTP/1.1\r\n\ + Host: 127.0.0.1\r\n\ + Vue-Version: 3\r\n\ + App-Code: mainSystem\r\n\ + Content-Type: application/x-www-form-urlencoded\r\n\ + Content-Length: {}\r\n\ + Connection: close\r\n\r\n{payload}", + payload.len() + ); + stream.write_all(req.as_bytes()).await.expect("写请求失败"); + let mut buf = Vec::new(); + tokio::time::timeout( + std::time::Duration::from_secs(10), + stream.read_to_end(&mut buf), + ) + .await + .expect("读响应超时") + .expect("读响应失败"); + let text = String::from_utf8_lossy(&buf).to_string(); + let (_, body) = text.split_once("\r\n\r\n").expect("响应必须有头体分隔"); + let json: Value = serde_json::from_str(body.trim()).expect("登录响应必须是 JSON"); + json["data"]["token"] + .as_str() + .expect("登录必须返回 token") + .to_string() +} + +fn new_state(db: &Db) -> AppState { + AppState { + config: Arc::new(Config::from_env(PathBuf::from("/tmp/ssw-platform-batch3-it"))), + db: Arc::new(db.clone()), + sessions: Arc::new(SessionStore::default()), + } +} + +/// 应用中心:列表形状 / 新建返回 enCode / 只改出现的键 / 置顶 / 删除 / 主系统禁删。 +#[tokio::test] +async fn app_center_crud_shape() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + + let (_, list) = call(port, "GET", "/api/system/System", &token, None).await; + assert_eq!(list["code"], 200, "{list}"); + assert!(list["data"]["list"].is_array(), "data 必须是 ListVO: {list}"); + assert!( + list["data"]["list"] + .as_array() + .unwrap() + .iter() + .all(|x| x["id"] != json!("mainSystem")), + "默认要排除主系统: {list}" + ); + + let body = json!({ + "fullName": "批次三验证应用", + "enCode": "batch3App", + "icon": "icon-ym icon-ym-app", + "sortCode": 96, + "enabledMark": 1, + }); + let (_, created) = call(port, "POST", "/api/system/System", &token, Some(&body.to_string())).await; + assert_eq!(created["code"], 200, "{created}"); + assert_eq!(created["data"], json!("batch3App"), "新建必须返回 enCode: {created}"); + + let (_, dup) = call(port, "POST", "/api/system/System", &token, Some(&body.to_string())).await; + assert_eq!(dup["code"], 400, "编码重复必须 400: {dup}"); + + let (_, list2) = call(port, "GET", "/api/system/System", &token, None).await; + let row = list2["data"]["list"] + .as_array() + .unwrap() + .iter() + .find(|x| x["enCode"] == json!("batch3App")) + .expect("新建的应用必须出现在列表") + .clone(); + assert!(row["hasUpdate"].is_i64() && row["hasDelete"].is_i64(), "必须是数字: {row}"); + assert!(row.get("creatorUserId").is_none() && row.get("isMain").is_none(), "不该暴露内部字段: {row}"); + let id = row["id"].as_str().unwrap().to_string(); + + // 🔴 只发 fullName ⇒ enCode 必须保持原值(「只 SET 出现的键」)。 + let (_, upd) = call( + port, + "PUT", + &format!("/api/system/System/{id}"), + &token, + Some(r#"{"fullName":"批次三验证应用改"}"#), + ) + .await; + assert_eq!(upd["code"], 200, "{upd}"); + let (_, info) = call(port, "GET", &format!("/api/system/System/{id}"), &token, None).await; + assert_eq!(info["data"]["fullName"], json!("批次三验证应用改"), "{info}"); + assert_eq!(info["data"]["enCode"], json!("batch3App"), "未提交的 enCode 被清了: {info}"); + + // 置顶 / 取消置顶 + let (_, top) = call( + port, + "POST", + "/api/system/System/actionTop", + &token, + Some(&json!({"id": id, "type": "appCenter", "actionType": 1}).to_string()), + ) + .await; + assert_eq!(top["code"], 200, "{top}"); + let (_, list3) = call(port, "GET", "/api/system/System", &token, None).await; + let row3 = list3["data"]["list"] + .as_array() + .unwrap() + .iter() + .find(|x| x["id"] == json!(id)) + .unwrap(); + assert_eq!(row3["isTop"], json!(true), "置顶后 isTop 必须是 true: {row3}"); + + let (_, untop) = call( + port, + "POST", + "/api/system/System/actionTop", + &token, + Some(&json!({"id": id, "type": "appCenter", "actionType": 0}).to_string()), + ) + .await; + assert_eq!(untop["code"], 200, "{untop}"); + let (_, list4) = call(port, "GET", "/api/system/System", &token, None).await; + let row4 = list4["data"]["list"] + .as_array() + .unwrap() + .iter() + .find(|x| x["id"] == json!(id)) + .unwrap(); + assert_eq!(row4["isTop"], json!(false), "取消置顶后 isTop 必须是 false: {row4}"); + + // 删除 + 主系统禁删 + let (_, del) = call(port, "DELETE", &format!("/api/system/System/{id}"), &token, None).await; + assert_eq!(del["code"], 200, "{del}"); + let (_, list5) = call(port, "GET", "/api/system/System", &token, None).await; + assert!( + list5["data"]["list"].as_array().unwrap().iter().all(|x| x["id"] != json!(id)), + "删除后不该再出现: {list5}" + ); + let (_, main_del) = call(port, "DELETE", "/api/system/System/mainSystem", &token, None).await; + assert_eq!(main_del["code"], 400, "主系统必须禁删: {main_del}"); +} + +/// 系统配置:键值表 PUT→GET 类型还原;第三方配置独立分类。 +#[tokio::test] +async fn sys_config_roundtrip() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + + let (_, got) = call(port, "GET", "/api/system/SysConfig", &token, None).await; + assert_eq!(got["code"], 200, "{got}"); + assert!(got["data"].is_object(), "data 必须是对象: {got}"); + assert!(got["data"].get("sysName").is_some(), "缺 sysName 默认值: {got}"); + + let put = json!({"sysName": "批次三平台", "singleLogin": 2, "logClean": false}); + let (_, saved) = call(port, "PUT", "/api/system/SysConfig", &token, Some(&put.to_string())).await; + assert_eq!(saved["code"], 200, "{saved}"); + + let (_, got2) = call(port, "GET", "/api/system/SysConfig", &token, None).await; + assert_eq!(got2["data"]["sysName"], json!("批次三平台"), "字符串丢了: {got2}"); + assert_eq!(got2["data"]["singleLogin"], json!(2), "数字被存成字符串了: {got2}"); + assert_eq!(got2["data"]["logClean"], json!(false), "布尔被存成字符串了: {got2}"); + + let socials = json!({"qyhCorpId": "corp-batch3", "qyhDisabled": true}); + let (_, s_saved) = call( + port, + "PUT", + "/api/system/SysConfig/socials", + &token, + Some(&socials.to_string()), + ) + .await; + assert_eq!(s_saved["code"], 200, "{s_saved}"); + let (_, s_got) = call(port, "GET", "/api/system/SysConfig/socials", &token, None).await; + assert_eq!(s_got["data"]["qyhCorpId"], json!("corp-batch3"), "{s_got}"); + assert_eq!(s_got["data"]["qyhDisabled"], json!(true), "{s_got}"); + + // 分类隔离:第三方配置不能串到系统参数里。 + let (_, got3) = call(port, "GET", "/api/system/SysConfig", &token, None).await; + assert!( + got3["data"].get("qyhCorpId").is_none(), + "SocialsConfig 串到 SysConfig 了: {got3}" + ); + + let (_, admins) = call(port, "GET", "/api/system/SysConfig/getAdminList", &token, None).await; + assert_eq!(admins["code"], 200, "{admins}"); + assert!( + admins["data"] + .as_array() + .map(|a| a.iter().any(|x| x["account"] == json!("admin"))) + .unwrap_or(false), + "管理员列表必须含 admin: {admins}" + ); +} + +/// 标签:应用中心页启动即调 `selector?enCode=AppTags` ⇒ 必须 200 且是 `ListVO`。 +#[tokio::test] +async fn tag_selector_and_crud() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + + let body = json!({"fullName": "批次三标签", "enCode": "AppTags", "icon": "icon-ym icon-ym-tag"}); + let (_, created) = call(port, "POST", "/api/system/Tag", &token, Some(&body.to_string())).await; + assert_eq!(created["code"], 200, "{created}"); + + let (_, dup) = call(port, "POST", "/api/system/Tag", &token, Some(&body.to_string())).await; + assert_eq!(dup["code"], 400, "同名标签必须 400: {dup}"); + + let (_, sel) = call(port, "GET", "/api/system/Tag/selector?enCode=AppTags", &token, None).await; + assert_eq!(sel["code"], 200, "{sel}"); + assert!(sel["data"]["list"].is_array(), "selector 必须是 ListVO: {sel}"); + let row = sel["data"]["list"] + .as_array() + .unwrap() + .iter() + .find(|x| x["enCode"] == json!("AppTags")) + .expect("新建的标签必须出现在 selector") + .clone(); + let id = row["id"].as_str().unwrap().to_string(); + + let (_, upd) = call( + port, + "PUT", + &format!("/api/system/Tag/{id}"), + &token, + Some(r#"{"fullName":"批次三标签改"}"#), + ) + .await; + assert_eq!(upd["code"], 200, "{upd}"); + let (_, info) = call(port, "GET", &format!("/api/system/Tag/{id}"), &token, None).await; + assert_eq!(info["data"]["fullName"], json!("批次三标签改"), "{info}"); + assert_eq!(info["data"]["enCode"], json!("AppTags"), "未提交的 enCode 被清了: {info}"); + + let (_, del) = call(port, "DELETE", &format!("/api/system/Tag/{id}"), &token, None).await; + assert_eq!(del["code"], 200, "{del}"); + let (_, sel2) = call(port, "GET", "/api/system/Tag/selector?enCode=AppTags", &token, None).await; + assert!( + sel2["data"]["list"].as_array().unwrap().is_empty(), + "删除后 selector 不该再有: {sel2}" + ); +} diff --git a/src/backend/tests/schema_upgrade_it.rs b/src/backend/tests/schema_upgrade_it.rs new file mode 100644 index 0000000..4745a1a --- /dev/null +++ b/src/backend/tests/schema_upgrade_it.rs @@ -0,0 +1,44 @@ +//! 老库补表(`Db::ensure_schema` 的增量分支)集成测试。 +//! +//! 🔴 **为什么必须单独一个测试二进制**:pglite-rs 0.2.7 是**进程级全局标志** +//! (一个进程只能开一个实例)⇒ 「先把表 DROP 掉再跑 ensure_schema」这种 +//! 破坏性动作不能和别的测试共用进程。 +//! +//! 🔴 **为什么需要这个分支**:`ensure_schema` 原先见到 `base_user` 就早退, +//! 于是 `schema.sql` 后加的表(`base_system_top` / `base_sys_config`)在**既有库**上 +//! 永远不会出现 ⇒ 新端点一跑就 `relation does not exist`。 +//! DDL 仍以 `schema.sql` 为唯一真源(不另写迁移脚本)。 + +use ssw_platform::platform::db::Db; + +async fn table_exists(db: &Db, name: &str) -> bool { + db.scalar_text(&format!("SELECT to_regclass('public.{name}')::text")) + .await + .expect("探表失败") + .is_some() +} + +#[tokio::test] +async fn ensure_schema_backfills_missing_tables() { + let db = Db::open_temp().await.expect("打开 pglite 临时库失败"); + db.ensure_schema().await.expect("首次 ensure_schema 失败"); + + for name in ["base_system_top", "base_sys_config"] { + assert!(table_exists(&db, name).await, "首次建库就该有 {name}"); + } + + // 模拟「v1 时代的库」:把后加的两张表删掉。 + for name in ["base_system_top", "base_sys_config"] { + db.exec(&format!("DROP TABLE {name}")).await.expect("DROP 失败"); + assert!(!table_exists(&db, name).await, "{name} 应已删除"); + } + + // 再跑一次 ⇒ 必须补回来(且不报「表已存在」)。 + db.ensure_schema().await.expect("增量 ensure_schema 失败"); + for name in ["base_system_top", "base_sys_config"] { + assert!(table_exists(&db, name).await, "{name} 没有被补回来"); + } + + // 幂等:再跑一次仍然成功。 + db.ensure_schema().await.expect("重复 ensure_schema 失败"); +}