diff --git a/src/commands/user/auth-groups.ts b/src/commands/user/auth-groups.ts index 1b35e82..ecc198b 100644 --- a/src/commands/user/auth-groups.ts +++ b/src/commands/user/auth-groups.ts @@ -12,6 +12,7 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface AuthGroupItem { id?: string @@ -26,6 +27,8 @@ interface AuthGroupItem { interface AuthGroupsOpts { userId: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } function flattenTree(items: AuthGroupItem[], depth = 0): Array { @@ -43,33 +46,49 @@ export function buildUserAuthGroupsCommand(): Command { const cmd = new Command('auth-groups') .description('查用户权限分组 (admin 操作, 返回角色/岗位/组织树)') .requiredOption('--userId ', '用户 id') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: AuthGroupsOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const r = await c.get('/permission/Users/getAllPermission', { - userId: opts.userId, + + await wrapCommand({ + command: 'user auth-groups', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const r = await c.get('/permission/Users/getAllPermission', { + userId: opts.userId, + }) + if (r.code !== 200) { + return ctx.fail(`user auth-groups 失败 (code=${r.code}): ${r.msg}`, { userId: opts.userId, code: r.code }) + } + const tree = r.data || [] + const flat = flattenTree(tree) + const summary = { userId: opts.userId, total: flat.length } + if (opts.json) { + printJson(tree) + return ctx.success(summary) + } + log.info(`用户 id=${opts.userId} 共 ${flat.length} 个权限分组节点`) + console.log('OBJECT_ID TYPE FULLNAME HAS_CHILD') + console.log('-'.repeat(95)) + for (const it of flat) { + const id = String(it.id || '').padEnd(33) + const type = String(it.type || '').padEnd(12) + const indent = ' '.repeat(it._depth) + const name = (indent + (it.fullName || '')).padEnd(31).slice(0, 31) + const child = it.hasChildren ? '✓' : '' + console.log(`${id}${type}${name}${child}`) + } + ctx.success(summary) + } catch (e) { + ctx.fail(`user auth-groups 失败: ${(e as Error).message?.slice(0, 200)}`) + } }) - if (r.code !== 200) { - log.error(`user auth-groups 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - const tree = r.data || [] - if (opts.json) { - printJson(tree) - return - } - const flat = flattenTree(tree) - log.info(`用户 id=${opts.userId} 共 ${flat.length} 个权限分组节点`) - console.log('OBJECT_ID TYPE FULLNAME HAS_CHILD') - console.log('-'.repeat(95)) - for (const it of flat) { - const id = String(it.id || '').padEnd(33) - const type = String(it.type || '').padEnd(12) - const indent = ' '.repeat(it._depth) - const name = (indent + (it.fullName || '')).padEnd(31).slice(0, 31) - const child = it.hasChildren ? '✓' : '' - console.log(`${id}${type}${name}${child}`) - } }) installHelpHook(cmd, { purpose: '查用户权限分组 (admin 操作, 返回角色/岗位/组织树)', diff --git a/src/commands/user/auth-list.ts b/src/commands/user/auth-list.ts index 1d6b915..9acd386 100644 --- a/src/commands/user/auth-list.ts +++ b/src/commands/user/auth-list.ts @@ -10,6 +10,7 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c import { DacliError } from '../../core/types.ts' interface AuthItem { @@ -34,6 +35,8 @@ interface AuthListOpts { objectId: string objectType: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildUserAuthListCommand(): Command { @@ -47,45 +50,61 @@ export function buildUserAuthListCommand(): Command { } return v }) - .option('--json', '原始 JSON 输出 (含 7 类全部)', false) + addOutputOptions(cmd) .action(async (opts: AuthListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const r = await c.get('/permission/Users/Authorize', { - userId: opts.userId, - objectId: opts.objectId, - objectType: opts.objectType, + + await wrapCommand({ + command: 'user auth-list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const r = await c.get('/permission/Users/Authorize', { + userId: opts.userId, + objectId: opts.objectId, + objectType: opts.objectType, + }) + if (r.code !== 200) { + return ctx.fail(`user auth-list 失败 (code=${r.code}): ${r.msg}`, { userId: opts.userId, code: r.code }) + } + const data = r.data || {} + const cats: Array = ['module', 'button', 'column', 'form', 'resource', 'flow', 'print'] + const summary = { userId: opts.userId, objectId: opts.objectId, objectType: opts.objectType } + if (opts.json) { + printJson(data) + return ctx.success(summary) + } + const catNames: Record = { + module: '菜单', + button: '按钮', + column: '列表', + form: '表单', + resource: '数据', + flow: '流程', + print: '打印', + } + log.info(`用户 id=${opts.userId} 在 ${opts.objectType}=${opts.objectId} 下的权限:`) + for (const cat of cats) { + const list = data[cat] || [] + console.log(`\n--- ${catNames[cat]} (${list.length}) ---`) + if (!list.length) { + console.log(' (无)') + continue + } + for (const it of list) { + console.log(` ${it.id} ${it.fullName}${it.enCode ? ` (${it.enCode})` : ''}`) + } + } + ctx.success(summary) + } catch (e) { + ctx.fail(`user auth-list 失败: ${(e as Error).message?.slice(0, 200)}`) + } }) - if (r.code !== 200) { - log.error(`user auth-list 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - const data = r.data || {} - if (opts.json) { - printJson(data) - return - } - const cats: Array = ['module', 'button', 'column', 'form', 'resource', 'flow', 'print'] - const catNames: Record = { - module: '菜单', - button: '按钮', - column: '列表', - form: '表单', - resource: '数据', - flow: '流程', - print: '打印', - } - log.info(`用户 id=${opts.userId} 在 ${opts.objectType}=${opts.objectId} 下的权限:`) - for (const cat of cats) { - const list = data[cat] || [] - console.log(`\n--- ${catNames[cat]} (${list.length}) ---`) - if (!list.length) { - console.log(' (无)') - continue - } - for (const it of list) { - console.log(` ${it.id} ${it.fullName}${it.enCode ? ` (${it.enCode})` : ''}`) - } - } }) installHelpHook(cmd, { purpose: '查用户具体权限 (admin 操作, 7 类: 菜单/按钮/列表/表单/数据/流程/打印)', diff --git a/src/commands/user/changepwd.ts b/src/commands/user/changepwd.ts index f363277..6268d75 100644 --- a/src/commands/user/changepwd.ts +++ b/src/commands/user/changepwd.ts @@ -13,6 +13,7 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c import { encryptByMd5 } from '../../core/crypto.ts' import { rmSync } from 'node:fs' import { resolve } from 'node:path' @@ -21,6 +22,9 @@ import { homedir } from 'node:os' interface ChangepwdOpts { oldPassword: string newPassword: string + json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } function getTokenPath(): string { @@ -33,26 +37,42 @@ export function buildUserChangepwdCommand(): Command { .description('修改当前用户密码 (self 操作, 成功后清本地 token)') .requiredOption('--oldPassword

', '旧密码 (明文)') .requiredOption('--newPassword

', '新密码 (明文)') + addOutputOptions(cmd) .action(async (opts: ChangepwdOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const r = await c.postJson('/permission/Users/Current/Actions/ModifyPassword', { - oldPassword: encryptByMd5(opts.oldPassword), - password: encryptByMd5(opts.newPassword), + + await wrapCommand({ + command: 'user changepwd', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const r = await c.postJson('/permission/Users/Current/Actions/ModifyPassword', { + oldPassword: encryptByMd5(opts.oldPassword), + password: encryptByMd5(opts.newPassword), + }) + if (r.code !== 200) { + return ctx.fail(`user changepwd 失败 (code=${r.code}): ${r.msg}`, { code: r.code }) + } + // 清空本地 token.json (web 端 setAccessToken(null) + logout(false)) + const tokenPath = getTokenPath() + try { + rmSync(tokenPath, { force: true }) + log.info(`✓ 密码已修改, 本地 token 已清除 (${tokenPath})`) + } catch (e) { + log.warn(`密码已修改, 但清本地 token 失败: ${(e as Error).message}`) + log.info(`✓ 密码已修改, 请手动删除 ${tokenPath} 或重新 dacli app login`) + } + log.info('下次命令将自动重登') + ctx.success({ tokenPath }) + } catch (e) { + ctx.fail(`user changepwd 失败: ${(e as Error).message?.slice(0, 200)}`) + } }) - if (r.code !== 200) { - log.error(`user changepwd 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - // 清空本地 token.json (web 端 setAccessToken(null) + logout(false)) - const tokenPath = getTokenPath() - try { - rmSync(tokenPath, { force: true }) - log.info(`✓ 密码已修改, 本地 token 已清除 (${tokenPath})`) - } catch (e) { - log.warn(`密码已修改, 但清本地 token 失败: ${(e as Error).message}`) - log.info(`✓ 密码已修改, 请手动删除 ${tokenPath} 或重新 dacli app login`) - } - log.info('下次命令将自动重登') }) installHelpHook(cmd, { purpose: '修改当前用户密码 (self 操作, 简化: 仅需旧密码+新密码)', diff --git a/src/commands/user/set-position.ts b/src/commands/user/set-position.ts index 7674c47..8af3512 100644 --- a/src/commands/user/set-position.ts +++ b/src/commands/user/set-position.ts @@ -10,10 +10,14 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface SetPositionOpts { id: string positionIds: string + json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildUserSetPositionCommand(): Command { @@ -21,18 +25,34 @@ export function buildUserSetPositionCommand(): Command { .description('设置用户岗位 (admin 操作, 全量替换)') .requiredOption('--id ', '用户 id') .requiredOption('--positionIds ', '岗位 id 列表, 逗号分隔 (替换原岗位)') + addOutputOptions(cmd) .action(async (opts: SetPositionOpts) => { - const ids = opts.positionIds.split(',').map((s) => s.trim()).filter(Boolean) + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const r = await c.postJson(`/permission/Users/${opts.id}/SetPosition`, { - id: opts.id, - ids, + + await wrapCommand({ + command: 'user set-position', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const ids = opts.positionIds.split(',').map((s) => s.trim()).filter(Boolean) + const r = await c.postJson(`/permission/Users/${opts.id}/SetPosition`, { + id: opts.id, + ids, + }) + if (r.code !== 200) { + return ctx.fail(`user set-position 失败 (code=${r.code}): ${r.msg}`, { userId: opts.id, code: r.code }) + } + log.info(`✓ 用户 id=${opts.id} 已设置 ${ids.length} 个岗位`) + ctx.success({ userId: opts.id, total: ids.length }) + } catch (e) { + ctx.fail(`user set-position 失败: ${(e as Error).message?.slice(0, 200)}`) + } }) - if (r.code !== 200) { - log.error(`user set-position 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - log.info(`✓ 用户 id=${opts.id} 已设置 ${ids.length} 个岗位`) }) installHelpHook(cmd, { purpose: '设置用户岗位 (admin 操作, 全量替换)', diff --git a/src/commands/user/unlock.ts b/src/commands/user/unlock.ts index a8c94f9..310924e 100644 --- a/src/commands/user/unlock.ts +++ b/src/commands/user/unlock.ts @@ -9,23 +9,43 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface UnlockOpts { id: string + json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildUserUnlockCommand(): Command { const cmd = new Command('unlock') .description('解除用户锁定 (admin 操作, 当 enabledMark=2 时使用)') .requiredOption('--id ', '用户 id') + addOutputOptions(cmd) .action(async (opts: UnlockOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const r = await c.putJson(`/permission/Users/${opts.id}/Actions/unlock`, {}) - if (r.code !== 200) { - log.error(`user unlock 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - log.info(`✓ 用户 id=${opts.id} 已解除锁定`) + + await wrapCommand({ + command: 'user unlock', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const r = await c.putJson(`/permission/Users/${opts.id}/Actions/unlock`, {}) + if (r.code !== 200) { + return ctx.fail(`user unlock 失败 (code=${r.code}): ${r.msg}`, { userId: opts.id, code: r.code }) + } + log.info(`✓ 用户 id=${opts.id} 已解除锁定`) + ctx.success({ userId: opts.id }) + } catch (e) { + ctx.fail(`user unlock 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { purpose: '解除用户锁定 (admin 操作)',