diff --git a/src/commands/user/create.ts b/src/commands/user/create.ts index 910f5ed..3c4c284 100644 --- a/src/commands/user/create.ts +++ b/src/commands/user/create.ts @@ -1,13 +1,15 @@ /** * commands/user/create.ts — 新建用户 * - * API: POST /api/permission/Users + * v0.11+ Phase 2: webapi 化 (loadUser.createUser + getUserList) + * 替代 v0.10 直接 c.postJson/c.get */ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installAiHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { encryptByMd5 } from '../../core/crypto.ts' +import { initWebapi, loadUser } from '../../webapi/user.ts' interface CreateOpts { account: string @@ -23,7 +25,7 @@ interface CreateOpts { export function buildUserCreateCommand(): Command { const cmd = new Command('create') - .description('新建用户 (P1 权限三角 2 号)') + .description('新建用户 (P1 权限三角 2 号, v0.11+ webapi)') .requiredOption('--account ', '账号 (登录名)') .requiredOption('--realName ', '真实姓名') .requiredOption('--password

', '明文密码 (后端会自动 md5 加密)') @@ -35,6 +37,7 @@ export function buildUserCreateCommand(): Command { .option('--json', '原始 JSON 输出', false) .action(async (opts: CreateOpts) => { const c = await JnpfClient.fromToken() + await initWebapi(c) // JNPF 接收的 password 是 md5(plain) hex (32 字符), 不是 AES 加密 const md5Pwd = encryptByMd5(opts.password) const body: Record = { @@ -47,24 +50,22 @@ export function buildUserCreateCommand(): Command { } if (opts.organizeId) body.organizeId = opts.organizeId if (opts.description) body.description = opts.description - const r = await c.postJson<{ id?: string }>('/permission/Users', body) - if (r.code !== 200) { - log.error(`user create 失败 (code=${r.code}): ${r.msg}`) + log.info(`loadUser.createUser (account=${opts.account})`) + const r = (await loadUser.createUser(body)) as { id?: string; code?: number; msg?: string; data?: { id?: string } } + if (r.code !== 200 && r.code !== undefined) { + log.error(`user create 失败: ${r.msg}`) process.exit(1) } - let id = r.data?.id + let id = r.id || r.data?.id if (!id) { - const listR = await c.get<{ list: { id: string; account: string; realName: string }[] }>( - '/permission/Users', - { keyword: opts.account, pageSize: '50' }, - ) - const found = (listR.data?.list || []).find( + const listR = (await loadUser.getUserList({ keyword: opts.account, pageSize: 50 })) as { list?: { id: string; account: string; realName: string }[] } + const found = (listR.list || []).find( (d) => d.account === opts.account || d.realName === opts.realName, ) id = found?.id } log.info(`✓ 用户创建成功 id=${id}`) - if (opts.json) printJson({ ...(r.data as object), id }) + if (opts.json) printJson({ ...(r.data as object || r), id }) }) installAiHelpHook(cmd, { purpose: '新建用户 (P1 权限三角 2 号)', diff --git a/src/commands/user/delete.ts b/src/commands/user/delete.ts index 0a86149..b60b617 100644 --- a/src/commands/user/delete.ts +++ b/src/commands/user/delete.ts @@ -1,12 +1,14 @@ /** * commands/user/delete.ts — 删除用户 * - * API: DELETE /api/permission/Users/{id} + * v0.11+ Phase 2: webapi 化 (loadUser.delUser) + * 替代 v0.10 直接 c.del */ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installAiHelpHook } from '../../core/help.ts' import { log } from '../../core/log.ts' +import { initWebapi, loadUser } from '../../webapi/user.ts' interface DeleteOpts { id: string @@ -15,7 +17,7 @@ interface DeleteOpts { export function buildUserDeleteCommand(): Command { const cmd = new Command('delete') - .description('删除用户 (非超管)') + .description('删除用户 (非超管, v0.11+ webapi)') .requiredOption('--id ', '用户 id') .option('--yes', '跳过确认', false) .action(async (opts: DeleteOpts) => { @@ -24,8 +26,10 @@ export function buildUserDeleteCommand(): Command { process.exit(1) } const c = await JnpfClient.fromToken() - const r = await c.del(`/permission/Users/${opts.id}`) - if (r.code !== 200) { + await initWebapi(c) + log.info(`loadUser.delUser (id=${opts.id})`) + const r = (await loadUser.delUser(opts.id)) as { code?: number; msg?: string } + if (r.code !== 200 && r.code !== undefined) { log.error(`user delete 失败: ${r.msg}`) process.exit(1) } diff --git a/src/commands/user/list.ts b/src/commands/user/list.ts index 81e7de1..8903a46 100644 --- a/src/commands/user/list.ts +++ b/src/commands/user/list.ts @@ -1,12 +1,14 @@ /** * commands/user/list.ts — 用户列表 * - * API: GET /api/permission/Users + * v0.11+ Phase 2: webapi 化 (loadUser.getUserList) + * 替代 v0.10 直接 c.get */ 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, loadUser } from '../../webapi/user.ts' interface UserItem { id?: string @@ -26,23 +28,27 @@ interface ListOpts { export function buildUserListCommand(): Command { const cmd = new Command('list') - .description('列出用户 (P1 权限三角 2 号)') + .description('列出用户 (P1 权限三角 2 号, v0.11+ webapi)') .option('--keyword ', '按账号/姓名/手机模糊搜索') .option('--json', '原始 JSON 输出', false) .action(async (opts: ListOpts) => { const c = await JnpfClient.fromToken() - const r = await c.get<{ list: UserItem[] }>('/permission/Users', { + await initWebapi(c) + const r = (await loadUser.getUserList({ keyword: opts.keyword, currentPage: 1, pageSize: 50, - }) - if (r.code !== 200) { - log.error(`user list 失败 (code=${r.code}): ${r.msg}`) + })) as { list?: UserItem[] } + if (!r || (r as { code?: number }).code !== 200 && (r as { code?: number }).code !== undefined) { + log.error(`user list 失败: ${(r as { msg?: string }).msg}`) + process.exit(1) + } + const list = r.list || [] process.exit(1) } const list = r.data?.list || [] if (opts.json) { - printJson(r.data) + printJson(r) return } log.info(`共 ${list.length} 个用户`) diff --git a/src/webapi/user.ts b/src/webapi/user.ts new file mode 100644 index 0000000..9366592 --- /dev/null +++ b/src/webapi/user.ts @@ -0,0 +1,30 @@ +/** + * webapi/user.ts — 镜像 web 端 permission/user.ts (v0.11+ Phase 2) + * + * 镜像 web/apps/jnpf-web-apps-main/src/api/permission/user.ts 25+ 函数 + * (含 list/selector/create/update/info/del/batchDelete/resetPassword/unlock/workHandover 等) + */ +import { JnpfClient } from '../core/client.ts' +import { loadWebModule } from './_loader.ts' + +const USER_SRC = '/home/ubuntu/ccWorkDir/web/apps/jnpf-web-apps-main/src/api/permission/user.ts' + +let cached: any = null + +export async function initWebapi(client: JnpfClient): Promise { + if (cached) return + const { initDefHttpShim } = await import('./_defhttp_shim.ts') + initDefHttpShim(client) + cached = await loadWebModule(USER_SRC) +} + +export function isWebapiLoaded(): boolean { + return cached !== null +} + +export const loadUser: any = new Proxy({} as any, { + get(_target, prop) { + if (!cached) throw new Error('user 模块未初始化, 请先 await initWebapi(client)') + return cached[prop] + }, +})