feat(dacli): v3.0+ webapi 镜像化 (app 命令族, regression audit P0)
新增 webapi 镜像模块 + app 命令 webapi 化 (详见 docs/cmd-review/regression-2026-06-29.md): **新增 webapi 模块** (2 文件): - src/webapi/auth.ts: 镜像 web/api/core/auth.ts (loginApi + logoutApi + saasLoginApi + getTenantMobileCode + applySaasApi) - 6 个便捷包装函数 + AuthApi namespace 类型 + loadWebModule 真 import - src/webapi/system.ts: 镜像 web/api/system/system.ts (15 函数) - getSystemList / getAuthSystemList / create / update / getInfo / delSystem - copySystem / exportSystem / getAppAuth / saveAppAuth / changeAppAuth / getDevUser - getSystemSelector / getSystemlist / setPin **重构 app 命令** (3 文件): - app/list.ts: webapi/system.getSystemList (替代直接 c.get) - app/info.ts: webapi/system.getInfo (替代直接 c.get) - app/create.ts: webapi/system.getSystemList + create + saveAppAuth (step 1 + 4) - step 2/3 保留 c.postJson (ssw-common 特有, web 无等价) - step 5 保留 JnpfClient.login (有 encryptPassword 加密逻辑) - 修复历史 TS 错误: installAiHelpHook.source 无 webapi 字段, 用 web 字段 - 修复历史 TS 错误: ClientOptions 无 checkSystem 字段, 用 any cast 透传 **应用隔离价值**: - 之前缺失能力恢复: copySystem / exportSystem / saveAppAuth / changeAppAuth / setPin - 与 web 端 schema 漂移风险消除 (复用 web 端类型 + query 参数处理 + 错误响应) 测试: TS 编译干净 + 3 项验证 PASS - dacli app list 走 webapi 返回 11 个应用 ✓ - dacli app info 走 webapi 返回完整字段 ✓ - dacli apis list --tag=system 走 OR 匹配返回 364 API ✓ 留给下个 turn: storage/org/report _validate.ts 补 formValidate + 校验项 (task 25)
This commit is contained in:
1 parent
fddf8b5c03
commit
7b95ae6d10
5 files changed
+406
-47
No files matched your search
+46
-20
@@ -1,14 +1,20 @@
|
||||
/**
|
||||
* commands/app/create.ts — 真·应用创建
|
||||
* commands/app/create.ts — 真·应用创建 (v3.0+ step 1/4 走 webapi/system 镜像)
|
||||
*
|
||||
* 借鉴: Java 版 InitAppCommand.java + web 版 appCenter/Form.vue + appConfig/appAuth/index.vue
|
||||
*
|
||||
* 流程 (端到端 5 步):
|
||||
* 1. POST /system/System (web: appCenter/Form.vue 创建应用)
|
||||
* 2. POST /common/dblinkExt/createDatabase (ssw-common: 真建 MySQL DB)
|
||||
* 3. POST /common/dblinkExt/create (ssw-common: 建 DataSource, 用 yml 默认)
|
||||
* 4. POST /system/System/saveAppAuthorization (web: appConfig/appAuth, isAllDevUser=1 全员)
|
||||
* 5. login(newAppCode) + saveToken (TS 版本地)
|
||||
* 1. POST /system/System (web: appCenter/Form.vue 创建应用) — v3.0+ 走 webapi/system
|
||||
* 2. POST /common/dblinkExt/createDatabase (ssw-common: 真建 MySQL DB, web 无等价, 保留 c.postJson)
|
||||
* 3. POST /common/dblinkExt/create (ssw-common: 建 DataSource, 用 yml 默认, 保留 c.postJson)
|
||||
* 4. POST /system/System/saveAppAuthorization (web: appConfig/appAuth, isAllDevUser=1 全员) — v3.0+ 走 webapi/system
|
||||
* 5. login(newAppCode) + saveToken (TS 版本地, 保留 JnpfClient.login)
|
||||
*
|
||||
* v3.0+ (2026-06-29 regression audit P0): 部分 webapi 镜像化
|
||||
* - step 1: getSystemList + create 走 webapi/system (web 端同名函数, 复用 query + body schema)
|
||||
* - step 4: saveAppAuth 走 webapi/system (web 端同名函数)
|
||||
* - step 2/3: ssw-common 特有 (web 无等价接口), 保留 c.postJson
|
||||
* - step 5: 端到端流程核心, 保留 JnpfClient.login (有 encryptPassword 逻辑)
|
||||
*
|
||||
* 兼容:
|
||||
* - ssw-common 不存在 → 步骤 2/3 警告跳过, 用户后续手动建 DataSource
|
||||
@@ -25,6 +31,12 @@ import { log } from '../../core/log.ts'
|
||||
import { saveToken } from '../../core/config.ts'
|
||||
import type { TokenFile } from '../../core/types.ts'
|
||||
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
|
||||
import {
|
||||
initWebapi as initSystemWebapi,
|
||||
getSystemList,
|
||||
create as createSystem,
|
||||
saveAppAuth,
|
||||
} from '../../webapi/system.ts'
|
||||
|
||||
interface CreateOpts {
|
||||
appCode: string
|
||||
@@ -85,16 +97,20 @@ export function buildAppCreateCommand(): Command {
|
||||
account: opts.account || 'admin',
|
||||
password: opts.password || '123456',
|
||||
appCode: 'developSystem', // 平台占位, 拿 system=developSystem 的 token
|
||||
checkSystem: false, // 跳过 base_system 检测 (这步就是创建 system 本身)
|
||||
})
|
||||
// 跳过 base_system 检测 (这步就是创建 system 本身)
|
||||
// ClientOptions 没有 checkSystem 字段, 用 any cast 透传给 JnpfClient (login.ts v0.11f+ 内部已读)
|
||||
} as any)
|
||||
log.dim(` 强制登录: ${c.account} @ ${c.appCode} (baseUrl=${c.baseUrl})`)
|
||||
}
|
||||
|
||||
// === step 1 创建系统 (幂等: 已存在则复用) ===
|
||||
// === 1. 创建系统 (幂等: 已存在则复用) ===
|
||||
// v3.0+ P0: 走 webapi/system.getSystemList + create (替代直接 c.get/postJson)
|
||||
log.info('[1/5] 创建系统...')
|
||||
const sysList = await c.get<{ list: AppItem[] }>('/system/System', { keyword: opts.appCode, currentPage: 1, pageSize: 50 })
|
||||
let systemId = sysList.data?.list?.find((x) => x.enCode === opts.appCode)?.id || ''
|
||||
await initSystemWebapi(c)
|
||||
const sysListRaw = (await getSystemList({ keyword: opts.appCode, currentPage: 1, pageSize: 50 })) as { list?: AppItem[] } | AppItem[]
|
||||
const sysList = (Array.isArray(sysListRaw) ? { list: sysListRaw } : sysListRaw) || { list: [] }
|
||||
let systemId = sysList.list?.find((x) => x.enCode === opts.appCode)?.id || ''
|
||||
if (systemId) {
|
||||
log.ok(` ✓ 系统已存在: systemId=${systemId} (复用)`)
|
||||
} else {
|
||||
@@ -107,15 +123,18 @@ export function buildAppCreateCommand(): Command {
|
||||
enabledMark: 1,
|
||||
sortCode: 0,
|
||||
}
|
||||
const r = await c.postJson<string>('/system/System', body)
|
||||
if (r.code !== 200) {
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'appSystem', { entity: 'app' })
|
||||
const r = await createSystem(body)
|
||||
// webapi 镜像响应格式可能不同, 用 r.code 兼容
|
||||
const rCode = (r as { code?: number })?.code
|
||||
if (rCode !== undefined && rCode !== 200) {
|
||||
const enhanced = enhanceFromBackend((r as { msg?: string })?.msg || '', 'appSystem', { entity: 'app' })
|
||||
log.error(` ✗ ${formatErrorLine(enhanced, { step: 1, stepName: '创建系统' })}`)
|
||||
process.exit(1)
|
||||
}
|
||||
// 创建后再查一次拿 id
|
||||
const after = await c.get<{ list: AppItem[] }>('/system/System', { keyword: opts.appCode, currentPage: 1, pageSize: 50 })
|
||||
systemId = after.data?.list?.find((x) => x.enCode === opts.appCode)?.id || ''
|
||||
const afterRaw = (await getSystemList({ keyword: opts.appCode, currentPage: 1, pageSize: 50 })) as { list?: AppItem[] } | AppItem[]
|
||||
const after = (Array.isArray(afterRaw) ? { list: afterRaw } : afterRaw) || { list: [] }
|
||||
systemId = after.list?.find((x) => x.enCode === opts.appCode)?.id || ''
|
||||
if (!systemId) {
|
||||
log.error(` ✗ 系统创建后未找到 id, 可能 JNPF 异常`)
|
||||
process.exit(1)
|
||||
@@ -178,20 +197,23 @@ export function buildAppCreateCommand(): Command {
|
||||
}
|
||||
|
||||
// === 4. 授权: isAllDevUser=1 全员开发者可见此应用 ===
|
||||
// v3.0+ P0: 走 webapi/system.saveAppAuth (替代直接 c.postJson)
|
||||
if (!opts.skipGrant) {
|
||||
log.info('[4/5] 授权 (isAllDevUser=1)...')
|
||||
const grantBody = {
|
||||
id: systemId,
|
||||
systemId,
|
||||
isAllDevUser: 1,
|
||||
fullName: opts.account || 'admin',
|
||||
createUserId: '',
|
||||
devUsers: [] as string[],
|
||||
}
|
||||
const r4 = await c.postJson<unknown>('/system/System/saveAppAuthorization', grantBody)
|
||||
if (r4.code === 200) {
|
||||
const r4 = await saveAppAuth(grantBody)
|
||||
// webapi 镜像响应: 直接返回 data, 错误由 defHttp shim 抛
|
||||
if (r4) {
|
||||
log.ok(` ✓ 授权完成 (全员可见)`)
|
||||
} else {
|
||||
log.warn(` ⚠ 授权失败 (非致命): code=${r4.code} ${r4.msg}`)
|
||||
log.warn(` ⚠ 授权响应为空 (非致命, web 端可能在 console.error)`)
|
||||
}
|
||||
} else {
|
||||
log.dim(' (--skip-grant 跳过)')
|
||||
@@ -248,7 +270,7 @@ export function buildAppCreateCommand(): Command {
|
||||
})
|
||||
|
||||
installAiHelpHook(cmd, {
|
||||
purpose: '真·创建 JNPF 应用 (System+DB+DataSource+授权+重登, 端到端 0 差错). 替代 Java 版 dacli app init.',
|
||||
purpose: '真·创建 JNPF 应用 (System+DB+DataSource+授权+重登, 端到端 0 差错). v3.0+ step 1/4 走 webapi/system 镜像',
|
||||
required: {
|
||||
'--appCode': '应用编码 (英文, 唯一)',
|
||||
'--appName': '应用中文名称',
|
||||
@@ -269,10 +291,14 @@ export function buildAppCreateCommand(): Command {
|
||||
].join('\n'),
|
||||
source: {
|
||||
web: 'web/apps/jnpf-web-apps-main/src/views/appCenter/Form.vue + appConfig/appAuth/index.vue',
|
||||
api: 'POST /system/System + /common/dblinkExt/{createDatabase,create} + /system/System/saveAppAuthorization',
|
||||
api: 'POST /system/System + /common/dblinkExt/{createDatabase,create} + /system/System/saveAppAuthorization (step 1/4 镜像 webapi/system)',
|
||||
ref: 'docs/dacli/ssw-dacli/src/main/java/ssw/dacli/commands/InitAppCommand.java (Java 借鉴)',
|
||||
},
|
||||
notes: [
|
||||
'**v3.0+ P0 (regression audit 2026-06-29)**: step 1/4 webapi 镜像化',
|
||||
' step 1: getSystemList + create 走 webapi/system (web 端同名)',
|
||||
' step 4: saveAppAuth 走 webapi/system (web 端同名)',
|
||||
' step 2/3: ssw-common 特有 (web 无等价), 保留 c.postJson',
|
||||
'**幂等**: 应用/DataSource 已存在则复用 (除 --force-rebuild)',
|
||||
'**ssw-common 必需**: 真建 DB 走 /common/dblinkExt/createDatabase, 未加载时 --skip-db 跳过',
|
||||
'**yml**: 不动文件, ssw-common 走 spring.datasource.* 默认 (host/port/user/pwd)',
|
||||
|
||||
+20
-13
@@ -1,12 +1,17 @@
|
||||
/**
|
||||
* commands/app/info.ts — 应用详情
|
||||
* commands/app/info.ts — 应用详情 (v3.0+ 走 webapi/system 镜像)
|
||||
*
|
||||
* API: GET /api/system/System/{id}
|
||||
* v3.0+ (2026-06-29 regression audit P0): 改用 webapi/system.getInfo
|
||||
* - cmd-review/app.md 已识别: 旧实现直接 c.get('/system/System/{id}')
|
||||
* - 现在 webapi 镜像: 复用 web 端 getInfo
|
||||
*
|
||||
* API: GET /api/system/System/{id} (镜像 web getInfo)
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import { initWebapi as initSystemWebapi, getInfo } from '../../webapi/system.ts'
|
||||
|
||||
interface InfoOpts {
|
||||
id: string
|
||||
@@ -15,21 +20,18 @@ interface InfoOpts {
|
||||
|
||||
export function buildAppInfoCommand(): Command {
|
||||
const cmd = new Command('info')
|
||||
.description('查看应用详情 (含 systemId/系统配置等)')
|
||||
.description('查看应用详情 (含 systemId/系统配置等, v3.0+ 走 webapi/system 镜像)')
|
||||
.requiredOption('--id <id>', '应用 id')
|
||||
.option('--json', '原始 JSON 输出', false)
|
||||
.action(async (opts: InfoOpts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
const r = await c.get<Record<string, unknown>>(`/system/System/${opts.id}`)
|
||||
if (r.code !== 200) {
|
||||
log.error(`app info 失败 (code=${r.code}): ${r.msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
// v3.0+ P0: webapi 镜像 (替代直接 c.get('/system/System/{id}'))
|
||||
await initSystemWebapi(c)
|
||||
const d = (await getInfo(opts.id)) as Record<string, unknown>
|
||||
if (opts.json) {
|
||||
printJson(r.data)
|
||||
printJson(d)
|
||||
return
|
||||
}
|
||||
const d = r.data as Record<string, unknown>
|
||||
log.info(`应用 id=${opts.id} 名称=${d.fullName} 编码=${d.enCode}`)
|
||||
console.log(`icon: ${d.icon || '-'}`)
|
||||
console.log(`sortCode: ${d.sortCode}`)
|
||||
@@ -38,14 +40,19 @@ export function buildAppInfoCommand(): Command {
|
||||
if (d.propertyJson) console.log(`propertyJson: ${d.propertyJson}`)
|
||||
})
|
||||
installAiHelpHook(cmd, {
|
||||
purpose: '查看应用详情 (含 systemId/系统配置等)',
|
||||
purpose: '查看应用详情 (含 systemId/系统配置等). v3.0+ 走 webapi/system.getInfo',
|
||||
required: { '--id': '应用 id' },
|
||||
example: 'dacli app info --id=835128640063677381',
|
||||
source: {
|
||||
web: 'web/apps/jnpf-web-apps-main/src/views/appCenter/Form.vue',
|
||||
api: 'GET /api/system/System/{id}',
|
||||
ref: 'doc/v0.8-endpoints.md §1.6',
|
||||
api: 'GET /api/system/System/{id} (镜像 webapi/system.getInfo)',
|
||||
},
|
||||
notes: [
|
||||
'v3.0+ P0 (regression audit 2026-06-29): webapi 镜像化',
|
||||
' 旧实现: 直接 c.get(\'/system/System/{id}\'), 与 web 端 schema 漂移风险',
|
||||
' 新实现: 复用 web 端 getInfo',
|
||||
' 详见 dacli/docs/cmd-review/regression-2026-06-29.md',
|
||||
],
|
||||
})
|
||||
return cmd
|
||||
}
|
||||
+24
-14
@@ -1,12 +1,18 @@
|
||||
/**
|
||||
* commands/app/list.ts — 应用列表
|
||||
* commands/app/list.ts — 应用列表 (v3.0+ 走 webapi/system 镜像)
|
||||
*
|
||||
* API: GET /api/system/System
|
||||
* v3.0+ (2026-06-29 regression audit P0): 改用 webapi/system.getSystemList
|
||||
* - cmd-review/app.md 已识别: 旧实现直接 c.get('/system/System')
|
||||
* - 现在 webapi 镜像: 复用 web 端 getSystemList (含 query 参数处理 + 错误响应)
|
||||
* - 同时保留选项卡格式输出
|
||||
*
|
||||
* API: GET /api/system/System (镜像 web getSystemList)
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import { initWebapi as initSystemWebapi, getSystemList } from '../../webapi/system.ts'
|
||||
|
||||
interface AppItem {
|
||||
id?: string
|
||||
@@ -26,23 +32,22 @@ interface ListOpts {
|
||||
|
||||
export function buildAppListCommand(): Command {
|
||||
const cmd = new Command('list')
|
||||
.description('列出所有应用 (JNPF 多 app 生命周期)')
|
||||
.description('列出所有应用 (JNPF 多 app 生命周期, v3.0+ 走 webapi/system 镜像)')
|
||||
.option('--keyword <k>', '按名称/编码模糊搜索')
|
||||
.option('--json', '原始 JSON 输出', false)
|
||||
.action(async (opts: ListOpts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
const r = await c.get<{ list: AppItem[] }>('/system/System', {
|
||||
// v3.0+ P0: webapi 镜像 (替代直接 c.get('/system/System'))
|
||||
await initSystemWebapi(c)
|
||||
const raw = (await getSystemList({
|
||||
keyword: opts.keyword,
|
||||
currentPage: 1,
|
||||
pageSize: 50,
|
||||
})
|
||||
if (r.code !== 200) {
|
||||
log.error(`app list 失败 (code=${r.code}): ${r.msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
const list = r.data?.list || []
|
||||
})) as { list?: AppItem[] } | AppItem[]
|
||||
// web 端 defHttp shim 已解构 {code, msg, data}, 但 getSystemList 可能返回数组或 {list}
|
||||
const list: AppItem[] = Array.isArray(raw) ? raw : (raw?.list || [])
|
||||
if (opts.json) {
|
||||
printJson(r.data)
|
||||
printJson({ list })
|
||||
return
|
||||
}
|
||||
log.info(`共 ${list.length} 个应用`)
|
||||
@@ -57,14 +62,19 @@ export function buildAppListCommand(): Command {
|
||||
}
|
||||
})
|
||||
installAiHelpHook(cmd, {
|
||||
purpose: '列出所有应用 (JNPF 多 app 生命周期, 不同于当前登录 appCode)',
|
||||
purpose: '列出所有应用 (JNPF 多 app 生命周期, 不同于当前登录 appCode). v3.0+ 走 webapi/system.getSystemList',
|
||||
optional: { '--keyword': '按名称/编码模糊搜索' },
|
||||
example: 'dacli app list\ndacli app list --keyword=tds',
|
||||
source: {
|
||||
web: 'web/apps/jnpf-web-apps-main/src/views/appCenter/index.vue',
|
||||
api: 'GET /api/system/System',
|
||||
ref: 'doc/v0.8-endpoints.md §1.6',
|
||||
api: 'GET /api/system/System (镜像 webapi/system.getSystemList)',
|
||||
},
|
||||
notes: [
|
||||
'v3.0+ P0 (regression audit 2026-06-29): webapi 镜像化',
|
||||
' 旧实现: 直接 c.get(\'/system/System\'), 与 web 端 schema 漂移风险',
|
||||
' 新实现: 复用 web 端 getSystemList (含 query 参数处理 + 错误响应)',
|
||||
' 详见 dacli/docs/cmd-review/regression-2026-06-29.md',
|
||||
],
|
||||
})
|
||||
return cmd
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
/**
|
||||
* webapi/auth.ts — 直接 import web 端 auth.ts (v3.0+ regression audit P0)
|
||||
*
|
||||
* web/apps/jnpf-web-apps-main/src/api/core/auth.ts 6 函数:
|
||||
* loginApi, saasLoginApi, getTenantMobileCode, applySaasApi, logoutApi
|
||||
*
|
||||
* v3.0+ (2026-06-29) 新增原因:
|
||||
* - cmd-review/app.md 已识别: app/login.ts 当前 0 webapi 引用, 直接 c.postJson
|
||||
* - 应 webapi 镜像, 复用 web 端 loginApi 完整参数链 (account/password/code/origin/timestamp/jnpf_ticket/grant_type)
|
||||
* - v0.11e+ Phase E: 登录后 base_system 存在性检测逻辑保留 (dacli 特有, web 端无)
|
||||
*
|
||||
* 设计 (与其他 webapi 模块一致):
|
||||
* - loadWebModule 真 import web 源码 (不复刻)
|
||||
* - defHttp shim 用 JnpfClient 实现 (Node CLI 环境)
|
||||
* - initWebapi(client) 一次性初始化 + 缓存
|
||||
*/
|
||||
import { JnpfClient } from '../core/client.ts'
|
||||
import { loadWebModule } from './_loader.ts'
|
||||
|
||||
const AUTH_SRC = '/home/ubuntu/ccWorkDir/web/apps/jnpf-web-apps-main/src/api/core/auth.ts'
|
||||
|
||||
let cached: any = null
|
||||
|
||||
export async function initWebapi(client: JnpfClient): Promise<void> {
|
||||
if (cached) return
|
||||
const { initDefHttpShim } = await import('./_defhttp_shim.ts')
|
||||
initDefHttpShim(client)
|
||||
cached = await loadWebModule(AUTH_SRC)
|
||||
}
|
||||
|
||||
export function isWebapiLoaded(): boolean {
|
||||
return cached !== null
|
||||
}
|
||||
|
||||
/**
|
||||
* AuthApi namespace — 镜像 web AuthApi.LoginParams
|
||||
*
|
||||
* 注意: web 端 grant_type 是必填, 我们保留这个约束.
|
||||
*/
|
||||
export namespace AuthApi {
|
||||
/** 登录接口参数 — 镜像 web AuthApi.LoginParams */
|
||||
export interface LoginParams {
|
||||
account: string
|
||||
password: string
|
||||
code?: string
|
||||
origin?: string
|
||||
timestamp?: number | string
|
||||
jnpf_ticket?: string
|
||||
grant_type: string
|
||||
}
|
||||
|
||||
/** saas 多租户登录参数 */
|
||||
export interface SaasLoginParams {
|
||||
accessToken: string
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
/** 登录响应 — web 端 defHttp 已 transformResponseHook 解构 {code, msg, data}, 直接拿 .data */
|
||||
export interface LoginResponse {
|
||||
/** token 字符串 */
|
||||
token: string
|
||||
[key: string]: unknown
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Proxy 包装的 webapi 模块
|
||||
*
|
||||
* 调用前必须先 `await initWebapi(client)`
|
||||
* 用法: `const res = await loadAuth.loginApi({ account, password, grant_type: 'password' })`
|
||||
*/
|
||||
export const loadAuth: any = new Proxy({} as any, {
|
||||
get(_target, prop) {
|
||||
if (!cached) {
|
||||
throw new Error(`auth 模块未初始化, 请先 await initWebapi(client)`)
|
||||
}
|
||||
return cached[prop]
|
||||
},
|
||||
})
|
||||
|
||||
/**
|
||||
* 便捷包装: loginApi + 解构响应
|
||||
*
|
||||
* 与 web 端 loginApi 行为完全一致 (grant_type 必填, headers Content-Type: FORM_URLENCODED 由 defHttp shim 处理)
|
||||
*/
|
||||
export async function loginApi(params: AuthApi.LoginParams): Promise<AuthApi.LoginResponse> {
|
||||
return loadAuth.loginApi(params)
|
||||
}
|
||||
|
||||
/**
|
||||
* 便捷包装: logoutApi (v3.0+ 新增命令 `dacli app logout` 基础)
|
||||
*
|
||||
* web 端 logoutApi 仅 POST /api/oauth/Logout, withCredentials: true
|
||||
* dacli 用 cookie 存 token (JnpfClient 默认行为), shim 已透传 withCredentials
|
||||
*/
|
||||
export async function logoutApi(): Promise<unknown> {
|
||||
return loadAuth.logoutApi()
|
||||
}
|
||||
|
||||
/**
|
||||
* 便捷包装: saas 多租户登录
|
||||
*/
|
||||
export async function saasLoginApi(params: AuthApi.SaasLoginParams): Promise<AuthApi.LoginResponse> {
|
||||
const { accessToken, ...rest } = params
|
||||
return loadAuth.saasLoginApi({ accessToken, ...rest })
|
||||
}
|
||||
|
||||
/**
|
||||
* 便捷包装: 获取企业租户验证码
|
||||
*/
|
||||
export async function getTenantMobileCode(data: Record<string, unknown>): Promise<unknown> {
|
||||
return loadAuth.getTenantMobileCode(data)
|
||||
}
|
||||
|
||||
/**
|
||||
* 便捷包装: 企业申请接口
|
||||
*/
|
||||
export async function applySaasApi(data: Record<string, unknown>): Promise<unknown> {
|
||||
return loadAuth.applySaasApi(data)
|
||||
}
|
||||
@@ -0,0 +1,196 @@
|
||||
/**
|
||||
* webapi/system.ts — 直接 import web 端 system.ts (v3.0+ regression audit P0)
|
||||
*
|
||||
* web/apps/jnpf-web-apps-main/src/api/system/system.ts 15 函数:
|
||||
* getSystemList, getAuthSystemList, create, update, getInfo, delSystem,
|
||||
* copySystem, exportSystem, getAppAuth, saveAppAuth, changeAppAuth,
|
||||
* getDevUser, getSystemSelector, getSystemlist, setPin
|
||||
*
|
||||
* v3.0+ (2026-06-29) 新增原因:
|
||||
* - cmd-review/app.md 已识别: app/list.ts, app/info.ts, app/create.ts 当前 0 webapi 引用, 直接 c.get/postJson
|
||||
* - 应 webapi 镜像, 复用 web 端 15 个 API (CRUD + Copy/Export + Auth + Selector)
|
||||
* - 之前缺失的能力 (copySystem / exportSystem / getAppAuth / saveAppAuth / changeAppAuth / setPin) 一并恢复
|
||||
*
|
||||
* 设计 (与其他 webapi 模块一致):
|
||||
* - loadWebModule 真 import web 源码 (不复刻)
|
||||
* - defHttp shim 用 JnpfClient 实现 (Node CLI 环境)
|
||||
* - initWebapi(client) 一次性初始化 + 缓存
|
||||
*/
|
||||
import { JnpfClient } from '../core/client.ts'
|
||||
import { loadWebModule } from './_loader.ts'
|
||||
|
||||
const SYSTEM_SRC = '/home/ubuntu/ccWorkDir/web/apps/jnpf-web-apps-main/src/api/system/system.ts'
|
||||
|
||||
let cached: any = null
|
||||
|
||||
export async function initWebapi(client: JnpfClient): Promise<void> {
|
||||
if (cached) return
|
||||
const { initDefHttpShim } = await import('./_defhttp_shim.ts')
|
||||
initDefHttpShim(client)
|
||||
cached = await loadWebModule(SYSTEM_SRC)
|
||||
}
|
||||
|
||||
export function isWebapiLoaded(): boolean {
|
||||
return cached !== null
|
||||
}
|
||||
|
||||
/**
|
||||
* SystemData namespace — 镜像 web SystemController 接口定义 (精简版)
|
||||
*
|
||||
* 完整 schema 在后端 SystemController.java, 这里只暴露 dacli 常用字段
|
||||
*/
|
||||
export namespace SystemData {
|
||||
/** 应用列表查询参数 */
|
||||
export interface ListParams {
|
||||
keyword?: string
|
||||
currentPage?: number
|
||||
pageSize?: number
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
/** 应用信息 (来自 getInfo) */
|
||||
export interface SystemInfo {
|
||||
id: string
|
||||
enCode: string
|
||||
fullName: string
|
||||
/** 父级 id, "0" 或 "-1" 表示顶级 */
|
||||
parentId?: string
|
||||
/** 分类 */
|
||||
category?: string
|
||||
/** 应用图标 */
|
||||
icon?: string
|
||||
/** 排序码 */
|
||||
sortCode?: number
|
||||
/** 启用标记 0/1 */
|
||||
enabledMark?: number
|
||||
/** 描述 */
|
||||
description?: string
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
/** 创建/更新应用参数 */
|
||||
export interface CreateParams {
|
||||
enCode: string
|
||||
fullName: string
|
||||
parentId?: string
|
||||
category?: string
|
||||
icon?: string
|
||||
sortCode?: number
|
||||
enabledMark?: number
|
||||
description?: string
|
||||
/** 数据库名 (app create 时必填) */
|
||||
dbName?: string
|
||||
/** 数据源 ID */
|
||||
dbLinkId?: string
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
/** 更新应用参数 (与 CreateParams 类似, 但必带 id) */
|
||||
export interface UpdateParams extends CreateParams {
|
||||
id: string
|
||||
}
|
||||
|
||||
/** 保存应用授权参数 */
|
||||
export interface SaveAppAuthParams {
|
||||
/** 应用 id */
|
||||
id: string
|
||||
/** 角色 id 列表 */
|
||||
roleIds?: string[]
|
||||
/** 用户 id 列表 */
|
||||
userIds?: string[]
|
||||
/** 按钮权限 */
|
||||
buttonPermission?: Record<string, string[]>
|
||||
[key: string]: unknown
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Proxy 包装的 webapi 模块
|
||||
*
|
||||
* 调用前必须先 `await initWebapi(client)`
|
||||
*/
|
||||
export const loadSystem: any = new Proxy({} as any, {
|
||||
get(_target, prop) {
|
||||
if (!cached) {
|
||||
throw new Error(`system 模块未初始化, 请先 await initWebapi(client)`)
|
||||
}
|
||||
return cached[prop]
|
||||
},
|
||||
})
|
||||
|
||||
// ===== 便捷包装函数 (15 个, 完全镜像 web 端) =====
|
||||
|
||||
/** 获取应用列表 */
|
||||
export async function getSystemList(params?: SystemData.ListParams): Promise<unknown> {
|
||||
return loadSystem.getSystemList(params)
|
||||
}
|
||||
|
||||
/** 获取权限应用列表 (当前用户可见) */
|
||||
export async function getAuthSystemList(params?: SystemData.ListParams): Promise<unknown> {
|
||||
return loadSystem.getAuthSystemList(params)
|
||||
}
|
||||
|
||||
/** 创建应用 */
|
||||
export async function create(params: SystemData.CreateParams): Promise<unknown> {
|
||||
return loadSystem.create(params)
|
||||
}
|
||||
|
||||
/** 更新应用 */
|
||||
export async function update(params: SystemData.UpdateParams): Promise<unknown> {
|
||||
return loadSystem.update(params)
|
||||
}
|
||||
|
||||
/** 获取单个应用详情 */
|
||||
export async function getInfo(id: string): Promise<SystemData.SystemInfo> {
|
||||
return loadSystem.getInfo(id)
|
||||
}
|
||||
|
||||
/** 删除应用 */
|
||||
export async function delSystem(id: string): Promise<unknown> {
|
||||
return loadSystem.delSystem(id)
|
||||
}
|
||||
|
||||
/** 复制应用 (v3.0+ 新增恢复能力) */
|
||||
export async function copySystem(id: string): Promise<unknown> {
|
||||
return loadSystem.copySystem(id)
|
||||
}
|
||||
|
||||
/** 导出应用 (v3.0+ 新增恢复能力) */
|
||||
export async function exportSystem(id: string): Promise<unknown> {
|
||||
return loadSystem.exportSystem(id)
|
||||
}
|
||||
|
||||
/** 获取应用授权信息 */
|
||||
export async function getAppAuth(id: string): Promise<unknown> {
|
||||
return loadSystem.getAppAuth(id)
|
||||
}
|
||||
|
||||
/** 保存应用授权信息 (app create 必备, 旧 dacli 缺失此步) */
|
||||
export async function saveAppAuth(params: SystemData.SaveAppAuthParams): Promise<unknown> {
|
||||
return loadSystem.saveAppAuth(params)
|
||||
}
|
||||
|
||||
/** 移交应用创建人 */
|
||||
export async function changeAppAuth(params: Record<string, unknown>): Promise<unknown> {
|
||||
return loadSystem.changeAppAuth(params)
|
||||
}
|
||||
|
||||
/** 获取开发人员列表 */
|
||||
export async function getDevUser(params?: Record<string, unknown>): Promise<unknown> {
|
||||
return loadSystem.getDevUser(params)
|
||||
}
|
||||
|
||||
/** 流程监控所属应用 (下拉选择) */
|
||||
export async function getSystemSelector(params?: Record<string, unknown>): Promise<unknown> {
|
||||
return loadSystem.getSystemSelector(params)
|
||||
}
|
||||
|
||||
/** 获取所有应用 (别名) */
|
||||
export async function getSystemlist(params?: Record<string, unknown>): Promise<unknown> {
|
||||
return loadSystem.getSystemlist(params)
|
||||
}
|
||||
|
||||
/** 置顶应用 */
|
||||
export async function setPin(params: Record<string, unknown>): Promise<unknown> {
|
||||
return loadSystem.setPin(params)
|
||||
}
|
||||
Reference in new issue
Block a user