refactor(platform): 契约面按官方模块名重组,去掉 face_* 序号式命名
影响: - 路由、响应形状、契约台账**零变化**(620 测试全绿,fe-gap 缺口 441/900 不变) - 官方模块名 ↔ 官方前端 `api/<模块>/**` 目录名一一对应,查缺口不用猜 改动: - 新增 `platform/compat/`:按官方模块拆成 system / permission / message / scheduletask / core + helper(公共底座:导入 / 通用工具 / 判别头 / 守卫 / 共享常量 / 菜单与用户信息构造) - `face_b.rs`(26578 行 / 371 端点)→ `platform/compat/` 六个模块文件 - `face_c.rs` 草稿暂不入库(onlineDev 未接线) - `platform/system.rs` → `platform/registry.rs`(多应用注册表,让位官方模块名) - `platform/permission.rs` → `platform/authorization.rs`(授权引擎,同上) 设计: - 不用 `jnpf/` 这一层 —— 本仓要弱化原厂概念,且 `check-naming.sh` 的 NM1 规则会把含原厂名的目录判为阻断 - 跨模块引用一律 `pub(super)`,不让契约面细节外泄到 crate 公共 API - impl 块跟随其类型走(否则 Rust 报「不能为 crate 外的类型定义 inherent impl」)
This commit is contained in:
1 parent
16b4a4b8b4
commit
1a41aed3b7
23 files changed
+9422
-9677
No files matched your search
+1
-1
@@ -1269,7 +1269,7 @@ xop run --secret GU=git_local_user --secret GP=git_local_pass -- bash -c '
|
||||
**按包顺序**执行 + 幂等(`CREATE TABLE IF NOT EXISTS`)。
|
||||
- 🔴 **`sspf-store` 的两处表数断言必须改成「不写死」**(`db.rs:1226,1233`)——
|
||||
写死 52 是批次 9/10 各踩一次的坑,改成「base 表数写死 + 业务表数 ≥ N」或直接读 `ddl_tables()` 对账。
|
||||
- 🔴 **`is_builtin_table`(`face_b.rs:12993`)取 `ddl_tables()`** ⇒ 业务包建的表会**自动变成内置表**
|
||||
- 🔴 **`is_builtin_table`(`platform/compat/system.rs:5879`)取 `ddl_tables()`** ⇒ 业务包建的表会**自动变成内置表**
|
||||
⇒ 数据建模页**看不到**用户自己建的表了。这条要**重新想**(本批至少要保证行为不回退)。
|
||||
- 🔴 `main.rs::whitelist_self_check` 的**双向对账**(孤儿 DDL / 漏建表)要改成
|
||||
「DDL = base 表 + **所有包**的表」,否则包表会被判成孤儿 DDL ⇒ 启动失败。
|
||||
|
||||
@@ -45,7 +45,7 @@ use crate::lowcode_crud::now_iso;
|
||||
use crate::lowcode_ddl;
|
||||
use crate::platform::config::Profile;
|
||||
use crate::platform::db::{pglite, Db};
|
||||
use crate::platform::system::MAIN_SYSTEM_ID;
|
||||
use crate::platform::registry::MAIN_SYSTEM_ID;
|
||||
|
||||
/// 示例功能在 `base_visual_dev` 里的**固定 id**。
|
||||
///
|
||||
|
||||
@@ -21,7 +21,7 @@ use crate::platform::entity::{ColumnSpec, EntitySpec};
|
||||
use crate::platform::envelope::ActionResult;
|
||||
use crate::platform::menu::MenuSpec;
|
||||
use crate::platform::state::AppState;
|
||||
use crate::platform::system;
|
||||
use crate::platform::registry;
|
||||
|
||||
/// `book_shop_book` 的列清单(**顺序 = 响应 JSON 的键序**)。
|
||||
const BOOK_COLUMNS: &[ColumnSpec] = &[
|
||||
@@ -113,7 +113,7 @@ pub const BOOK_MENU: MenuSpec = MenuSpec {
|
||||
menu_type: 2,
|
||||
icon: Some("app"),
|
||||
sort_code: 8,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
};
|
||||
|
||||
/// 本模块的 3 条路由(**业务层的路由表**)—— 钉子测试遍历它。
|
||||
|
||||
@@ -20,7 +20,7 @@ use crate::platform::crud::{handle_delete, handle_list, handle_save};
|
||||
use crate::platform::entity::{ColumnSpec, EntitySpec};
|
||||
use crate::platform::envelope::ActionResult;
|
||||
use crate::platform::menu::MenuSpec;
|
||||
use crate::platform::system;
|
||||
use crate::platform::registry;
|
||||
use crate::platform::state::AppState;
|
||||
|
||||
/// `demo_item` 的列清单(**顺序 = 响应 JSON 的键序**)。
|
||||
@@ -97,7 +97,7 @@ pub const DEMO_MENU: MenuSpec = MenuSpec {
|
||||
menu_type: 2,
|
||||
icon: Some("app"),
|
||||
sort_code: 6,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
};
|
||||
|
||||
/// 本模块的 3 条路由(**业务层的路由表**)—— 钉子测试遍历它。
|
||||
|
||||
@@ -20,7 +20,7 @@ use crate::platform::entity::{ColumnSpec, EntitySpec};
|
||||
use crate::platform::envelope::ActionResult;
|
||||
use crate::platform::menu::MenuSpec;
|
||||
use crate::platform::state::AppState;
|
||||
use crate::platform::system;
|
||||
use crate::platform::registry;
|
||||
|
||||
/// `shop_product` 的列清单(**顺序 = 响应 JSON 的键序**)。
|
||||
const PRODUCT_COLUMNS: &[ColumnSpec] = &[
|
||||
@@ -88,7 +88,7 @@ pub const PRODUCT_MENU: MenuSpec = MenuSpec {
|
||||
menu_type: 2,
|
||||
icon: Some("app"),
|
||||
sort_code: 7,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
};
|
||||
|
||||
/// 本模块的 3 条路由(**业务层的路由表**)—— 钉子测试遍历它。
|
||||
|
||||
@@ -21,10 +21,10 @@ use serde_json::{json, Value};
|
||||
use crate::platform::cipher::decrypt_to_md5;
|
||||
use crate::platform::db::pglite::ToSql;
|
||||
use crate::platform::envelope::{fail, ok, ActionResult};
|
||||
use crate::platform::permission::{build_menu_list, has_module};
|
||||
use crate::platform::authorization::{build_menu_list, has_module};
|
||||
use crate::platform::session::TokenUser;
|
||||
use crate::platform::state::AppState;
|
||||
use crate::platform::system;
|
||||
use crate::platform::registry;
|
||||
|
||||
/// token 有效期(秒)—— 契约 §6.1:恒为 `7200`。
|
||||
const TOKEN_EXPIRES_IN: i64 = 7200;
|
||||
@@ -333,8 +333,8 @@ pub(crate) fn parse_user_agent(ua: &str) -> (String, String) {
|
||||
/// (`JNPF_COMPAT_SURFACE.md` §3.1)⇒ **面 A 的形状一个字都不动**。
|
||||
pub async fn current_user(state: &AppState, headers: HeaderMap) -> Json<ActionResult> {
|
||||
// 🔴 判别头 = `Vue-Version: 3`(本仓前端唯一不发的官方头 ⇒ 零歧义)。
|
||||
if crate::platform::face_b::is_face_b(&headers) {
|
||||
return crate::platform::face_b::current_user(state, &headers).await;
|
||||
if crate::platform::compat::helper::is_face_b(&headers) {
|
||||
return crate::platform::compat::helper::current_user(state, &headers).await;
|
||||
}
|
||||
|
||||
let Some(user) = resolve_user(state, &headers) else {
|
||||
@@ -342,7 +342,7 @@ pub async fn current_user(state: &AppState, headers: HeaderMap) -> Json<ActionRe
|
||||
};
|
||||
|
||||
// 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 菜单树与守卫都按该系统隔离。
|
||||
let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await;
|
||||
let sys = registry::resolve_system(&state.db, registry::app_code_of(&headers).as_deref()).await;
|
||||
let menu_list = build_menu_list(&state.db, &user.user_id, user.is_admin, &sys.id).await;
|
||||
|
||||
ok(json!({
|
||||
@@ -400,7 +400,7 @@ pub async fn require_login_any(
|
||||
state: &AppState,
|
||||
headers: &HeaderMap,
|
||||
) -> Result<TokenUser, Json<ActionResult>> {
|
||||
if crate::platform::face_b::is_face_b(headers) {
|
||||
if crate::platform::compat::helper::is_face_b(headers) {
|
||||
require_login_face_b(state, headers).await
|
||||
} else {
|
||||
require_login(state, headers).await
|
||||
@@ -422,7 +422,7 @@ pub async fn require_module(
|
||||
) -> Result<TokenUser, Json<ActionResult>> {
|
||||
let user = require_login(state, headers).await?;
|
||||
let system_id =
|
||||
system::resolve_system_id(&state.db, system::app_code_of(headers).as_deref()).await;
|
||||
registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await;
|
||||
if has_module(&state.db, &user.user_id, user.is_admin, module_key, &system_id).await {
|
||||
Ok(user)
|
||||
} else {
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
//! permission —— 四源权限合并 + 管理员短路 + 未映射放行 + 菜单树。
|
||||
//! authorization —— 四源权限合并 + 管理员短路 + 未映射放行 + 菜单树。
|
||||
//!
|
||||
//! 契约:`docs/contract.md` §8.1(四源合并)/ §8.2(判定顺序)/ §8.3(菜单树)。
|
||||
//!
|
||||
//! 🔴 **为什么叫 `authorization` 而不是 `permission`**:本仓的**契约面**按官方模块名
|
||||
//! 组织(`compat/permission.rs` = 官方面 B 的 permission 端点集)。平台机制这一层
|
||||
//! 要用**语义名**区分开 —— 它管的是「授权判定引擎」,不是「权限端点」。
|
||||
//!
|
||||
//! 逐字对齐 react 参考实现 `ssw-jnpf-lite-react/src/backend/src/sys/permission.service.ts`
|
||||
//! (`resolveUserModuleIds` / `hasModule` / `buildMenuList` / `toTree`)。
|
||||
//!
|
||||
@@ -0,0 +1,45 @@
|
||||
//! core —— 官方面 B 的 **core** 端点集(`/api/oauth/*` 等框架级能力)。
|
||||
//!
|
||||
//! 🔴 官方前端 `src/api/core/**` 共 4 个文件(`auth` / `common` / `user` / `index`),
|
||||
//! 对应的是**框架自带**能力(登录 / 当前用户 / 公共字典),不是业务资源。
|
||||
//! 本仓能对齐的部分落在 `oauth` / 公共拉取这一层。
|
||||
//!
|
||||
//! 真源:官方 Java `jnpf-oauth` + `jnpf-public`。
|
||||
|
||||
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::HeaderMap;
|
||||
use axum::Json;
|
||||
use serde_json::{json, Value};
|
||||
use crate::platform::envelope::{ok, ActionResult};
|
||||
use crate::platform::auth::require_login_face_b;
|
||||
use crate::platform::state::AppState;
|
||||
/// `POST /api/oauth/Logout` —— 官方 `LoginController.java:155`。
|
||||
///
|
||||
/// 🔴 **未登录也返成功**:前端 `store/auth.ts:86` 把 `logoutApi()` 包在
|
||||
/// `try { … } catch { /* 不做任何处理 */ }` 里,**返回值完全被忽略**;
|
||||
/// 但它一旦是 **HTTP 404**,会走 `errorMessageResponseInterceptor` 弹一个红条。
|
||||
/// ⇒ 这里恒 `ok(null)`,无论有没有 token。
|
||||
///
|
||||
/// 🔴 **不改变服务端会话状态**:本仓 token 是进程内内存表(`platform/session.rs`),
|
||||
/// 没有 `revoke` 接口(接口 immutability 见 `SessionStore`)⇒ 登出即「客户端丢弃 token」,
|
||||
/// 服务端不做失效登记。这是**已知限制 B5**(`docs/known-limitations.md`)。
|
||||
pub async fn logout_handler(State(state): State<AppState>, headers: HeaderMap) -> Json<ActionResult> {
|
||||
// 鉴权结果刻意丢弃:有 token ⇒ 走一遍换取无效的分支也已经够了(无 remove 接口)。
|
||||
let _ = require_login_face_b(&state, &headers).await;
|
||||
ok(Value::Null)
|
||||
}
|
||||
|
||||
/// `GET /api/oauth/getLoginConfig` —— 登录页配置(**登录前**就拉 ⇒ 不能要 token)。
|
||||
///
|
||||
/// 🔴 前端 `views/_core/login/LoginForm.vue:160-163`:`res.data.redirect` ⇒ `data`
|
||||
/// 必须是**对象**(给 `null` 会 `Cannot read properties of null`)。
|
||||
pub async fn get_login_config() -> Json<ActionResult> {
|
||||
ok(json!({}))
|
||||
}
|
||||
|
||||
/// `GET /api/oauth/getConfig/{account}` —— 帐号的登录/锁屏配置(`user.ts:31`)。
|
||||
pub async fn get_user_config(Path(account): Path<String>) -> Json<ActionResult> {
|
||||
let _ = account.trim();
|
||||
ok(json!({}))
|
||||
}
|
||||
@@ -0,0 +1,902 @@
|
||||
//! helper —— 契约面的**公共底座**(导入 / 通用工具 / 判别 / 守卫 / 共享常量 /
|
||||
//! 菜单与用户信息构造)。
|
||||
//!
|
||||
//! 🔴 **为什么单独一个 `helper`**:契约面按官方模块拆开后,下列东西被**多个模块共用**
|
||||
//! —— 放任何一个模块里都会让别的模块反向依赖它 ⇒ 拆分的意义就没了。
|
||||
//! 典型:面 B 判别头 `is_face_b`(**全部** handler 都要过)、登录守卫 `guard`、
|
||||
//! 分页信封 `page_list`、SQL 参数拼装 `params_of`、菜单树构造 `build_menu_tree`、
|
||||
//! 当前用户信息 `build_user_info`。
|
||||
//!
|
||||
//! 🔴 **本文件不装业务知识**:只放「怎么把官方形状的请求变成响应」的基础设施。
|
||||
//! 真源:`JNPF_COMPAT_SURFACE.md`(§2.2 判别头 / §3 端点 / §4 码表)。
|
||||
|
||||
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use axum::body::Bytes;
|
||||
use axum::extract::{Path, RawQuery, State};
|
||||
use axum::http::HeaderMap;
|
||||
use axum::Json;
|
||||
use serde_json::{json, Map, Value};
|
||||
use crate::platform::envelope::{code, fail, ok, ActionResult};
|
||||
use crate::platform::db::{pglite, pglite::ToSql, Db};
|
||||
use crate::platform::auth::require_login_face_b;
|
||||
use crate::platform::auth::resolve_user;
|
||||
use crate::platform::crud::value_to_text;
|
||||
use crate::platform::authorization::has_en_code_permission;
|
||||
use crate::platform::authorization::resolve_user_module_ids;
|
||||
use crate::platform::session::TokenUser;
|
||||
use crate::platform::state::AppState;
|
||||
use crate::platform::registry;
|
||||
pub use sspf_contract::headers::VUE_VERSION;
|
||||
use super::system::{menu_node, official_view_path};
|
||||
use super::permission::{USER_DETAIL_COLUMNS, organize_name_of};
|
||||
/// 本仓的系统 id(`currentSystemId` / `userInfo.systemId` / 菜单 `systemId` 的兜底值)。
|
||||
///
|
||||
/// 🔴 单一真源在 [`crate::platform::registry`](`base_system.f_id`);这里只是别名,
|
||||
/// **不要另写一份字面量**——否则主系统 id 改一处漏一处。
|
||||
pub(super) const SYSTEM_ID: &str = registry::MAIN_SYSTEM_ID;
|
||||
|
||||
/// 本仓的系统编码(`userInfo.systemCode`)。
|
||||
///
|
||||
/// 🔴 官方常量 `JnpfConst.MAIN_SYSTEM_CODE = "mainSystem"`;前端也硬比较这个值
|
||||
/// (`systemCode === 'mainSystem'` 决定首页布局)⇒ 同样只做别名。
|
||||
pub const SYSTEM_CODE: &str = registry::MAIN_SYSTEM_CODE;
|
||||
|
||||
/// `@SaCheckPermission("permission.user")`。
|
||||
pub(super) const EN_USER: &str = "permission.user";
|
||||
|
||||
/// `@SaCheckPermission("permission.role")`。
|
||||
pub(super) const EN_ROLE: &str = "permission.role";
|
||||
|
||||
/// `@SaCheckPermission("permission.organize")`。
|
||||
pub(super) const EN_ORGANIZE: &str = "permission.organize";
|
||||
|
||||
/// `@SaCheckPermission("permission.menu")`。
|
||||
pub(super) const EN_MENU: &str = "permission.menu";
|
||||
|
||||
/// `@SaCheckPermission("permission.position")`。
|
||||
pub(super) const EN_POSITION: &str = "permission.position";
|
||||
|
||||
/// 🔴 `@SaCheckPermission("permission.identity")`(官方 `StandingController`)。
|
||||
pub(super) const EN_IDENTITY: &str = "permission.identity";
|
||||
|
||||
/// 🔴 `@SaCheckPermission("permission.authGroup")`(官方 `PermissionGroupController`)。
|
||||
pub(super) const EN_AUTH_GROUP: &str = "permission.authGroup";
|
||||
|
||||
/// 🔴 `@SaCheckPermission("permission.action")`。
|
||||
///
|
||||
/// 🔴 官方 `ActionController` 是 `{"permission.auth", "permission.role", "permission.action"}`
|
||||
/// 的 **SaMode.OR** 三选一;本仓的 `guard()` 只吃**一个**点权限码
|
||||
/// ⇒ 取**动作自己的**那个(最贴近语义)。
|
||||
pub(super) const EN_ACTION: &str = "permission.action";
|
||||
|
||||
/// 🔴 `@SaCheckPermission("msgCenter.notice")`(官方 `NoticeController` 的公告那半截)。
|
||||
///
|
||||
/// 🔴 **只有公告守它**;消息列表 / 全部已读 / 读消息 / 删记录 / 回执
|
||||
/// **都不带** `@SaCheckPermission` —— 登录即可用(谁看自己的消息都不该要授权)。
|
||||
pub(super) const EN_NOTICE: &str = "msgCenter.notice";
|
||||
|
||||
/// 菜单树的最大层数(防御 `f_parent_id` 被改成人为环时的无限递归)。
|
||||
pub(super) const MAX_TREE_DEPTH: usize = 32;
|
||||
|
||||
/// 🔴 **这个请求是不是「面 B」** —— 判别头 `Vue-Version: 3`。
|
||||
///
|
||||
/// **唯一的全局判别规则**(`JNPF_COMPAT_SURFACE.md` §2.2):
|
||||
/// ```text
|
||||
/// 请求头含 "Vue-Version: 3" ⇒ 走【面 B】官方形状
|
||||
/// 否则 ⇒ 走【面 A】ssw 形状
|
||||
/// ```
|
||||
pub fn is_face_b(headers: &HeaderMap) -> bool {
|
||||
// 判据真值源在契约层:MCP 适配器、后续插件都要用同一份判断,
|
||||
// 不许各自再写一遍 `Vue-Version == "3"`(写错一处就是两面串味)。
|
||||
sspf_contract::headers::is_face_b(headers)
|
||||
}
|
||||
|
||||
/// DB 报错 ⇒ 面 B 的 `500`(官方 `EXCEPTION`);真因只进服务端日志,**不外泄**。
|
||||
pub(super) fn db_error(e: pglite::Error, ctx: &str) -> Json<ActionResult> {
|
||||
eprintln!("[face-b] {ctx}失败: {e}");
|
||||
fail(code::EXCEPTION, "系统异常,请联系管理员")
|
||||
}
|
||||
|
||||
/// 解析 JSON body;失败 ⇒ `fail(400, "请求参数格式错误")`。
|
||||
///
|
||||
/// 🔴 **不用 axum 的 `Json<T>`**:它的解析失败会返回 **422 + 非信封 body** ⇒ 契约破。
|
||||
pub(super) fn parse_body(body: &Bytes) -> Result<Value, Json<ActionResult>> {
|
||||
match serde_json::from_slice::<Value>(body) {
|
||||
Ok(v) => Ok(v),
|
||||
Err(_) => Err(fail(code::FAIL, "请求参数格式错误")),
|
||||
}
|
||||
}
|
||||
|
||||
/// 分页参数(官方 `Pagination.java`:`pageSize` 默认 `20` / `currentPage` 默认 `1`)。
|
||||
pub(super) struct Paging {
|
||||
pub(super) current_page: i64,
|
||||
pub(super) page_size: i64,
|
||||
pub(super) offset: i64,
|
||||
}
|
||||
|
||||
impl Paging {
|
||||
/// 从 query 取分页参数;**缺失 / 非法 ⇒ 用官方默认值**(不报错)。
|
||||
pub(super) fn of(raw: &RawQuery) -> Self {
|
||||
let current_page = crate::platform::sys::query_param(raw, "currentPage")
|
||||
.trim()
|
||||
.parse::<i64>()
|
||||
.unwrap_or(1)
|
||||
.max(1);
|
||||
// 🔴 `pageSize` 夹在 `[1, 1000]` —— 防「pageSize=0」把 SQL 打成语法错、
|
||||
// 防超大值把整表拉进内存。
|
||||
let page_size = crate::platform::sys::query_param(raw, "pageSize")
|
||||
.trim()
|
||||
.parse::<i64>()
|
||||
.unwrap_or(20)
|
||||
.clamp(1, 1000);
|
||||
Self {
|
||||
current_page,
|
||||
page_size,
|
||||
offset: (current_page - 1) * page_size,
|
||||
}
|
||||
}
|
||||
|
||||
/// 从 **JSON body** 取分页参数(官方好几个「列表」是 `POST`,分页在 body 里 ——
|
||||
/// 例如 `POST /api/message/Notice/List`)。缺失 / 非法同样回落官方默认值。
|
||||
pub(super) fn of_body(obj: &Map<String, Value>) -> Self {
|
||||
let num = |key: &str| {
|
||||
obj.get(key)
|
||||
.and_then(|v| v.as_i64().or_else(|| v.as_str()?.trim().parse().ok()))
|
||||
};
|
||||
let current_page = num("currentPage").unwrap_or(1).max(1);
|
||||
// 🔴 同一道夹逼:`pageSize` 落在 `[1, 1000]`。
|
||||
let page_size = num("pageSize").unwrap_or(20).clamp(1, 1000);
|
||||
Self {
|
||||
current_page,
|
||||
page_size,
|
||||
offset: (current_page - 1) * page_size,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 官方 `PageListVO` —— `{pagination:{currentPage,pageSize,total}, list:[…]}`。
|
||||
///
|
||||
/// 🔴 **`data` 必须是对象**(不是裸数组)—— 官方 `PageListVO` 有 `pagination` + `list` 两个字段。
|
||||
pub(super) fn page_list(current_page: i64, page_size: i64, total: i64, list: Vec<Value>) -> Value {
|
||||
json!({
|
||||
"pagination": {
|
||||
"currentPage": current_page,
|
||||
"pageSize": page_size,
|
||||
"total": total,
|
||||
},
|
||||
"list": list,
|
||||
})
|
||||
}
|
||||
|
||||
/// 官方 `ListVO` —— `{list:[…]}`(**只有 `list` 一个字段**)。
|
||||
pub(super) fn list_vo(list: Vec<Value>) -> Value {
|
||||
json!({ "list": list })
|
||||
}
|
||||
|
||||
/// 绑定参数数组 ⇒ `&[&(dyn ToSql + Sync)]`(值一律按 text 传,类型转换交给 SQL 里的 CAST)。
|
||||
pub(super) fn params_of(values: &[Option<String>]) -> Vec<&(dyn ToSql + Sync)> {
|
||||
values.iter().map(|v| v as &(dyn ToSql + Sync)).collect()
|
||||
}
|
||||
|
||||
/// 面 B 的守卫:**登录(602)** + **点权限(`f_en_code` ⇒ 403)**。
|
||||
pub(super) async fn guard(
|
||||
state: &AppState,
|
||||
headers: &HeaderMap,
|
||||
en_code: &str,
|
||||
) -> Result<TokenUser, Json<ActionResult>> {
|
||||
let user = require_login_face_b(state, headers).await?;
|
||||
// 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 点权限判据限定在该系统。
|
||||
let system_id =
|
||||
registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await;
|
||||
if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await {
|
||||
Ok(user)
|
||||
} else {
|
||||
Err(fail(code::NO_PERMISSION, "无权限"))
|
||||
}
|
||||
}
|
||||
|
||||
/// 一行菜单(`AllMenuSelectVO` 那 15 个字段的原料)。
|
||||
pub(super) struct MenuRow {
|
||||
pub(super) id: String,
|
||||
pub(super) full_name: String,
|
||||
pub(super) en_code: Option<String>,
|
||||
pub(super) parent_id: String,
|
||||
pub(super) icon: Option<String>,
|
||||
pub(super) url_address: Option<String>,
|
||||
pub(super) page_address: Option<String>,
|
||||
pub(super) link_target: Option<String>,
|
||||
pub(super) menu_type: i64,
|
||||
pub(super) property_json: Option<String>,
|
||||
pub(super) sort_code: i64,
|
||||
pub(super) system_id: Option<String>,
|
||||
pub(super) is_data: bool,
|
||||
}
|
||||
|
||||
/// 菜单投影(面 B 专用)—— 🔴 **显式列出每一列并加 `AS "<camelCase>"` 别名**
|
||||
/// (PG 会把未加引号的标识符折叠成小写 ⇒ `row_to_json` 的键会变样且**静默**)。
|
||||
pub(super) const MENU_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \
|
||||
f_en_code AS \"enCode\", COALESCE(f_parent_id, '0') AS \"parentId\", \
|
||||
f_icon AS \"icon\", f_url_address AS \"urlAddress\", \
|
||||
f_page_address AS \"pageAddress\", f_link_target AS \"linkTarget\", \
|
||||
COALESCE(f_type, 2) AS \"type\", f_property_json AS \"propertyJson\", \
|
||||
COALESCE(f_sort_code, 0) AS \"sortCode\", f_system_id AS \"systemId\", \
|
||||
COALESCE(f_is_data_authorize, 0) AS \"isData\"";
|
||||
|
||||
/// 读当前用户**可见**的菜单行(未软删 + 四源合并过滤)。
|
||||
///
|
||||
/// 🔴 非管理员的可见集合来自 `resolve_user_module_ids`(四源合并:直授/角色/组织/岗位),
|
||||
/// 与面 A 的 `build_menu_list` **同一套判据** ⇒ 两个面看到的菜单集合一致。
|
||||
pub(super) async fn load_menus(db: &Db, user_id: &str, is_admin: i32, system_id: &str) -> Vec<MenuRow> {
|
||||
let sql = format!(
|
||||
"SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \
|
||||
AND f_system_id = $1::text \
|
||||
ORDER BY f_sort_code ASC, f_full_name ASC"
|
||||
);
|
||||
let rows = match db.query_json_params(&sql, &[&system_id]).await {
|
||||
Ok(rows) => rows,
|
||||
Err(e) => {
|
||||
eprintln!("[face-b] 菜单查询失败(按空菜单处理): {e}");
|
||||
return Vec::new();
|
||||
}
|
||||
};
|
||||
let mut items: Vec<MenuRow> = rows.iter().filter_map(parse_menu_row).collect();
|
||||
if is_admin != 1 {
|
||||
let visible = resolve_user_module_ids(db, user_id).await;
|
||||
items.retain(|m| visible.contains(&m.id));
|
||||
}
|
||||
items
|
||||
}
|
||||
|
||||
/// 一行 JSON ⇒ [`MenuRow`]。
|
||||
pub(super) fn parse_menu_row(row: &Value) -> Option<MenuRow> {
|
||||
let id = row["id"].as_str()?.to_string();
|
||||
if id.is_empty() {
|
||||
return None;
|
||||
}
|
||||
Some(MenuRow {
|
||||
id,
|
||||
full_name: row["fullName"].as_str().unwrap_or_default().to_string(),
|
||||
en_code: row["enCode"].as_str().map(str::to_string),
|
||||
// 🔴 react: `parentId: m.parentId || '0'` —— 空 ⇒ `'0'`。
|
||||
parent_id: match row["parentId"].as_str() {
|
||||
Some(p) if !p.is_empty() => p.to_string(),
|
||||
_ => "0".to_string(),
|
||||
},
|
||||
icon: row["icon"].as_str().map(str::to_string),
|
||||
url_address: row["urlAddress"].as_str().map(str::to_string),
|
||||
page_address: row["pageAddress"].as_str().map(str::to_string),
|
||||
link_target: row["linkTarget"].as_str().map(str::to_string),
|
||||
menu_type: row["type"].as_i64().unwrap_or(2),
|
||||
property_json: row["propertyJson"].as_str().map(str::to_string),
|
||||
sort_code: row["sortCode"].as_i64().unwrap_or(0),
|
||||
system_id: row["systemId"].as_str().map(str::to_string),
|
||||
is_data: row["isData"].as_i64().unwrap_or(0) != 0,
|
||||
})
|
||||
}
|
||||
|
||||
/// `f_property_json`(TEXT)⇒ JSON 值;空 / 非法 ⇒ `null`。
|
||||
fn parse_property_json(raw: Option<&str>) -> Value {
|
||||
let Some(text) = raw else {
|
||||
return Value::Null;
|
||||
};
|
||||
let trimmed = text.trim();
|
||||
if trimmed.is_empty() {
|
||||
return Value::Null;
|
||||
}
|
||||
serde_json::from_str::<Value>(trimmed).unwrap_or(Value::Null)
|
||||
}
|
||||
|
||||
/// 一个菜单节点 ⇒ 官方 `AllMenuSelectVO`(**15 个字段,一个不少**)。
|
||||
///
|
||||
/// 🔴 **键名与顺序照官方 `AllMenuSelectVO.java:12-50`**(`id` / `fullName` / `enCode` /
|
||||
/// `parentId` / `icon` / `hasChildren` / `urlAddress` / `pageAddress` / `linkTarget` /
|
||||
/// `children` / `type` / `propertyJson` / `sortCode` / `systemId` / `isData`)。
|
||||
pub(super) fn menu_value(row: MenuRow, children: Vec<Value>, has_children: bool) -> Value {
|
||||
let MenuRow {
|
||||
id,
|
||||
full_name,
|
||||
en_code,
|
||||
parent_id,
|
||||
icon,
|
||||
url_address,
|
||||
page_address,
|
||||
link_target,
|
||||
menu_type,
|
||||
property_json,
|
||||
sort_code,
|
||||
system_id,
|
||||
is_data,
|
||||
} = row;
|
||||
json!({
|
||||
"id": id,
|
||||
"fullName": full_name,
|
||||
"enCode": en_code,
|
||||
"parentId": parent_id,
|
||||
"icon": icon,
|
||||
"hasChildren": has_children,
|
||||
// 🔴 **面 B 的 `urlAddress` 必须是「官方前端的视图路径」**,不是库里的 `f_url_address`。
|
||||
// 前端 `packages/utils/src/helpers/generate-routes-backend.ts:71-92`:
|
||||
// `route.path = '/' + urlAddress`,且 `component = pageMap['/' + urlAddress + '/index.vue']`
|
||||
// (`pageMap` = `import.meta.glob('../views/**/*.vue'`)⇒ 值必须指向**真实 .vue 文件**。
|
||||
// 而库里的 `f_url_address`(`system/User`)是**面 A** 的守卫 key,官方前端没有
|
||||
// `views/system/User/index.vue` ⇒ 点了菜单永远 404。
|
||||
// 官方自己的口径就是「编码 ⇒ 路径」(同一文件 `:57` 对目录/应用用的是
|
||||
// `/${enCode.replaceAll('.', '/')}`)⇒ 这里对**所有类型**统一用同一条规则:
|
||||
// `permission.user` ⇒ `permission/user` ⇒ 命中 `views/permission/user/index.vue` ✅
|
||||
"urlAddress": official_view_path(en_code.as_deref(), url_address.as_deref()),
|
||||
"pageAddress": page_address,
|
||||
"linkTarget": link_target,
|
||||
"children": children,
|
||||
"type": menu_type,
|
||||
"propertyJson": parse_property_json(property_json.as_deref()),
|
||||
"sortCode": sort_code,
|
||||
// 🔴 种子菜单的 `f_system_id` 是 NULL ⇒ 兜底成本仓系统 id(单系统)。
|
||||
"systemId": system_id
|
||||
.filter(|s| !s.trim().is_empty())
|
||||
.unwrap_or_else(|| SYSTEM_ID.to_string()),
|
||||
"isData": is_data,
|
||||
})
|
||||
}
|
||||
|
||||
/// 建菜单树(根 = `parentId` 为空 / `'0'` / **父不在可见集合内**)。
|
||||
fn build_menu_tree(rows: Vec<MenuRow>) -> Vec<Value> {
|
||||
let visible: HashSet<String> = rows.iter().map(|m| m.id.clone()).collect();
|
||||
let mut by_parent: HashMap<String, Vec<MenuRow>> = HashMap::new();
|
||||
let mut roots: Vec<MenuRow> = Vec::new();
|
||||
for row in rows {
|
||||
if row.parent_id != "0" && visible.contains(&row.parent_id) {
|
||||
by_parent.entry(row.parent_id.clone()).or_default().push(row);
|
||||
} else {
|
||||
roots.push(row);
|
||||
}
|
||||
}
|
||||
roots
|
||||
.into_iter()
|
||||
.map(|row| menu_node(row, &mut by_parent, 0))
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// 官方 `PermissionModel` 列表 —— **每个可见菜单一条**。
|
||||
///
|
||||
/// 🔴 **官方语义**:`modelId` = **菜单 id**
|
||||
/// (官方前端 `views/common/dynamicModel/list/index.vue:739`:
|
||||
/// `permissionList.find(o => o.modelId === searchInfo.menuId)`)
|
||||
/// ⇒ 本仓按「菜单」给一条,`moduleName` = 菜单全名。
|
||||
///
|
||||
/// 🔴 `button` / `column` / `resource` / `form` **恒为空数组** —— 本仓**不实现**
|
||||
/// 按钮级权限(`base_module_button` / `_column` / `_form` / `_data` 都不做)
|
||||
/// ⇒ 官方前端的按钮会被过滤掉(**已知限制 B4**,`docs/known-limitations.md` §H)。
|
||||
fn build_permission_list(rows: &[MenuRow]) -> Vec<Value> {
|
||||
rows.iter()
|
||||
.map(|m| {
|
||||
json!({
|
||||
"modelId": m.id,
|
||||
"moduleName": m.full_name,
|
||||
"button": [],
|
||||
"column": [],
|
||||
"resource": [],
|
||||
"form": [],
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// `GET /api/oauth/CurrentUser` 的**面 B**分支 —— 官方 `PcUserVO` 形状。
|
||||
///
|
||||
/// 🔴 **顶层五个字段一个都不能少**(官方前端 `store/auth.ts:121` 逐个取用):
|
||||
/// `menuList` / `permissionList` / `userInfo` / `currentSystemId` / `sysConfigInfo`。
|
||||
///
|
||||
/// 🔴 未登录 ⇒ **`602`**(官方前端只对 `601`/`602` 清 token ⇒ 返 `600` 会卡住不跳登录)。
|
||||
pub async fn current_user(state: &AppState, headers: &HeaderMap) -> Json<ActionResult> {
|
||||
let Some(user) = resolve_user(state, headers) else {
|
||||
return fail(code::SESSION_ERROR, "登录状态已失效,请重新登录");
|
||||
};
|
||||
|
||||
// 🔴 多应用:按 `App-Code` 解析当前系统 ⇒ 菜单树 / userInfo / currentSystemId 都按该系统。
|
||||
let sys = registry::resolve_system(&state.db, registry::app_code_of(headers).as_deref()).await;
|
||||
let menus = load_menus(&state.db, &user.user_id, user.is_admin, &sys.id).await;
|
||||
let permission_list = build_permission_list(&menus);
|
||||
let menu_list = build_menu_tree(menus);
|
||||
let user_info = build_user_info(&state.db, &user, &sys.id, &sys.code).await;
|
||||
|
||||
ok(json!({
|
||||
"menuList": menu_list.clone(),
|
||||
"permissionList": permission_list,
|
||||
// 🔴 官方 `GetUserInfoModel`(`basic.d.ts:94-100`)声明了 `routerList` 但
|
||||
// **前端一处都没读**(`grep routerList` 在 app/packages 里 0 命中);
|
||||
// 为对齐类型仍给出同一棵树,避免将来有页面取值时拿到 undefined。
|
||||
"routerList": menu_list,
|
||||
"userInfo": user_info,
|
||||
"currentSystemId": sys.id,
|
||||
// 🔴 `sysConfigInfo` 返 **空对象**(不是 null)⇒ 官方前端 `baseStore.setSysConfig` 不炸。
|
||||
"sysConfigInfo": {},
|
||||
}))
|
||||
}
|
||||
|
||||
/// 官方 `UserCommonInfoVO`(15 个字段)。
|
||||
///
|
||||
/// 🔴 `isAdministrator` 在这里是 **布尔**(官方 `UserCommonInfoVO.java:75` 是 `Boolean`)——
|
||||
/// 而**列表项**里它是**数字**(官方 `UserListVO.java:60` 是 `Integer`)⇒ 两处**故意不同**。
|
||||
async fn build_user_info(db: &Db, user: &TokenUser, system_id: &str, system_code: &str) -> Value {
|
||||
let rows = match db
|
||||
.query_json_params(
|
||||
"SELECT f_real_name AS \"realName\", f_head_icon AS \"headIcon\", \
|
||||
f_organize_id AS \"organizeId\", f_position_id AS \"positionId\", \
|
||||
f_mobile_phone AS \"mobilePhone\", f_email AS \"email\", \
|
||||
f_gender AS \"gender\", f_role_id AS \"roleId\", f_group_id AS \"groupId\", \
|
||||
f_secretkey AS \"secretKey\", f_manager_id AS \"manager\", \
|
||||
(EXTRACT(EPOCH FROM f_birthday) * 1000)::bigint AS \"birthday\", \
|
||||
(EXTRACT(EPOCH FROM f_prev_log_time) * 1000)::bigint AS \"prevLoginTime\", \
|
||||
f_prev_log_ip AS \"prevLoginIp\" \
|
||||
FROM base_user WHERE f_id = $1::text AND f_delete_mark = 0 LIMIT 1",
|
||||
&[&user.user_id],
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(rows) => rows,
|
||||
Err(e) => {
|
||||
eprintln!("[face-b] 读用户信息失败: {e}");
|
||||
Vec::new()
|
||||
}
|
||||
};
|
||||
let row = rows.first();
|
||||
let real_name = row
|
||||
.and_then(|r| r["realName"].as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.unwrap_or(user.account.as_str())
|
||||
.to_string();
|
||||
let head_icon = row.and_then(|r| r["headIcon"].as_str()).map(str::to_string);
|
||||
let organize_id = row
|
||||
.and_then(|r| r["organizeId"].as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string);
|
||||
let position_id = row
|
||||
.and_then(|r| r["positionId"].as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string);
|
||||
let prev_login_time = row.and_then(|r| r["prevLoginTime"].as_i64());
|
||||
let prev_login_ip = row
|
||||
.and_then(|r| r["prevLoginIp"].as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string);
|
||||
let organize_name = match organize_id.as_deref() {
|
||||
Some(id) => organize_name_of(db, id).await,
|
||||
None => None,
|
||||
};
|
||||
// 🔴 `f_role_id` / `f_group_id` 是 TEXT(官方历史遗留,逗号分隔)⇒ 拆成数组。
|
||||
// 官方 `UserInfo` 把 `roleIds` / `groupIds` / `organizeIds` 声明成**非可选数组**,
|
||||
// 前端 store 会直接遍历 ⇒ 缺键或给 null 都可能崩,这里一律给空数组兜底。
|
||||
let text_of = |key: &str| {
|
||||
row.and_then(|r| r[key].as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string)
|
||||
};
|
||||
let split_ids = |key: &str| -> Vec<String> {
|
||||
text_of(key)
|
||||
.map(|s| {
|
||||
s.split(',')
|
||||
.map(str::trim)
|
||||
.filter(|x| !x.is_empty())
|
||||
.map(str::to_string)
|
||||
.collect()
|
||||
})
|
||||
.unwrap_or_default()
|
||||
};
|
||||
let role_ids = split_ids("roleId");
|
||||
let group_ids = split_ids("groupId");
|
||||
let organize_ids: Vec<String> = organize_id.iter().cloned().collect();
|
||||
let organize_list_vo: Vec<Value> = organize_id
|
||||
.as_ref()
|
||||
.map(|id| {
|
||||
vec![json!({
|
||||
"id": id,
|
||||
"fullName": organize_name.clone().unwrap_or_default(),
|
||||
})]
|
||||
})
|
||||
.unwrap_or_default();
|
||||
|
||||
json!({
|
||||
"userId": user.user_id,
|
||||
"userAccount": user.account,
|
||||
"userName": real_name,
|
||||
"headIcon": head_icon,
|
||||
// ---- 以下为官方 `UserInfo`(`basic.d.ts:52-92`)的完整字段集 ----
|
||||
// 🔴 该类型里 `roleIds` / `groupIds` / `organizeIds` / `positionIds` /
|
||||
// `organizeList` / `positionList` / `standingList` 都是**非可选数组** ⇒
|
||||
// 必须给 [](缺键会让前端 store 遍历时崩)。
|
||||
"gender": text_of("gender"),
|
||||
"birthday": row.and_then(|r| r["birthday"].as_i64()),
|
||||
"mobilePhone": text_of("mobilePhone"),
|
||||
"email": text_of("email"),
|
||||
"manager": text_of("manager"),
|
||||
"organizeId": organize_id,
|
||||
"organizeIds": organize_ids,
|
||||
"organizeName": organize_name,
|
||||
"organizeList": organize_list_vo,
|
||||
"positionId": position_id,
|
||||
// 🔴 本仓**没有**岗位表(`base_position` 不在 v1 范围)⇒ 恒空。
|
||||
"positionIds": Vec::<String>::new(),
|
||||
"positionList": Vec::<Value>::new(),
|
||||
"positionName": Value::Null,
|
||||
"roleIds": role_ids,
|
||||
"roleName": Value::Null,
|
||||
"groupIds": group_ids,
|
||||
"standingList": Vec::<Value>::new(),
|
||||
"portalId": Value::Null,
|
||||
"departmentId": Value::Null,
|
||||
"departmentName": Value::Null,
|
||||
"systemId": system_id,
|
||||
"systemCode": system_code,
|
||||
"systemName": if system_code == SYSTEM_CODE { "系统平台" } else { "" },
|
||||
"systemColor": "",
|
||||
"systemIcon": "",
|
||||
"securityKey": text_of("secretKey").unwrap_or_default(),
|
||||
"signId": "",
|
||||
"signImg": "",
|
||||
"saasAppId": "",
|
||||
"saasAppName": "",
|
||||
// 🔴 前端 `store/auth.ts:143` 的 `handleUpdatePreferences`:
|
||||
// `if (userInfo.preferenceJson) preferenceJson = JSON.parse(userInfo.preferenceJson)`
|
||||
// ⇒ **空串会被判假** ⇒ 保留前端自带的 `defaultPreferencesConfig`;
|
||||
// 而给 `"{}"` 会被 parse 成空对象 ⇒ `updatePreferences({})` 把整套偏好清空
|
||||
// ⇒ `app.locale` / `app.defaultHomePath` 全丢 ⇒ 抛错 ⇒ `fetchUserInfo` 进 catch
|
||||
// ⇒ 立刻 logout(**登录页原地打转的真正原因**,排查了两个小时的那条)。
|
||||
// ⇒ 必须是**字符串**,且必须是**空串**(不是 `"{}"`)。
|
||||
"preferenceJson": "",
|
||||
// 🔴 官方 `prevLogin`:1 = 上次登录 / 2 = 本次登录。本仓不区分 ⇒ 恒 1。
|
||||
"prevLogin": 1,
|
||||
"prevLoginTime": prev_login_time,
|
||||
"prevLoginIPAddress": prev_login_ip,
|
||||
"prevLoginIPAddressName": Value::Null,
|
||||
"isAdministrator": user.is_admin == 1,
|
||||
})
|
||||
}
|
||||
|
||||
/// 取 body 里的 id 数组(`{ids:[…]}` / `{ids:"a,b"}` 都认)。
|
||||
///
|
||||
/// 🔴 非数组 ⇒ **空集合**(官方批量接口对空集合返回成功,不报错)。
|
||||
/// 取 `obj[key]` 的字符串 id 数组(数组或逗号串都收;空 ⇒ 空数组)。
|
||||
pub(super) fn id_list_of(obj: &Map<String, Value>, key: &str) -> Vec<String> {
|
||||
match obj.get(key) {
|
||||
Some(Value::Array(items)) => items
|
||||
.iter()
|
||||
.filter_map(|v| match v {
|
||||
Value::String(s) if !s.is_empty() => Some(s.clone()),
|
||||
Value::Number(n) => Some(n.to_string()),
|
||||
_ => None,
|
||||
})
|
||||
.collect(),
|
||||
Some(Value::String(s)) if !s.is_empty() => {
|
||||
s.split(',').map(|x| x.trim().to_string()).collect()
|
||||
}
|
||||
_ => Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn id_list(obj: &Map<String, Value>) -> Vec<String> {
|
||||
match obj.get("ids") {
|
||||
Some(Value::Array(items)) => items
|
||||
.iter()
|
||||
.filter_map(|v| match v {
|
||||
Value::String(s) if !s.is_empty() => Some(s.clone()),
|
||||
Value::Number(n) => Some(n.to_string()),
|
||||
_ => None,
|
||||
})
|
||||
.collect(),
|
||||
Some(Value::String(s)) if !s.is_empty() => {
|
||||
s.split(',').map(|x| x.trim().to_string()).collect()
|
||||
}
|
||||
_ => Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
/// `$1::text::integer` 这种占位符(**统一走 text 传值,类型交给 SQL 里的 CAST**)。
|
||||
pub(super) fn placeholder(index: usize, cast: &str) -> String {
|
||||
format!("${index}::text{cast}")
|
||||
}
|
||||
|
||||
/// `GET /api/permission/Users/{id}` —— 单条详情(编辑弹窗)。
|
||||
///
|
||||
/// ⚠️ **`{id}` 会吞掉所有「`Users/` 下一段的静态 GET」**(`Selector` / `getWorkByUser` /
|
||||
/// `getUserList` …):它们现在会落到这里、返 `400 用户不存在`,而不是 404。
|
||||
/// matchit 的口径是**静态段优先** ⇒ 一旦把那些路由注册进来,自动夺回,无需改这里。
|
||||
pub async fn user_info(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
Path(id): Path<String>,
|
||||
) -> Json<ActionResult> {
|
||||
if let Err(resp) = guard(&state, &headers, EN_USER).await {
|
||||
return resp;
|
||||
}
|
||||
let id = id.trim().to_string();
|
||||
let sql = format!(
|
||||
"SELECT {USER_DETAIL_COLUMNS} FROM base_user \
|
||||
WHERE f_id = $1::text AND f_delete_mark = 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, "用户不存在"),
|
||||
}
|
||||
}
|
||||
|
||||
/// 用户选择器的投影(`QueryUserSelect` 要 `id` + `fullName`,多选还要 `headIcon`)。
|
||||
pub(super) const USER_SELECTOR_PROJECTION: &str = "f_id AS \"id\", f_real_name AS \"fullName\", \
|
||||
f_account AS \"account\", f_head_icon AS \"headIcon\", \
|
||||
f_organize_id AS \"organizeId\", f_gender AS \"gender\"";
|
||||
|
||||
/// 批量取「姓名/账号」标签(官方 `realName + "/" + account`)。
|
||||
///
|
||||
/// 🔴 **按 `f_id` 与 `f_account` 双键建表**:本仓写 `f_creator_user_id` 时用的是**账号**
|
||||
/// (见 `seed.rs` 的 `ADMIN_ACCOUNT`),而官方的历史数据里是 **id**
|
||||
/// ⇒ 只按其中一种查,另一种就永远显示空。两种都收,key 也两样都放。
|
||||
pub(super) async fn user_labels(state: &AppState, ids: &[String]) -> HashMap<String, String> {
|
||||
let mut unique: Vec<String> = ids.iter().filter(|s| !s.is_empty()).cloned().collect();
|
||||
unique.sort();
|
||||
unique.dedup();
|
||||
if unique.is_empty() {
|
||||
return HashMap::new();
|
||||
}
|
||||
let joined = unique.join(",");
|
||||
match state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\", f_real_name AS \"realName\", f_account AS \"account\" \
|
||||
FROM base_user \
|
||||
WHERE f_id = ANY(string_to_array($1::text, ',')) \
|
||||
OR f_account = ANY(string_to_array($1::text, ','))",
|
||||
&[&joined],
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(rows) => {
|
||||
let mut map = HashMap::new();
|
||||
for row in rows {
|
||||
let id = row
|
||||
.get("id")
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or_default()
|
||||
.to_string();
|
||||
let account = row.get("account").and_then(Value::as_str).unwrap_or("");
|
||||
let name = row
|
||||
.get("realName")
|
||||
.and_then(Value::as_str)
|
||||
.filter(|s| !s.is_empty())
|
||||
.unwrap_or(account);
|
||||
let label = if account.is_empty() || name == account {
|
||||
name.to_string()
|
||||
} else {
|
||||
format!("{name}/{account}")
|
||||
};
|
||||
if !id.is_empty() {
|
||||
map.insert(id, label.clone());
|
||||
}
|
||||
if !account.is_empty() {
|
||||
map.insert(account.to_string(), label);
|
||||
}
|
||||
}
|
||||
map
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("[face-b] 用户标签查询失败(降级为空): {e}");
|
||||
HashMap::new()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 面 B 的「任一权限」守卫 —— 官方用 `@SaCheckPermission(..., mode = SaMode.OR)` 的地方。
|
||||
pub(super) async fn guard_any(
|
||||
state: &AppState,
|
||||
headers: &HeaderMap,
|
||||
en_codes: &[&str],
|
||||
) -> Result<TokenUser, Json<ActionResult>> {
|
||||
let user = require_login_face_b(state, headers).await?;
|
||||
let system_id =
|
||||
registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await;
|
||||
for en_code in en_codes {
|
||||
if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await
|
||||
{
|
||||
return Ok(user);
|
||||
}
|
||||
}
|
||||
Err(fail(code::NO_PERMISSION, "无权限"))
|
||||
}
|
||||
|
||||
/// JSON 对象里取文本(**去首尾空白**,空串 ⇒ `None`)。
|
||||
pub(super) fn text_field(obj: &Map<String, Value>, key: &str) -> Option<String> {
|
||||
let raw = value_to_text(obj.get(key))?;
|
||||
let trimmed = raw.trim();
|
||||
if trimmed.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(trimmed.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
/// JSON 对象里取整数(`1` / `"1"` / `true` 都认)—— 用于 `::text::integer` 参数位。
|
||||
///
|
||||
/// 🔴 不能把 JSON 数字直接 `value_to_text` 后当参数:`1.0` 会变成 `"1.0"`,
|
||||
/// `'1.0'::text::integer` 在 PG 里是**硬错误**(`invalid input syntax`)。
|
||||
pub(super) fn int_field(obj: &Map<String, Value>, key: &str) -> Option<i64> {
|
||||
match obj.get(key)? {
|
||||
Value::Number(n) => n.as_i64().or_else(|| n.as_f64().map(|f| f as i64)),
|
||||
Value::String(s) => s.trim().parse::<i64>().ok(),
|
||||
Value::Bool(b) => Some(i64::from(*b)),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// 取 query 里的字符串参数(去空白)。
|
||||
pub(super) fn qv(raw: &RawQuery, key: &str) -> String {
|
||||
crate::platform::sys::query_param(raw, key).trim().to_string()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn headers_with(vue_version: Option<&str>) -> HeaderMap {
|
||||
let mut headers = HeaderMap::new();
|
||||
if let Some(v) = vue_version {
|
||||
headers.insert(
|
||||
VUE_VERSION,
|
||||
axum::http::HeaderValue::from_str(v).expect("头值必须是合法 ASCII"),
|
||||
);
|
||||
}
|
||||
headers
|
||||
}
|
||||
|
||||
/// 🔴 **判别规则只有一条**:头 `Vue-Version: 3` ⇒ 面 B;否则面 A。
|
||||
#[test]
|
||||
fn discriminator_is_vue_version_header() {
|
||||
assert!(is_face_b(&headers_with(Some("3"))));
|
||||
assert!(!is_face_b(&headers_with(None)));
|
||||
// 🔴 本仓前端也发 `App-Code` / `Jnpf-Origin` ⇒ **不能**拿它们当判据。
|
||||
let mut headers = headers_with(None);
|
||||
headers.insert("app-code", axum::http::HeaderValue::from_static("mainSystem"));
|
||||
headers.insert("jnpf-origin", axum::http::HeaderValue::from_static("pc"));
|
||||
assert!(!is_face_b(&headers), "App-Code / Jnpf-Origin 绝不能当判别头");
|
||||
}
|
||||
|
||||
/// 头值带空格也应识别(HTTP 头值两侧空白无意义)。
|
||||
#[test]
|
||||
fn discriminator_ignores_surrounding_whitespace() {
|
||||
assert!(is_face_b(&headers_with(Some(" 3 "))));
|
||||
}
|
||||
|
||||
/// 头值不是 `3`(如 `2`)⇒ 不是面 B。
|
||||
#[test]
|
||||
fn discriminator_rejects_other_values() {
|
||||
assert!(!is_face_b(&headers_with(Some("2"))));
|
||||
assert!(!is_face_b(&headers_with(Some(""))));
|
||||
}
|
||||
|
||||
/// 🔴 **官方 `PageListVO` 形状**:`{pagination:{currentPage,pageSize,total}, list:[…]}`。
|
||||
#[test]
|
||||
fn page_list_vo_has_pagination_and_list() {
|
||||
let v = page_list(2, 20, 42, vec![json!({"id": "u1"})]);
|
||||
assert_eq!(v["pagination"]["currentPage"], 2);
|
||||
assert_eq!(v["pagination"]["pageSize"], 20);
|
||||
assert_eq!(v["pagination"]["total"], 42);
|
||||
assert!(v["list"].is_array());
|
||||
assert_eq!(v["list"][0]["id"], "u1");
|
||||
}
|
||||
|
||||
/// 🔴 **官方 `ListVO` 形状**:`{list:[…]}`(**只有** `list` 一个字段)。
|
||||
#[test]
|
||||
fn list_vo_has_only_list() {
|
||||
let v = list_vo(vec![json!({"id": "m1"})]);
|
||||
assert!(v.get("list").is_some());
|
||||
assert!(v.get("pagination").is_none());
|
||||
assert_eq!(v.as_object().map(|o| o.len()), Some(1));
|
||||
}
|
||||
|
||||
/// 分页参数:缺省 ⇒ 官方默认(`pageSize=20` / `currentPage=1`)。
|
||||
#[test]
|
||||
fn paging_defaults_to_official_values() {
|
||||
let raw = RawQuery(None);
|
||||
let p = Paging::of(&raw);
|
||||
assert_eq!(p.current_page, 1);
|
||||
assert_eq!(p.page_size, 20);
|
||||
assert_eq!(p.offset, 0);
|
||||
}
|
||||
|
||||
/// 分页参数:回显请求值;`pageSize=0` / 负数 ⇒ 夹到 1(不生成非法 SQL)。
|
||||
#[test]
|
||||
fn paging_echoes_and_clamps() {
|
||||
let raw = RawQuery(Some("currentPage=3&pageSize=5".to_string()));
|
||||
let p = Paging::of(&raw);
|
||||
assert_eq!(p.current_page, 3);
|
||||
assert_eq!(p.page_size, 5);
|
||||
assert_eq!(p.offset, 10);
|
||||
|
||||
let raw = RawQuery(Some("pageSize=0¤tPage=-1".to_string()));
|
||||
let p = Paging::of(&raw);
|
||||
assert_eq!(p.current_page, 1);
|
||||
assert_eq!(p.page_size, 1);
|
||||
}
|
||||
|
||||
/// 🔴 **菜单节点必须齐 15 个官方字段**(`AllMenuSelectVO.java:12-50`)。
|
||||
#[test]
|
||||
fn menu_node_has_all_15_official_keys() {
|
||||
let row = MenuRow {
|
||||
id: "m1".to_string(),
|
||||
full_name: "用户管理".to_string(),
|
||||
en_code: Some("permission.user".to_string()),
|
||||
parent_id: "0".to_string(),
|
||||
icon: None,
|
||||
url_address: Some("system/User".to_string()),
|
||||
page_address: None,
|
||||
link_target: None,
|
||||
menu_type: 2,
|
||||
property_json: None,
|
||||
sort_code: 2,
|
||||
system_id: None,
|
||||
is_data: false,
|
||||
};
|
||||
let v = menu_value(row, Vec::new(), false);
|
||||
for key in [
|
||||
"id",
|
||||
"fullName",
|
||||
"enCode",
|
||||
"parentId",
|
||||
"icon",
|
||||
"hasChildren",
|
||||
"urlAddress",
|
||||
"pageAddress",
|
||||
"linkTarget",
|
||||
"children",
|
||||
"type",
|
||||
"propertyJson",
|
||||
"sortCode",
|
||||
"systemId",
|
||||
"isData",
|
||||
] {
|
||||
assert!(v.get(key).is_some(), "面 B 菜单节点必须含键 {key}");
|
||||
}
|
||||
// 🔴 `systemId` 为 NULL ⇒ 兜底成本仓系统 id(单系统)。
|
||||
assert_eq!(v["systemId"], SYSTEM_ID);
|
||||
assert_eq!(v["isData"], false);
|
||||
assert_eq!(v["children"].as_array().map(|a| a.len()), Some(0));
|
||||
}
|
||||
|
||||
/// `propertyJson`:空 ⇒ `null`;合法 JSON ⇒ 解析;非法 ⇒ `null`。
|
||||
#[test]
|
||||
fn property_json_is_parsed_or_null() {
|
||||
assert_eq!(parse_property_json(None), Value::Null);
|
||||
assert_eq!(parse_property_json(Some(" ")), Value::Null);
|
||||
assert_eq!(parse_property_json(Some("{\"a\":1}"))["a"], 1);
|
||||
assert_eq!(parse_property_json(Some("not json")), Value::Null);
|
||||
}
|
||||
|
||||
/// 🔴 **`permissionList` 的 `modelId` 是菜单 id**(官方语义:`find(o => o.modelId === menuId)`)。
|
||||
#[test]
|
||||
fn permission_list_model_id_is_menu_id() {
|
||||
let rows = vec![MenuRow {
|
||||
id: "m_user".to_string(),
|
||||
full_name: "用户管理".to_string(),
|
||||
en_code: Some("permission.user".to_string()),
|
||||
parent_id: "m_sys".to_string(),
|
||||
icon: None,
|
||||
url_address: None,
|
||||
page_address: None,
|
||||
link_target: None,
|
||||
menu_type: 2,
|
||||
property_json: None,
|
||||
sort_code: 2,
|
||||
system_id: None,
|
||||
is_data: false,
|
||||
}];
|
||||
let list = build_permission_list(&rows);
|
||||
assert_eq!(list.len(), 1);
|
||||
assert_eq!(list[0]["modelId"], "m_user");
|
||||
assert_eq!(list[0]["moduleName"], "用户管理");
|
||||
for key in ["button", "column", "resource", "form"] {
|
||||
assert_eq!(list[0][key].as_array().map(|a| a.len()), Some(0));
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,24 @@
|
||||
//! compat —— **契约面**(官方兼容端点),按官方模块名组织。
|
||||
//!
|
||||
//! 🔴 **命名依据**:官方前端 `src/api/<模块>/**` 的目录名。
|
||||
//! 这样「缺口表 ↔ 代码位置 ↔ 官方出处」三者一一对应,查缺口时不用猜。
|
||||
//!
|
||||
//! | 模块 | 官方前端目录 | 路径前缀 |
|
||||
//! |---|---|---|
|
||||
//! | `system` | `api/system/**` | `/api/system/*` |
|
||||
//! | `permission` | `api/permission/**` | `/api/permission/*` |
|
||||
//! | `message` | `api/**`(businessCategory / message / notice) | `/api/message/*` |
|
||||
//! | `scheduletask` | `api/system/task.ts` | `/api/scheduletask/*` |
|
||||
//! | `core` | `api/core/**` | `/api/oauth/*` 等 |
|
||||
//! | `online_dev` | `api/onlineDev/**` | `/api/onlineDev/*`、`/api/Report/*` |
|
||||
//! | `work_flow` | `api/workFlow/**` | `/api/workflow/*` |
|
||||
//!
|
||||
//! 🔴 **`helper` 不是官方模块**:它是契约面的**公共底座**(导入 / 通用工具 /
|
||||
//! 判别头 / 守卫 / 共享常量 / 菜单与用户信息构造),被多个官方模块共用。
|
||||
|
||||
pub mod helper;
|
||||
pub mod system;
|
||||
pub mod permission;
|
||||
pub mod message;
|
||||
pub mod scheduletask;
|
||||
pub mod core;
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,427 @@
|
||||
//! scheduletask —— 官方面 B 的 **scheduletask** 端点集(`/api/scheduletask/*`)。
|
||||
//!
|
||||
//! 真源:官方 Java `jnpf-scheduletask` + 官方前端 `src/api/system/task.ts`。
|
||||
|
||||
|
||||
use axum::body::Bytes;
|
||||
use axum::extract::{Path, RawQuery, State};
|
||||
use axum::http::HeaderMap;
|
||||
use axum::Json;
|
||||
use serde_json::{json, Map, Value};
|
||||
use crate::platform::envelope::{code, fail, ok, ActionResult};
|
||||
use crate::platform::ids::new_uuid;
|
||||
use crate::platform::state::AppState;
|
||||
use super::helper::{Paging, db_error, guard, int_field, page_list, params_of, parse_body, text_field};
|
||||
/// 官方 `@SaCheckPermission("sysService.task")`(任务调度)。
|
||||
const EN_TASK: &str = "sysService.task";
|
||||
|
||||
/// 任务列表投影。
|
||||
const TASK_LIST_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \
|
||||
COALESCE(f_en_code, '') AS \"enCode\", COALESCE(f_execute_type, 1)::bigint AS \"executeType\", \
|
||||
COALESCE(f_run_count, 0)::bigint AS \"runCount\", \
|
||||
COALESCE(f_enabled_mark, 0)::bigint AS \"enabledMark\", \
|
||||
COALESCE(f_sort_code, 0)::bigint AS \"sortCode\", f_description AS \"description\", \
|
||||
(EXTRACT(EPOCH FROM f_last_run_time) * 1000)::bigint AS \"lastRunTime\", \
|
||||
(EXTRACT(EPOCH FROM f_next_run_time) * 1000)::bigint AS \"nextRunTime\", \
|
||||
COALESCE(f_execute_content, '') AS \"executeContentRaw\"";
|
||||
|
||||
/// `f_execute_content` 是 TEXT,内容约定是 JSON 对象(官方前端提交的就是对象)。
|
||||
///
|
||||
/// 解析不出来时**不丢数据**:包成 `{"cron": <原文>}`,至少还能回显。
|
||||
fn exec_content_object(raw: &str) -> Map<String, Value> {
|
||||
let text = raw.trim();
|
||||
if text.is_empty() {
|
||||
return Map::new();
|
||||
}
|
||||
match serde_json::from_str::<Value>(text) {
|
||||
Ok(Value::Object(obj)) => obj,
|
||||
Ok(other) => {
|
||||
let mut obj = Map::new();
|
||||
obj.insert("cron".to_string(), other);
|
||||
obj
|
||||
}
|
||||
Err(_) => {
|
||||
let mut obj = Map::new();
|
||||
obj.insert("cron".to_string(), json!(text));
|
||||
obj
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 把一行任务摊平成列表项:`executeContent` 里的 `startTime` / `endTime` **提到顶层**。
|
||||
///
|
||||
/// 🔴 官方列表的 `startTime` / `endTime` 来自 XXL-JOB 的调度配置;本仓登记在
|
||||
/// `executeContent` 里 ⇒ 必须提出来,否则前端那一列表头永远是空的。
|
||||
fn shape_task_row(mut row: Value) -> Value {
|
||||
let Some(obj) = row.as_object_mut() else {
|
||||
return row;
|
||||
};
|
||||
let raw = obj
|
||||
.remove("executeContentRaw")
|
||||
.and_then(|v| v.as_str().map(str::to_string))
|
||||
.unwrap_or_default();
|
||||
let content = exec_content_object(&raw);
|
||||
let start = content.get("startTime").cloned().unwrap_or(Value::Null);
|
||||
let end = content.get("endTime").cloned().unwrap_or(Value::Null);
|
||||
obj.insert("startTime".to_string(), start);
|
||||
obj.insert("endTime".to_string(), end);
|
||||
obj.insert("executeContent".to_string(), Value::Object(content));
|
||||
row
|
||||
}
|
||||
|
||||
/// `GET /api/scheduletask` —— 任务列表(分页 + 关键词)。
|
||||
pub async fn task_list(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
raw: RawQuery,
|
||||
) -> Json<ActionResult> {
|
||||
if let Err(resp) = guard(&state, &headers, EN_TASK).await {
|
||||
return resp;
|
||||
}
|
||||
let page = Paging::of(&raw);
|
||||
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<Option<String>> = 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)"
|
||||
));
|
||||
}
|
||||
let where_sql = conds.join(" AND ");
|
||||
|
||||
let total_sql = format!("SELECT COUNT(*)::bigint AS \"total\" FROM base_time_task WHERE {where_sql}");
|
||||
let total = match state
|
||||
.db
|
||||
.query_json_params(&total_sql, ¶ms_of(&values))
|
||||
.await
|
||||
{
|
||||
Ok(rows) => rows
|
||||
.first()
|
||||
.and_then(|r| r.get("total"))
|
||||
.and_then(Value::as_i64)
|
||||
.unwrap_or(0),
|
||||
Err(e) => return db_error(e, "任务计数"),
|
||||
};
|
||||
|
||||
values.push(Some(page.page_size.to_string()));
|
||||
let limit_at = values.len();
|
||||
values.push(Some(page.offset.to_string()));
|
||||
let offset_at = values.len();
|
||||
let sql = format!(
|
||||
"SELECT {TASK_LIST_PROJECTION} FROM base_time_task WHERE {where_sql} \
|
||||
ORDER BY COALESCE(f_sort_code, 0) ASC, f_creator_time DESC NULLS LAST \
|
||||
LIMIT ${limit_at}::text::integer OFFSET ${offset_at}::text::integer"
|
||||
);
|
||||
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<Value> = rows.into_iter().map(shape_task_row).collect();
|
||||
ok(page_list(page.current_page, page.page_size, total, list))
|
||||
}
|
||||
|
||||
/// `GET /api/scheduletask/Info/{id}` —— 任务详情(`executeContent` 是**对象**)。
|
||||
pub async fn task_info(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
Path(id): Path<String>,
|
||||
) -> Json<ActionResult> {
|
||||
if let Err(resp) = guard(&state, &headers, EN_TASK).await {
|
||||
return resp;
|
||||
}
|
||||
let rows = match state
|
||||
.db
|
||||
.query_json_params(
|
||||
&format!(
|
||||
"SELECT {TASK_LIST_PROJECTION} FROM base_time_task \
|
||||
WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1"
|
||||
),
|
||||
&[&id.trim()],
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(rows) => rows,
|
||||
Err(e) => return db_error(e, "任务详情查询"),
|
||||
};
|
||||
let Some(row) = rows.into_iter().next() else {
|
||||
return fail(code::FAIL, "任务不存在");
|
||||
};
|
||||
ok(shape_task_row(row))
|
||||
}
|
||||
|
||||
/// `GET /api/scheduletask/TaskMethods` —— 本地任务方法清单。
|
||||
///
|
||||
/// 🔴 **官方这份清单来自 XXL-JOB 的执行器注册表**(`restScheduleTaskUtil.getHandlerList`),
|
||||
/// 本仓没有执行器 ⇒ **空清单**。为什么不返 `fail`:任务表单的「方法选择」
|
||||
/// 下拉要靠它,返错会让整个新建表单红条;空数组只是**选项为空**(如实)。
|
||||
pub async fn task_methods(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
) -> Json<ActionResult> {
|
||||
if let Err(resp) = guard(&state, &headers, EN_TASK).await {
|
||||
return resp;
|
||||
}
|
||||
ok(json!({ "list": [] }))
|
||||
}
|
||||
|
||||
/// `GET /api/scheduletask/{id}/TaskLog` —— 任务执行日志(分页)。
|
||||
pub async fn task_log_list(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
Path(id): Path<String>,
|
||||
raw: RawQuery,
|
||||
) -> Json<ActionResult> {
|
||||
if let Err(resp) = guard(&state, &headers, EN_TASK).await {
|
||||
return resp;
|
||||
}
|
||||
let page = Paging::of(&raw);
|
||||
let task_id = id.trim().to_string();
|
||||
let total = match state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT COUNT(*)::bigint AS \"total\" FROM base_time_task_log \
|
||||
WHERE f_task_id = $1::text AND COALESCE(f_delete_mark, 0) = 0",
|
||||
&[&task_id],
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(rows) => rows
|
||||
.first()
|
||||
.and_then(|r| r.get("total"))
|
||||
.and_then(Value::as_i64)
|
||||
.unwrap_or(0),
|
||||
Err(e) => return db_error(e, "任务日志计数"),
|
||||
};
|
||||
let size = page.page_size.to_string();
|
||||
let offset = page.offset.to_string();
|
||||
let rows = match state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\", f_task_id AS \"taskId\", \
|
||||
(EXTRACT(EPOCH FROM f_run_time) * 1000)::bigint AS \"runTime\", \
|
||||
COALESCE(f_run_result, 0)::bigint AS \"runResult\", \
|
||||
f_description AS \"description\" \
|
||||
FROM base_time_task_log \
|
||||
WHERE f_task_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 \
|
||||
ORDER BY f_run_time DESC NULLS LAST \
|
||||
LIMIT $2::text::integer OFFSET $3::text::integer",
|
||||
&[&task_id, &size, &offset],
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(rows) => rows,
|
||||
Err(e) => return db_error(e, "任务日志查询"),
|
||||
};
|
||||
ok(page_list(page.current_page, page.page_size, total, rows))
|
||||
}
|
||||
|
||||
/// `POST /api/scheduletask` —— 新建任务(**登记**,不执行)。
|
||||
pub async fn task_create(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
body: Bytes,
|
||||
) -> Json<ActionResult> {
|
||||
let user = match guard(&state, &headers, EN_TASK).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 Some(full_name) = text_field(&obj, "fullName") else {
|
||||
return fail(code::FAIL, "任务名称不能为空");
|
||||
};
|
||||
let Some(en_code) = text_field(&obj, "enCode") else {
|
||||
return fail(code::FAIL, "任务编码不能为空");
|
||||
};
|
||||
let dup = state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\" FROM base_time_task \
|
||||
WHERE f_en_code = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1",
|
||||
&[&en_code],
|
||||
)
|
||||
.await;
|
||||
match dup {
|
||||
Ok(rows) if !rows.is_empty() => return fail(code::FAIL, "任务编码已存在"),
|
||||
Ok(_) => {}
|
||||
Err(e) => return db_error(e, "任务编码查重"),
|
||||
}
|
||||
|
||||
// `executeContent` 缺省也给 `{}`(官方 `@Valid` 要求 cron/startTime,但本仓不执行 ⇒ 不强制)
|
||||
let content = match obj.get("executeContent") {
|
||||
Some(Value::Object(o)) => Value::Object(o.clone()),
|
||||
_ => json!({}),
|
||||
};
|
||||
let id = new_uuid();
|
||||
let execute_type = int_field(&obj, "executeType").unwrap_or(1).to_string();
|
||||
let enabled_mark = int_field(&obj, "enabledMark").unwrap_or(1).to_string();
|
||||
let sort_code = int_field(&obj, "sortCode").unwrap_or(0).to_string();
|
||||
let description = text_field(&obj, "description").unwrap_or_default();
|
||||
let content_text = content.to_string();
|
||||
let values: Vec<Option<String>> = vec![
|
||||
Some(id.clone()),
|
||||
Some(en_code),
|
||||
Some(full_name),
|
||||
Some(execute_type),
|
||||
Some(content_text),
|
||||
Some(description),
|
||||
Some(sort_code),
|
||||
Some(enabled_mark),
|
||||
Some(user.account.clone()),
|
||||
];
|
||||
if let Err(e) = state
|
||||
.db
|
||||
.exec_params(
|
||||
"INSERT INTO base_time_task \
|
||||
(f_id, f_en_code, f_full_name, f_execute_type, f_execute_content, f_description, \
|
||||
f_run_count, f_sort_code, f_enabled_mark, f_delete_mark, f_tenant_id, \
|
||||
f_creator_time, f_creator_user_id) \
|
||||
VALUES ($1::text, $2::text, $3::text, $4::text::integer, $5::text, $6::text, \
|
||||
0, $7::text::bigint, $8::text::integer, 0, '0', now(), $9::text)",
|
||||
¶ms_of(&values),
|
||||
)
|
||||
.await
|
||||
{
|
||||
return db_error(e, "新建任务");
|
||||
}
|
||||
ok(json!({ "id": id }))
|
||||
}
|
||||
|
||||
/// `PUT /api/scheduletask/{id}` —— 更新任务(只改 body 里出现的键)。
|
||||
pub async fn task_update(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
Path(id): Path<String>,
|
||||
body: Bytes,
|
||||
) -> Json<ActionResult> {
|
||||
let user = match guard(&state, &headers, EN_TASK).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 existed = match state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\" FROM base_time_task \
|
||||
WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1",
|
||||
&[&id],
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(rows) => !rows.is_empty(),
|
||||
Err(e) => return db_error(e, "任务查询"),
|
||||
};
|
||||
if !existed {
|
||||
return fail(code::FAIL, "任务不存在");
|
||||
}
|
||||
if let Some(en_code) = text_field(&obj, "enCode") {
|
||||
let dup = state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\" FROM base_time_task \
|
||||
WHERE f_en_code = $1::text AND f_id <> $2::text \
|
||||
AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1",
|
||||
&[&en_code, &id],
|
||||
)
|
||||
.await;
|
||||
match dup {
|
||||
Ok(rows) if !rows.is_empty() => return fail(code::FAIL, "任务编码已存在"),
|
||||
Ok(_) => {}
|
||||
Err(e) => return db_error(e, "任务编码查重"),
|
||||
}
|
||||
}
|
||||
|
||||
let mut sets: Vec<String> = Vec::new();
|
||||
let mut values: Vec<Option<String>> = Vec::new();
|
||||
for (key, column) in [
|
||||
("fullName", "f_full_name"),
|
||||
("enCode", "f_en_code"),
|
||||
("description", "f_description"),
|
||||
] {
|
||||
if let Some(v) = text_field(&obj, key) {
|
||||
values.push(Some(v));
|
||||
sets.push(format!("{column} = ${}::text", values.len()));
|
||||
}
|
||||
}
|
||||
for (key, column) in [
|
||||
("executeType", "f_execute_type"),
|
||||
("enabledMark", "f_enabled_mark"),
|
||||
("sortCode", "f_sort_code"),
|
||||
] {
|
||||
if let Some(v) = int_field(&obj, key) {
|
||||
values.push(Some(v.to_string()));
|
||||
sets.push(format!("{column} = ${}::text::bigint", values.len()));
|
||||
}
|
||||
}
|
||||
if let Some(Value::Object(content)) = obj.get("executeContent") {
|
||||
values.push(Some(Value::Object(content.clone()).to_string()));
|
||||
sets.push(format!("f_execute_content = ${}::text", values.len()));
|
||||
}
|
||||
if sets.is_empty() {
|
||||
return fail(code::FAIL, "没有需要更新的字段");
|
||||
}
|
||||
values.push(Some(user.account.clone()));
|
||||
let user_at = values.len();
|
||||
values.push(Some(id.clone()));
|
||||
let id_at = values.len();
|
||||
let sql = format!(
|
||||
"UPDATE base_time_task SET {}, f_last_modify_time = now(), \
|
||||
f_last_modify_user_id = ${user_at}::text WHERE f_id = ${id_at}::text",
|
||||
sets.join(", ")
|
||||
);
|
||||
if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await {
|
||||
return db_error(e, "更新任务");
|
||||
}
|
||||
ok(json!({ "id": id }))
|
||||
}
|
||||
|
||||
/// `DELETE /api/scheduletask/{id}` —— 删除任务(软删)。
|
||||
pub async fn task_delete(
|
||||
State(state): State<AppState>,
|
||||
headers: HeaderMap,
|
||||
Path(id): Path<String>,
|
||||
) -> Json<ActionResult> {
|
||||
if let Err(resp) = guard(&state, &headers, EN_TASK).await {
|
||||
return resp;
|
||||
}
|
||||
let id = id.trim().to_string();
|
||||
let existed = match state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\" FROM base_time_task \
|
||||
WHERE f_id = $1::text AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1",
|
||||
&[&id],
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(rows) => !rows.is_empty(),
|
||||
Err(e) => return db_error(e, "任务查询"),
|
||||
};
|
||||
if !existed {
|
||||
return fail(code::FAIL, "任务不存在");
|
||||
}
|
||||
if let Err(e) = state
|
||||
.db
|
||||
.exec_params(
|
||||
"UPDATE base_time_task SET f_delete_mark = 1, f_delete_time = now() \
|
||||
WHERE f_id = $1::text",
|
||||
&[&id],
|
||||
)
|
||||
.await
|
||||
{
|
||||
return db_error(e, "删除任务");
|
||||
}
|
||||
ok(Value::Null)
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -50,11 +50,11 @@ use crate::platform::db::{self, pglite, pglite::ToSql, Db};
|
||||
use crate::platform::envelope::{code, fail, ok, ActionResult};
|
||||
use crate::platform::entity::{ColumnSpec, EntitySpec};
|
||||
use crate::platform::ids::new_uuid;
|
||||
use crate::platform::permission::has_en_code_permission;
|
||||
use crate::platform::authorization::has_en_code_permission;
|
||||
use crate::platform::route::{HttpMethod, PackRoute, RouteAction, RouteGuard};
|
||||
use crate::platform::session::TokenUser;
|
||||
use crate::platform::state::AppState;
|
||||
use crate::platform::system;
|
||||
use crate::platform::registry;
|
||||
|
||||
/// `f_creator_user_id` 的兜底账号(**账号字符串,不是 uuid**)。
|
||||
///
|
||||
@@ -470,7 +470,7 @@ async fn guard_face_b(
|
||||
) -> Result<TokenUser, Json<ActionResult>> {
|
||||
let user = require_login_face_b(state, headers).await?;
|
||||
let system_id =
|
||||
system::resolve_system_id(&state.db, system::app_code_of(headers).as_deref()).await;
|
||||
registry::resolve_system_id(&state.db, registry::app_code_of(headers).as_deref()).await;
|
||||
if has_en_code_permission(&state.db, &user.user_id, user.is_admin, en_code, &system_id).await {
|
||||
Ok(user)
|
||||
} else {
|
||||
|
||||
@@ -14,7 +14,9 @@
|
||||
//! 业务侧靠 [`entity::EntitySpec`] 把这些**声明**给引擎,引擎只读声明。
|
||||
|
||||
pub mod auth;
|
||||
pub mod authorization;
|
||||
pub mod cipher;
|
||||
pub mod compat;
|
||||
pub mod config;
|
||||
pub mod crud;
|
||||
pub mod db;
|
||||
@@ -22,16 +24,14 @@ pub mod entity;
|
||||
pub mod envelope;
|
||||
pub mod guard;
|
||||
pub mod ids;
|
||||
pub mod face_b;
|
||||
pub mod menu;
|
||||
pub mod monitor;
|
||||
pub mod permission;
|
||||
pub mod registry;
|
||||
pub mod route;
|
||||
pub mod seed;
|
||||
pub mod session;
|
||||
pub mod state;
|
||||
pub mod sys;
|
||||
pub mod system;
|
||||
pub mod variate_catalog;
|
||||
|
||||
/// 测试共享的 pglite 实例(进程级全局单例 ⇒ 所有单测共用,**禁止**各自 `open_temp`)。
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
//! system —— **多应用 / 多子系统**的注册表与路由(平台层)。
|
||||
//! registry —— **多应用 / 多子系统**的注册表与路由(平台层)。
|
||||
//!
|
||||
//! 契约:`docs/contract.md` §8.7(多应用)+ 官方 JNPF `base_system` / `App-Code`。
|
||||
//!
|
||||
//! 🔴 **为什么叫 `registry` 而不是 `system`**:本仓的**契约面**按官方模块名组织
|
||||
//! (`compat/system.rs` = 官方面 B 的 system 端点集)。平台机制这一层要用
|
||||
//! **语义名**区分开 —— 它管的是「应用注册表」,不是「系统端点」。
|
||||
//!
|
||||
//! 🔴 **机制(按官方 JNPF 平台做成多应用)**:
|
||||
//! 1. **注册表** = `base_system` 表:每行一个应用,`f_en_code` 是该应用的 `App-Code`,
|
||||
//! `f_id` 即下游所有 `base_module.f_system_id` 引用的系统 id;
|
||||
//! 2. **路由** = 请求头 `App-Code` ⇒ [`app_code_of`] ⇒ [`resolve_system`] 解析出当前系统;
|
||||
//! 3. **隔离** = `base_module` / 权限判据全部按 `f_system_id` 过滤
|
||||
//! (见 [`crate::platform::permission`] / [`crate::platform::face_b::load_menus`])。
|
||||
//! (见 [`crate::platform::authorization`] / [`crate::platform::compat::helper::load_menus`])。
|
||||
//!
|
||||
//! 🔴 **`App-Code` 不是契约判别头**:判别「面 A / 面 B」只看 `Vue-Version: 3`
|
||||
//! (`JNPF_COMPAT_SURFACE.md` §2.2)。`App-Code` 只选「当前应用」,且本仓前端
|
||||
@@ -102,7 +106,7 @@ pub async fn resolve_system_id(db: &Db, app_code: Option<&str>) -> String {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::bootstrap;
|
||||
use crate::platform::permission::{self, MenuNode};
|
||||
use crate::platform::authorization::{self, MenuNode};
|
||||
use crate::platform::test_support;
|
||||
|
||||
/// 多应用:注册表解析 + 菜单按系统隔离。
|
||||
@@ -160,7 +164,7 @@ mod tests {
|
||||
// `m_sys` 下 ⇒ 主系统的根节点比节点总数少。隔离断言必须用**展平集合**判断。
|
||||
// 🔴 这里**不写死业务菜单条数**(否则每加一个业务模块就得改平台层 ⇒ 违反
|
||||
// 「加模块只碰业务层」)⇒ 只钉「5 条内置必须在、且不含异系统菜单」。
|
||||
let main_menus = permission::build_menu_list(&db, "admin", 1, MAIN_SYSTEM_ID).await;
|
||||
let main_menus = authorization::build_menu_list(&db, "admin", 1, MAIN_SYSTEM_ID).await;
|
||||
let main_ids = flat_ids(&main_menus);
|
||||
for builtin in ["m_sys", "m_user", "m_role", "m_org", "m_menu"] {
|
||||
assert!(
|
||||
@@ -178,7 +182,7 @@ mod tests {
|
||||
"主系统不应含 app-b 的菜单(隔离被破坏)"
|
||||
);
|
||||
// app-b 系统:只含它自己的 1 条菜单(展平后仍是 1 个节点)。
|
||||
let appb_menus = permission::build_menu_list(&db, "admin", 1, "app-b").await;
|
||||
let appb_menus = authorization::build_menu_list(&db, "admin", 1, "app-b").await;
|
||||
let appb_ids = flat_ids(&appb_menus);
|
||||
assert_eq!(appb_ids.len(), 1, "app-b 系统应只有 1 个菜单节点");
|
||||
assert_eq!(appb_ids[0], "m_appb_x");
|
||||
@@ -28,7 +28,7 @@ use crate::platform::cipher::md5_hex;
|
||||
use crate::platform::db::{pglite, pglite::ToSql, Db};
|
||||
use crate::platform::ids::new_uuid;
|
||||
use crate::platform::menu::MenuSpec;
|
||||
use crate::platform::system;
|
||||
use crate::platform::registry;
|
||||
|
||||
/// 内置 admin 账号名(同时用作种子的 `f_creator_user_id`)。
|
||||
const ADMIN_ACCOUNT: &str = "admin";
|
||||
@@ -77,7 +77,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [
|
||||
menu_type: 1,
|
||||
icon: Some("setting"),
|
||||
sort_code: 1,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
},
|
||||
MenuSpec {
|
||||
id: "m_user",
|
||||
@@ -88,7 +88,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [
|
||||
menu_type: 2,
|
||||
icon: None,
|
||||
sort_code: 2,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
},
|
||||
MenuSpec {
|
||||
id: "m_role",
|
||||
@@ -99,7 +99,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [
|
||||
menu_type: 2,
|
||||
icon: None,
|
||||
sort_code: 3,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
},
|
||||
MenuSpec {
|
||||
id: "m_org",
|
||||
@@ -110,7 +110,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [
|
||||
menu_type: 2,
|
||||
icon: None,
|
||||
sort_code: 4,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
},
|
||||
MenuSpec {
|
||||
id: "m_menu",
|
||||
@@ -121,7 +121,7 @@ const BUILTIN_MENUS: [MenuSpec; 5] = [
|
||||
menu_type: 2,
|
||||
icon: None,
|
||||
sort_code: 5,
|
||||
system_en_code: system::MAIN_SYSTEM_CODE,
|
||||
system_en_code: registry::MAIN_SYSTEM_CODE,
|
||||
},
|
||||
];
|
||||
|
||||
@@ -188,7 +188,7 @@ pub async fn ensure_base(db: &Db, extra_menus: &[MenuSpec]) -> Result<(), pglite
|
||||
pub async fn ensure_systems(db: &Db, now: &str) -> Result<(), pglite::Error> {
|
||||
// (id, en_code = App-Code, full_name, f_is_main, description)
|
||||
const BUILTIN_SYSTEMS: [(&str, &str, &str, i32, &str); 2] = [
|
||||
(system::MAIN_SYSTEM_ID, system::MAIN_SYSTEM_CODE, "系统平台", 1, "主系统"),
|
||||
(registry::MAIN_SYSTEM_ID, registry::MAIN_SYSTEM_CODE, "系统平台", 1, "主系统"),
|
||||
("app-b", "app-b", "演示应用B", 0, "第二个应用(无菜单,用于验证隔离)"),
|
||||
];
|
||||
for (id, en_code, full_name, is_main, description) in BUILTIN_SYSTEMS {
|
||||
@@ -720,14 +720,14 @@ async fn system_id_of(db: &Db, system_en_code: &str) -> String {
|
||||
Ok(r) => r,
|
||||
Err(e) => {
|
||||
eprintln!("[seed] 系统解析失败(按主系统处理): {e}");
|
||||
return system::MAIN_SYSTEM_ID.to_string();
|
||||
return registry::MAIN_SYSTEM_ID.to_string();
|
||||
}
|
||||
};
|
||||
rows.first()
|
||||
.and_then(|r| r["id"].as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string)
|
||||
.unwrap_or_else(|| system::MAIN_SYSTEM_ID.to_string())
|
||||
.unwrap_or_else(|| registry::MAIN_SYSTEM_ID.to_string())
|
||||
}
|
||||
|
||||
/// 平台层自带菜单 + 业务层传入的菜单 = **本次要种的全部内置菜单**。
|
||||
|
||||
+442
-442
File diff suppressed because it is too large.
Load diff
@@ -451,7 +451,7 @@ async fn current_user_with_token_returns_user_info_and_menu() {
|
||||
);
|
||||
assert_eq!(
|
||||
data["currentSystemId"],
|
||||
serde_json::json!(ssw_platform::platform::system::MAIN_SYSTEM_ID),
|
||||
serde_json::json!(ssw_platform::platform::registry::MAIN_SYSTEM_ID),
|
||||
"无 App-Code 头 ⇒ 回落主系统"
|
||||
);
|
||||
}
|
||||
|
||||
@@ -370,10 +370,14 @@ async fn data_model_tables_info_and_fields() {
|
||||
let token = login(port).await;
|
||||
|
||||
// ① 表清单:`DbTableListVO`(list + pagination),分页真的生效。
|
||||
// 🔴 **pageSize 给 1000 而不是 100**(批次 17 改):官方平台表已全量导入
|
||||
// (123 张 `base_*`)+ 业务包表 ⇒ 库里有 127+ 张表;`pageSize=100` 会把
|
||||
// `base_user` 截到第 2 页去,**让「清单里必须能看见 base_user」这条断言
|
||||
// 变成对表数的隐式假设**。给足页大小,断言才是真的在验「清单内容」。
|
||||
let (_, tables) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/DataModel/0/Tables?currentPage=1&pageSize=100",
|
||||
"/api/system/DataModel/0/Tables?currentPage=1&pageSize=1000",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
|
||||
@@ -744,10 +744,13 @@ async fn copy_guards_and_delete_all_spares_builtin() {
|
||||
assert_eq!(cleared["code"], 200, "{cleared}");
|
||||
|
||||
// 🔴 清空的只是**非内置**表:`base_user` / `demo_item` 必须都还在。
|
||||
// 🔴 **pageSize 给 1000 而不是 100**(批次 17 改):官方平台表已全量导入
|
||||
// (123 张 `base_*`)⇒ 库里有 127+ 张表;`pageSize=100` 会把 `base_user`
|
||||
// 截到第 2 页 ⇒ 断言「内置表还在」会**假失败**(表其实没被删)。
|
||||
let (_, list) = call(
|
||||
port,
|
||||
"GET",
|
||||
"/api/system/DataModel/0/Tables?pageSize=100",
|
||||
"/api/system/DataModel/0/Tables?pageSize=1000",
|
||||
&token,
|
||||
None,
|
||||
)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
use ssw_platform::platform::db::Db;
|
||||
use ssw_platform::platform::ids::new_uuid;
|
||||
use ssw_platform::platform::permission::{
|
||||
use ssw_platform::platform::authorization::{
|
||||
build_menu_list, has_module, render_tree, resolve_user_module_ids,
|
||||
};
|
||||
use ssw_platform::bootstrap::ensure_base;
|
||||
@@ -49,7 +49,7 @@ const M_RESOURCE: &str = "m_resource";
|
||||
/// 多应用:本仓的主系统 id(`base_system.f_en_code = 'ssw-platform'`)。
|
||||
/// 菜单查询按 `f_system_id` 隔离 ⇒ 这些测试里的菜单都属于主系统。
|
||||
/// 主系统 id —— 🔴 取**平台常量**而不是字面量(主系统 id 改一处就够)。
|
||||
const SYS: &str = ssw_platform::platform::system::MAIN_SYSTEM_ID;
|
||||
const SYS: &str = ssw_platform::platform::registry::MAIN_SYSTEM_ID;
|
||||
|
||||
/// 9 个内置菜单的期望菜单树(契约 §8.4,逐字断言)。
|
||||
const EXPECTED_ADMIN_TREE: &str =
|
||||
|
||||
Reference in new issue
Block a user