auto(bfc0cfa2c3a4): session end @ 2026-07-21T12:22:16 (+15f)

This commit is contained in:
ssw committed 2026-07-21 12:22:16 +08:00
1 parent bf7edeae8c
commit 3d4002f6cc
15 files changed
+737 -285

No files matched your search

+12 -3
View File
@@ -207,6 +207,7 @@ dacli form update <id> --fields='[...]' # 按 suggestion 建议的修正
|---------|------|
| 新加 silent fix 策略 | `dacli/src/commands/_auto_fix.ts` |
| 新加 assertive fix + rollback | `dacli/src/commands/_auto_fix.ts` (entry 加 `rollback` 字段) |
| 改 G-X1 重名查的列表 (form/dict/menu/role/**workflow**) | `dacli/src/commands/_auto_fix.ts:fetchExistingLists` (v2.1+ workflows 扩展) |
| 改错误码分类 | `dacli/src/commands/_error_codes.ts` (30+ 错误码 EXIST/VS/WF/SYS) |
| 改 CommandLog 结构 | `dacli/src/core/logfile.ts:33-54` |
@@ -285,17 +286,24 @@ dacli form update <id> --fields='[...]' # 按 suggestion 建议的修正
|---------|----------|
| 加新 form 命令 | `dacli/src/commands/form/*.ts` |
| 加新 workflow 命令 | `dacli/src/commands/workflow/*.ts` |
| 加新 report 命令 | `dacli/src/commands/report/*.ts` (8 文件, 已三层接入) |
| 加新 datasource 命令 | `dacli/src/commands/datasource/*.ts` (4 文件, v2.1+ 已接) |
| 加新 storage 命令 | `dacli/src/commands/storage/*.ts` (2 文件, v2.1+ 已接, yml 读) |
| 加新 integration 命令 (email/sms/webhook test) | `dacli/src/commands/integration/*.ts` (3 文件, v2.1+ 已接) |
| 加 webapi 镜像 | `dacli/src/webapi/*` + `_loader.ts` (动态 import 替换) |
| 改输出过滤 | `dacli/src/core/log.ts` |
| 改命令输出 helper (含 saveCommandLog 集成) | `dacli/src/commands/_output_filter.ts` (跨命令通用, v2.1+) |
| 改命令级 auto-fix (enCode/fullName/BS-47) | `dacli/src/commands/_auto_fix.ts:runCommandAutoFix` (跨命令通用, v2.1+) |
| 改 G-X1 重名查的列表 (form/dict/menu/role + workflow) | `dacli/src/commands/_auto_fix.ts:fetchExistingLists` (v2.1+ workflows 扩展 2026-07-21) |
| 改 field-level auto-fix (jnpfKey/FK/datetime 等) | `dacli/src/commands/_auto_fix.ts:runAutoFix` (form 专用) |
| 改校验规则 | `dacli/src/commands/<module>/_validate.ts` (per-module, 无公共 _validate.ts) |
| 改公共 precheck | `dacli/src/commands/_precheck.ts` |
| 改错误码 | `dacli/src/commands/_error_codes.ts` |
| 改字典/字典数据 | `dacli/src/commands/dict/*.ts` |
| 改菜单 | `dacli/src/commands/menu/*.ts` |
| 改数据模型 | `dacli/src/commands/dm/*.ts` |
| 改数据模型 | `dacli/src/commands/dm/*.ts` (create/drop/list/fields 已接) |
| 改报表 | `dacli/src/commands/report/*.ts` (8 文件, BACKEND-7 已修 2026-07-21) |
| 加新模块接入 (三层模式) | 跟 `report/create.ts` 同样 4 步 pattern: imports → addOutputOptions → setupOutputFilter + runCommandAutoFix → printCommandEnd |
---
@@ -315,8 +323,9 @@ dacli form update <id> --fields='[...]' # 按 suggestion 建议的修正
**v2.1+ 自动修正** (2026-07-21):
- ✅ enCode 含 `-`/`_` → **自动 strip** (S-X1 silent) — 不要再 inline 调 `autoStripEnCode`
- ✅ fullName 含 BS-56 禁字符 → **自动 soften** (S-X2 silent) — 不要再 inline 调 `autoStripFullName`
- ✅ enCode/fullName 与 existing{Forms,Dicts,Menus,Roles} 冲突 → **G-X1 suggest** 含 `<appCode>` 前缀建议
- 入口: `commands/_auto_fix.ts:runCommandAutoFix(opts, ctx)` — 跨命令通用 (form/dict/di/menu/role/workflow 等)
- ✅ enCode/fullName 与 existing{Forms,Dicts,Menus,Roles,**Workflows**} 冲突 → **G-X1 suggest** 含 `<appCode>` 前缀建议
- 入口: `commands/_auto_fix.ts:runCommandAutoFix(opts, ctx)` — 跨命令通用 (form/dict/di/menu/role/workflow/bigscreen/portal/user/datasource/integration 等)
- **G-X1 workflow 扩展** (2026-07-21): `fetchExistingLists` 也拉 `GET /workflow/template` 走 web 端镜像, workflow enCode 重名也能触发 suggest
- 详见 `dacli/docs/decisions/0010-dacli-v2-self-correcting-cli.md` §3 + §5
---
+26 -2
View File
@@ -380,6 +380,8 @@ export interface CommandFixContext {
existingMenus?: Array<{ id: string; enCode: string }>
/** 已存在的角色列表 */
existingRoles?: Array<{ id: string; enCode: string }>
/** 已存在的工作流列表 (v2.1+ 2026-07-21 扩展, 让 workflow enCode 重名也能触发 G-X1 suggest) */
existingWorkflows?: Array<{ id: string; enCode: string }>
/** appCode (用于 G-X1 suggestion 中替换 <appCode> 占位符为实际前缀建议) */
appCode?: string
/** 字段映射 (默认 { enCode: 'enCode', fullName: 'fullName' }) — dm 用 { table: 'enCode', tableName: 'fullName' } */
@@ -477,6 +479,8 @@ function fixUniquenessSuggest(
...(ctx.existingDicts || []),
...(ctx.existingMenus || []),
...(ctx.existingRoles || []),
// v2.1+ (2026-07-21): workflow enCode 也算全平台冲突 (BS-47 同源)
...(ctx.existingWorkflows || []),
]
for (const e of allExisting) {
if (!e.enCode) continue
@@ -572,14 +576,16 @@ export function runCommandAutoFix(
export async function fetchExistingLists(
c: JnpfClient,
appCode?: string,
flags: { forms?: boolean; dicts?: boolean; menus?: boolean; roles?: boolean } = {},
flags: { forms?: boolean; dicts?: boolean; menus?: boolean; roles?: boolean; workflows?: boolean } = {},
): Promise<CommandFixContext> {
const enableAll =
!flags.forms && !flags.dicts && !flags.menus && !flags.roles
!flags.forms && !flags.dicts && !flags.menus && !flags.roles && !flags.workflows
const wantForms = enableAll || flags.forms === true
const wantDicts = enableAll || flags.dicts === true
const wantMenus = enableAll || flags.menus === true
const wantRoles = enableAll || flags.roles === true
// v2.1+ (2026-07-21): workflow enCode 也算全平台冲突 (BS-47 同源)
const wantWorkflows = enableAll || flags.workflows === true
const ctx: CommandFixContext = { appCode }
@@ -650,6 +656,24 @@ export async function fetchExistingLists(
}
}
// workflows (loadWorkflow.getList, 镜像 web/.../api/workFlow/template.ts:11 getList)
// 端点 GET /workflow/template (不含 category 走默认 list, 同 workflow/list.ts 行为)
// 拉失败不阻断 (新版 testspace token 拿不到 wf 时常态, 默认 ON, G-X1 仅能缺此项)
if (wantWorkflows) {
try {
const r = await c.get<{ list?: Array<{ id: string; enCode?: string; fullName?: string }> }>(
'/workflow/template',
{ currentPage: 1, pageSize: 500 },
)
const list = (r as { list?: Array<any> })?.list || []
ctx.existingWorkflows = list
.filter((w) => w && w.enCode)
.map((w) => ({ id: String(w.id), enCode: String(w.enCode) }))
} catch {
// 容错: workflow list 拉失败 (新 appCode 无 wf) 不阻断
}
}
return ctx
}
+56 -3
View File
@@ -12,6 +12,8 @@ import { encryptAesEcb, isEncrypted } from '../../core/crypto.ts'
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
import { validateDatasourceCreate } from './_validate.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 命令级 auto-fix (S-X1/S-X2/G-X1)
interface CreateOpts {
fullName: string
@@ -23,6 +25,8 @@ interface CreateOpts {
password?: string
serviceName?: string
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildDatasourceCreateCommand(): Command {
@@ -36,9 +40,20 @@ export function buildDatasourceCreateCommand(): Command {
.requiredOption('--user <user>', '用户名')
.requiredOption('--password <pwd>', '密码')
.option('--serviceName <name>', '库名 (MySQL/SQLServer/PostgreSQL/KingbaseES 必填)')
.option('--json', '原始 JSON 输出', false)
addOutputOptions(cmd)
.action(async (opts: CreateOpts) => {
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
const startTime = Date.now()
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (S-X1/S-X2/G-X1)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
await initWebapi(c)
// v0.11e+ Phase D1: step machine 校验 (镜像 web dataSource/Form.vue + DB001 数据库类型)
@@ -54,11 +69,26 @@ export function buildDatasourceCreateCommand(): Command {
serviceName: opts.serviceName,
})
if (!validation.ok) {
const errLines: string[] = []
for (const s of validation.steps) {
for (const e of s.errors) {
log.error(` ${formatErrorLine(e, { step: s.step, stepName: s.stepName })}`)
const msg = ` ${formatErrorLine(e, { step: s.step, stepName: s.stepName })}`
errLines.push(msg)
log.error(msg)
}
}
// v2.1+ (2026-07-21): 错误路径落 CommandLog (L3)
printCommandEnd({
command: 'datasource create',
appCode: c.appCode,
result: 'failure',
error: errLines.join('; '),
summary: { enCode: opts.enCode },
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
process.exit(1)
}
log.info(`✓ step machine 校验通过 (${validation.steps.length}/${validation.steps.length})`)
@@ -86,7 +116,20 @@ export function buildDatasourceCreateCommand(): Command {
const r = (await loadDataSource.createDataSource(body)) as { id?: string; code?: number; msg?: string }
if (r.code !== undefined && r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'datasource', { entity: 'datasource' })
log.error(` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`)
const errMsg = ` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`
log.error(errMsg)
// v2.1+ (2026-07-21): 错误路径落 CommandLog (L3)
printCommandEnd({
command: 'datasource create',
appCode: c.appCode,
result: 'failure',
error: errMsg,
summary: { enCode: opts.enCode },
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
process.exit(1)
}
let id = r.id
@@ -104,6 +147,16 @@ export function buildDatasourceCreateCommand(): Command {
}
log.info(`✓ 数据源创建成功 id=${id}`)
if (opts.json) printJson({ ...(r as object), id })
// v2.1+ (2026-07-21): 成功路径落 CommandLog (L3)
printCommandEnd({
command: 'datasource create',
appCode: c.appCode,
summary: { id, enCode: opts.enCode },
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
})
installHelpHook(cmd, {
purpose: '新建数据源 (数据库连接配置)',
+33 -2
View File
@@ -9,10 +9,14 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log } from '../../core/log.ts'
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (delete 历史可追溯)
interface DeleteOpts {
id: string
yes?: boolean
/** v2.1+ (2026-07-21): --verbose / --json (CommandLog 落盘对应字段) */
verbose?: boolean
json?: boolean
}
export function buildDatasourceDeleteCommand(): Command {
@@ -20,19 +24,46 @@ export function buildDatasourceDeleteCommand(): Command {
.description('删除数据源')
.requiredOption('--id <id>', '数据源 id')
.option('--yes', '跳过确认', false)
addOutputOptions(cmd)
.action(async (opts: DeleteOpts) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
const startTime = Date.now()
// 无 --yes 时: UX 流程控制, 不属命令失败, 不落 CommandLog (与其他 delete 命令一致)
if (!opts.yes) {
log.warn(`即将删除数据源 id=${opts.id}, 加 --yes 跳过确认`)
process.exit(2)
}
const c = await JnpfClient.fromToken()
await initWebapi(c)
const r = (await loadDataSource.delDataSource(opts.id)) as { code?: number; msg?: string }
if (r.code !== undefined && r.code !== 200) {
log.error(`datasource delete 失败: ${r.msg}`)
const errMsg = `datasource delete 失败: ${r.msg}`
log.error(errMsg)
// v2.1+ (2026-07-21): 错误路径落 CommandLog (L3)
printCommandEnd({
command: 'datasource delete',
appCode: c.appCode,
result: 'failure',
error: errMsg,
summary: { id: opts.id },
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
process.exit(1)
}
log.info(`✓ 数据源 id=${opts.id} 已删除`)
// v2.1+ (2026-07-21): 成功路径落 CommandLog (L3)
printCommandEnd({
command: 'datasource delete',
appCode: c.appCode,
summary: { id: opts.id },
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
})
installHelpHook(cmd, {
purpose: '删除数据源 (硬删, 无回收)',
+50 -19
View File
@@ -9,37 +9,68 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (list 类查询历史可追溯)
interface ListOpts {
keyword?: string
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildDatasourceListCommand(): Command {
const cmd = new Command('list')
.description('列出数据源 (数据连接)')
.option('--keyword <k>', '按名称/编码模糊搜索')
.option('--json', '原始 JSON 输出', false)
addOutputOptions(cmd)
.action(async (opts: ListOpts) => {
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
await initWebapi(c)
const data = (await loadDataSource.getDataSourceList({ keyword: opts.keyword })) as {
list?: Record<string, unknown>[]
}
const list = data?.list || []
if (opts.json) {
printJson(data)
return
}
log.info(`共 ${list.length} 个数据源`)
console.log('ID'.padEnd(30) + 'FULL_NAME'.padEnd(23) + 'ENCODE'.padEnd(21) + 'DB_TYPE')
console.log('-'.repeat(90))
for (const d of list) {
const id = String(d.id || '').padEnd(30)
const name = String(d.fullName || '').padEnd(23)
const code = String(d.enCode || '').padEnd(21)
const type = String(d.dbType || '')
console.log(`${id}${name}${code}${type}`)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
try {
await initWebapi(c)
const data = (await loadDataSource.getDataSourceList({ keyword: opts.keyword })) as {
list?: Record<string, unknown>[]
}
const list = data?.list || []
cmdSummary = {
keyword: opts.keyword,
total: list.length,
}
if (opts.json) {
printJson(data)
return
}
log.info(`共 ${list.length} 个数据源`)
console.log('ID'.padEnd(30) + 'FULL_NAME'.padEnd(23) + 'ENCODE'.padEnd(21) + 'DB_TYPE')
console.log('-'.repeat(90))
for (const d of list) {
const id = String(d.id || '').padEnd(30)
const name = String(d.fullName || '').padEnd(23)
const code = String(d.enCode || '').padEnd(21)
const type = String(d.dbType || '')
console.log(`${id}${name}${code}${type}`)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`datasource list 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'datasource list',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
})
installHelpHook(cmd, {
+54 -28
View File
@@ -11,6 +11,7 @@ import { log, printJson } from '../../core/log.ts'
import { encryptAesEcb, isEncrypted } from '../../core/crypto.ts'
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface TestOpts {
id?: string
@@ -21,6 +22,8 @@ interface TestOpts {
password?: string
serviceName?: string
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildDatasourceTestCommand(): Command {
@@ -33,38 +36,61 @@ export function buildDatasourceTestCommand(): Command {
.option('--user <u>', '用户名')
.option('--password <pwd>', '密码')
.option('--serviceName <n>', '库名')
.option('--json', '原始 JSON 输出', false)
addOutputOptions(cmd)
.action(async (opts: TestOpts) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
await initWebapi(c)
let body: Record<string, unknown>
if (opts.id) {
// 按 id 拉配置 (用 webapi), password 已被后端加密存储, 直接转发 (不要再加密)
const data = (await loadDataSource.getDataSourceInfo(opts.id)) as Record<string, unknown>
body = { ...data, id: undefined, oracleExtend: data.dbType === 'Oracle' ? 1 : 0 }
} else if (opts.host && opts.dbType) {
body = {
dbType: opts.dbType,
host: opts.host,
port: opts.port,
userName: opts.user,
password: opts.password ? (isEncrypted(opts.password) ? opts.password : encryptAesEcb(opts.password)) : '',
serviceName: opts.serviceName,
oracleExtend: opts.dbType === 'Oracle' ? 1 : 0,
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
try {
await initWebapi(c)
let body: Record<string, unknown>
if (opts.id) {
// 按 id 拉配置 (用 webapi), password 已被后端加密存储, 直接转发 (不要再加密)
const data = (await loadDataSource.getDataSourceInfo(opts.id)) as Record<string, unknown>
body = { ...data, id: undefined, oracleExtend: data.dbType === 'Oracle' ? 1 : 0 }
} else if (opts.host && opts.dbType) {
body = {
dbType: opts.dbType,
host: opts.host,
port: opts.port,
userName: opts.user,
password: opts.password ? (isEncrypted(opts.password) ? opts.password : encryptAesEcb(opts.password)) : '',
serviceName: opts.serviceName,
oracleExtend: opts.dbType === 'Oracle' ? 1 : 0,
}
} else {
throw new Error('请传 --id <数据源 id> 或 --dbType + --host + --user + --password')
}
} else {
log.error('请传 --id <数据源 id> 或 --dbType + --host + --user + --password')
process.exit(2)
const r = (await loadDataSource.testDbConnection(body)) as { code?: number; msg?: string; data?: unknown }
if (r.code !== undefined && r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'datasource', { entity: 'datasource' })
throw new Error(formatErrorLine(enhanced, { step: 0, stepName: '后端API' }))
}
log.info(`✓ 数据源连接成功`)
cmdSummary = { id: opts.id, dbType: opts.dbType || body.dbType as string, ok: true }
if (opts.json) printJson(r.data)
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`datasource test 失败: ${cmdError}`)
if (opts.json) printJson({ error: cmdError })
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'datasource test',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
const r = (await loadDataSource.testDbConnection(body)) as { code?: number; msg?: string; data?: unknown }
if (r.code !== undefined && r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'datasource', { entity: 'datasource' })
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '后端API' })}`)
if (opts.json) printJson(r)
process.exit(1)
}
log.info(`✓ 数据源连接成功`)
if (opts.json) printJson(r.data)
})
installHelpHook(cmd, {
purpose: '测试数据源连接 (按 --id 拉配置, 或直接给参数)',
+53 -21
View File
@@ -10,11 +10,14 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadDict } from '../../webapi/dict.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (data list 类查询历史可追溯)
interface Opts {
typeId?: string
all?: boolean
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildDictDataListCommand(): Command {
@@ -23,29 +26,58 @@ export function buildDictDataListCommand(): Command {
.description('字典数据列表 (按 typeId 或全部)')
.option('--typeId <id>', '字典类型 id (不传则返回全部)')
.option('--all', '等价于不传 typeId 调 /All', false)
.option('--json', '原始 JSON 输出', false)
addOutputOptions(cmd)
.action(async (opts: Opts) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
await initWebapi(c)
let path: string
let data: unknown
if (opts.all || !opts.typeId) {
path = '/system/DictionaryData/All'
data = await loadDict.getDictionaryAll()
} else {
path = `/system/DictionaryData/${opts.typeId}/Data`
data = await loadDict.getDictionaryDataList({ typeId: opts.typeId })
}
if (opts.json) {
printJson(data)
return
}
const list = (Array.isArray(data) ? data : (data as { list?: unknown[] })?.list) || []
log.info(`${path} 共 ${list.length} 条`)
console.log('ENCODE'.padEnd(21) + 'FULL_NAME'.padEnd(22) + 'SORT')
console.log('-'.repeat(60))
for (const d of list as Record<string, unknown>[]) {
console.log(`${String(d.enCode || d.id || '').padEnd(21)}${String(d.fullName || '').padEnd(22)}${d.sortCode || ''}`)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
try {
await initWebapi(c)
let path: string
let data: unknown
if (opts.all || !opts.typeId) {
path = '/system/DictionaryData/All'
data = await loadDict.getDictionaryAll()
} else {
path = `/system/DictionaryData/${opts.typeId}/Data`
data = await loadDict.getDictionaryDataList({ typeId: opts.typeId })
}
if (opts.json) {
printJson(data)
return
}
const list = (Array.isArray(data) ? data : (data as { list?: unknown[] })?.list) || []
cmdSummary = {
typeId: opts.typeId || '(all)',
path,
total: list.length,
}
log.info(`${path} 共 ${list.length} 条`)
console.log('ENCODE'.padEnd(21) + 'FULL_NAME'.padEnd(22) + 'SORT')
console.log('-'.repeat(60))
for (const d of list as Record<string, unknown>[]) {
console.log(`${String(d.enCode || d.id || '').padEnd(21)}${String(d.fullName || '').padEnd(22)}${d.sortCode || ''}`)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`dict datalist 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'dict data-list',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
})
+61 -29
View File
@@ -10,11 +10,14 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadDataModel } from '../../webapi/dataModel.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (dm fields 类查询历史可追溯)
interface FieldsOpts {
table: string
dbLinkId?: string
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildDmFieldsCommand(): Command {
@@ -22,37 +25,66 @@ export function buildDmFieldsCommand(): Command {
.description('看物理表的所有字段')
.requiredOption('--table <name>', '表名')
.option('--dbLinkId <id>', '业务库 id')
.option('--json', '原始 JSON 输出', false)
addOutputOptions(cmd)
.action(async (opts: FieldsOpts) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
// BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId
const dbLinkId = c.resolveDbLinkId(opts.dbLinkId)
// v0.11+ Phase 1: 用 web 端 getDataModelFieldList (替代 c.get('/system/DataModel/{id}/Tables/{t}/Fields'))
await initWebapi(c)
const dataObj = (await loadDataModel.getDataModelFieldList(dbLinkId, opts.table)) as
| Record<string, unknown>
| unknown[]
| null
if (opts.json) {
printJson(dataObj)
return
}
// 兼容 data 是数组 / { list: [...] } / { fields: [...] }
const arr = Array.isArray(dataObj)
? dataObj
: ((dataObj as { list?: unknown[]; fields?: unknown[] })?.list ||
(dataObj as { fields?: unknown[] })?.fields ||
[])
log.info(`表 ${opts.table} 字段数=${arr.length}`)
console.log('FIELD TYPE LENGTH NULL PK')
console.log('-'.repeat(60))
for (const f of arr as Array<Record<string, unknown>>) {
const field = String(f.field || f.columnName || '').padEnd(20)
const type = String(f.dataType || '').padEnd(14)
const len = String(f.dataLength || '').padEnd(7)
const nullable = f.allowNull === 0 || f.allowNull === '0' ? 'NO' : 'YES'
const pk = f.primaryKey === 1 || f.primaryKey === '1' ? 'PK' : ''
console.log(`${field}${type}${len}${nullable.padEnd(5)}${pk}`)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = { table: opts.table }
try {
// BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId
const dbLinkId = c.resolveDbLinkId(opts.dbLinkId)
// v0.11+ Phase 1: 用 web 端 getDataModelFieldList (替代 c.get('/system/DataModel/{id}/Tables/{t}/Fields'))
await initWebapi(c)
const dataObj = (await loadDataModel.getDataModelFieldList(dbLinkId, opts.table)) as
| Record<string, unknown>
| unknown[]
| null
if (opts.json) {
printJson(dataObj)
return
}
// 兼容 data 是数组 / { list: [...] } / { fields: [...] }
const arr = Array.isArray(dataObj)
? dataObj
: ((dataObj as { list?: unknown[]; fields?: unknown[] })?.list ||
(dataObj as { fields?: unknown[] })?.fields ||
[])
cmdSummary = {
dbLinkId,
table: opts.table,
fieldCount: arr.length,
}
log.info(`表 ${opts.table} 字段数=${arr.length}`)
console.log('FIELD TYPE LENGTH NULL PK')
console.log('-'.repeat(60))
for (const f of arr as Array<Record<string, unknown>>) {
const field = String(f.field || f.columnName || '').padEnd(20)
const type = String(f.dataType || '').padEnd(14)
const len = String(f.dataLength || '').padEnd(7)
const nullable = f.allowNull === 0 || f.allowNull === '0' ? 'NO' : 'YES'
const pk = f.primaryKey === 1 || f.primaryKey === '1' ? 'PK' : ''
console.log(`${field}${type}${len}${nullable.padEnd(5)}${pk}`)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`dm fields 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'dm fields',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
})
+53 -21
View File
@@ -10,6 +10,7 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadDataModel } from '../../webapi/dataModel.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (dm list 类查询历史可追溯)
interface ListOpts {
dbLinkId?: string
@@ -17,6 +18,8 @@ interface ListOpts {
page?: string
pageSize?: string
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildDmListCommand(): Command {
@@ -26,29 +29,58 @@ export function buildDmListCommand(): Command {
.option('--keyword <k>', '按表名模糊搜索')
.option('--page <p>', '页码', '1')
.option('--pageSize <s>', '每页条数', '50')
.option('--json', '原始 JSON 输出', false)
addOutputOptions(cmd)
.action(async (opts: ListOpts) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
// BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId
const dbLinkId = c.resolveDbLinkId(opts.dbLinkId)
// v0.11+ Phase 1: 用 web 端 getDataModelList (替代 c.get('/system/DataModel/{id}/Tables'))
await initWebapi(c)
const resp = (await loadDataModel.getDataModelList({
linkId: dbLinkId,
currentPage: Number(opts.page) || 1,
pageSize: Number(opts.pageSize) || 50,
keyword: opts.keyword,
})) as { list: { table: string; tableName: string; primaryKeyPolicy?: number }[] }
const list = resp?.list || (Array.isArray(resp) ? (resp as any) : [])
if (opts.json) {
printJson(resp)
return
}
log.info(`dbLinkId=${dbLinkId} 共 ${list.length} 张表`)
console.log('TABLE TABLE_NAME(中文)')
console.log('-'.repeat(60))
for (const t of list) {
console.log(`${t.table.padEnd(30)}${t.tableName || ''}`)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
try {
// BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId
const dbLinkId = c.resolveDbLinkId(opts.dbLinkId)
// v0.11+ Phase 1: 用 web 端 getDataModelList (替代 c.get('/system/DataModel/{id}/Tables'))
await initWebapi(c)
const resp = (await loadDataModel.getDataModelList({
linkId: dbLinkId,
currentPage: Number(opts.page) || 1,
pageSize: Number(opts.pageSize) || 50,
keyword: opts.keyword,
})) as { list: { table: string; tableName: string; primaryKeyPolicy?: number }[] }
const list = resp?.list || (Array.isArray(resp) ? (resp as any) : [])
cmdSummary = {
dbLinkId,
keyword: opts.keyword,
total: list.length,
}
if (opts.json) {
printJson(resp)
return
}
log.info(`dbLinkId=${dbLinkId} 共 ${list.length} 张表`)
console.log('TABLE TABLE_NAME(中文)')
console.log('-'.repeat(60))
for (const t of list) {
console.log(`${t.table.padEnd(30)}${t.tableName || ''}`)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`dm list 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'dm list',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
})
+59 -24
View File
@@ -17,6 +17,7 @@ import { installHelpHookWithPatterns } from '../../core/help.ts'
import { printJson, log } from '../../core/log.ts'
import type { FormDetail } from '../../core/types.ts'
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (info 类查询历史可追溯)
/**
* 尝试 JSON.parse 字符串, 失败返回原值. 用于 formData/columnData/tables 解 escaped JSON.
@@ -39,34 +40,68 @@ export function buildFormInfoCommand(): Command {
.description('拉表单完整 schema (含 formData/columnData/tables)')
.argument('<id>', '表单 id')
.option('--summary', '只打概要 (id/enCode/state/type/webType/dbLinkId/字段数)', false)
// --json 含特殊语义 (BS-新1 解码 formData escaped JSON), 跟 addOutputOptions 的通用 --json 不能混
.option('--json', 'BS-新1: 解码 formData/columnData/tables escaped JSON, 直接 jq (无需 Python 二次解码)', false)
.action(async (id: string, opts: { summary?: boolean; json?: boolean }) => {
.option('--verbose', '完整输出 (含 step machine、API 调用等过程日志)', false)
.action(async (id: string, opts: { summary?: boolean; json?: boolean; verbose?: boolean }) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
// v0.11+ Phase 1: 用 web 端 getInfo (替代 c.get('/visualdev/Base/{id}'))
await initWebapi(c)
const data = (await loadVisualDev.getInfo(id)) as FormDetail
if (opts.summary) {
const tables = (Array.isArray(data.tables) ? data.tables : []) as Array<{ table?: string }>
log.ok(`${data.fullName} (${data.enCode})`)
log.dim(`id : ${data.id}`)
log.dim(`state : ${data.state} type: ${data.type} webType: ${data.webType}`)
log.dim(`dbLinkId : ${data.dbLinkId || '(none)'}`)
log.dim(`category : ${data.category || '(none)'}`)
log.dim(`tables : ${tables.length} (${tables.map((t) => t.table).join(', ')})`)
return
}
// v0.13+ BS-新1: --json 模式解 formData/columnData/tables escaped JSON
if (opts.json) {
const decoded = { ...data } as Record<string, unknown>
for (const key of ['formData', 'columnData', 'appColumnData', 'tables']) {
if (key in decoded) {
decoded[key] = tryParseJsonString(decoded[key])
}
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = { id }
try {
// v0.11+ Phase 1: 用 web 端 getInfo (替代 c.get('/visualdev/Base/{id}'))
await initWebapi(c)
const data = (await loadVisualDev.getInfo(id)) as FormDetail
cmdSummary = {
id,
enCode: data.enCode,
fullName: data.fullName,
state: data.state,
mode: opts.summary ? 'summary' : (opts.json ? 'json-decoded' : 'json-raw'),
}
printJson(decoded)
return
if (opts.summary) {
const tables = (Array.isArray(data.tables) ? data.tables : []) as Array<{ table?: string }>
log.ok(`${data.fullName} (${data.enCode})`)
log.dim(`id : ${data.id}`)
log.dim(`state : ${data.state} type: ${data.type} webType: ${data.webType}`)
log.dim(`dbLinkId : ${data.dbLinkId || '(none)'}`)
log.dim(`category : ${data.category || '(none)'}`)
log.dim(`tables : ${tables.length} (${tables.map((t) => t.table).join(', ')})`)
return
}
// v0.13+ BS-新1: --json 模式解 formData/columnData/tables escaped JSON
if (opts.json) {
const decoded = { ...data } as Record<string, unknown>
for (const key of ['formData', 'columnData', 'appColumnData', 'tables']) {
if (key in decoded) {
decoded[key] = tryParseJsonString(decoded[key])
}
}
printJson(decoded)
return
}
printJson(data)
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`form info 失败: ${cmdError}`)
if (opts.json) printJson({ error: cmdError, id })
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3) — info 类查询历史可追溯
printCommandEnd({
command: 'form info',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
printJson(data)
})
installHelpHookWithPatterns(cmd, 'form info', {
+50 -23
View File
@@ -12,12 +12,16 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log } from '../../core/log.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface EmailTestOpts {
configId: string
email?: string
title?: string
content?: string
/** v2.1+ (2026-07-21): --verbose / --json (CommandLog 落盘对应字段) */
verbose?: boolean
json?: boolean
}
export function buildIntegrationEmailTestCommand(): Command {
@@ -28,35 +32,58 @@ export function buildIntegrationEmailTestCommand(): Command {
.option('--email <e>', '目标邮箱 (必填, 必填收件人)', '[email protected]')
.option('--title <t>', '测试邮件标题', 'Test from dacli')
.option('--content <c>', '测试邮件内容', 'This is a test email sent by dacli.')
addOutputOptions(cmd)
.action(async (opts: EmailTestOpts) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
// 1. 拉取 config 详情 (AccountConfig/testSendMail 需要 config dataForm)
const configR = await c.get<Record<string, unknown>>(`/message/AccountConfig/${opts.configId}`)
if (configR.code !== 200 || !configR.data) {
const enhanced = enhanceFromBackend(configR.msg || 'id 不存在', 'configId', { entity: 'integration' })
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '配置拉取' })}`)
process.exit(1)
}
const config = configR.data
try {
// 1. 拉取 config 详情 (AccountConfig/testSendMail 需要 config dataForm)
const configR = await c.get<Record<string, unknown>>(`/message/AccountConfig/${opts.configId}`)
if (configR.code !== 200 || !configR.data) {
const enhanced = enhanceFromBackend(configR.msg || 'id 不存在', 'configId', { entity: 'integration' })
throw new Error(formatErrorLine(enhanced, { step: 0, stepName: '配置拉取' }))
}
const config = configR.data
// 2. 拼装 test 请求 (web Test.vue 模式: {...config, testSendEmail, testEmailTitle, testEmailContent, testType})
const body = {
...config,
testSendEmail: [opts.email],
testEmailTitle: opts.title,
testEmailContent: opts.content,
testType: 'testSendMail',
}
// 2. 拼装 test 请求 (web Test.vue 模式: {...config, testSendEmail, testEmailTitle, testEmailContent, testType})
const body = {
...config,
testSendEmail: [opts.email],
testEmailTitle: opts.title,
testEmailContent: opts.content,
testType: 'testSendMail',
}
// 3. 走 AccountConfig/testSendMail (web 端真实端点)
const r = await c.postJson('/message/AccountConfig/testSendMail', body)
if (r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'email', { entity: 'integration' })
log.error(` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`)
process.exit(1)
// 3. 走 AccountConfig/testSendMail (web 端真实端点)
const r = await c.postJson('/message/AccountConfig/testSendMail', body)
if (r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'email', { entity: 'integration' })
throw new Error(formatErrorLine(enhanced, { step: 1, stepName: '后端API' }))
}
log.info(`✓ 邮件测试发送 OK (configId=${opts.configId}, to=${opts.email})`)
cmdSummary = { configId: opts.configId, email: opts.email, ok: true }
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`email test 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'integration email-test',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
log.info(`✓ 邮件测试发送 OK (configId=${opts.configId}, to=${opts.email})`)
})
installHelpHook(cmd, {
purpose: '邮件测试发送 (修复 v0.10 假 PASS 端点)',
+51 -24
View File
@@ -12,11 +12,15 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log } from '../../core/log.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface SmsTestOpts {
configId: string
phone?: string
templateId?: string
/** v2.1+ (2026-07-21): --verbose / --json (CommandLog 落盘对应字段) */
verbose?: boolean
json?: boolean
}
export function buildIntegrationSmsTestCommand(): Command {
@@ -26,36 +30,59 @@ export function buildIntegrationSmsTestCommand(): Command {
.requiredOption('--configId <id>', 'AccountConfig id')
.option('--phone <n>', '目标手机号', '13800138000')
.option('--templateId <t>', '短信模板 ID (覆盖 config 默认模板)')
addOutputOptions(cmd)
.action(async (opts: SmsTestOpts) => {
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
// 1. 拉取 config 详情
const configR = await c.get<Record<string, unknown>>(`/message/AccountConfig/${opts.configId}`)
if (configR.code !== 200 || !configR.data) {
const enhanced = enhanceFromBackend(configR.msg || 'id 不存在', 'configId', { entity: 'integration' })
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '配置拉取' })}`)
process.exit(1)
}
const config = configR.data
try {
// 1. 拉取 config 详情
const configR = await c.get<Record<string, unknown>>(`/message/AccountConfig/${opts.configId}`)
if (configR.code !== 200 || !configR.data) {
const enhanced = enhanceFromBackend(configR.msg || 'id 不存在', 'configId', { entity: 'integration' })
throw new Error(formatErrorLine(enhanced, { step: 0, stepName: '配置拉取' }))
}
const config = configR.data
// 2. 拼装 test 请求
const body: Record<string, unknown> = {
...config,
testPhone: opts.phone,
testType: 'testSendSms',
}
if (opts.templateId) {
body.testTemplateId = opts.templateId
}
// 2. 拼装 test 请求
const body: Record<string, unknown> = {
...config,
testPhone: opts.phone,
testType: 'testSendSms',
}
if (opts.templateId) {
body.testTemplateId = opts.templateId
}
// 3. 走 AccountConfig/testSendSms
const r = await c.postJson('/message/AccountConfig/testSendSms', body)
if (r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'sms', { entity: 'integration' })
log.error(` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`)
process.exit(1)
// 3. 走 AccountConfig/testSendSms
const r = await c.postJson('/message/AccountConfig/testSendSms', body)
if (r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'sms', { entity: 'integration' })
throw new Error(formatErrorLine(enhanced, { step: 1, stepName: '后端API' }))
}
log.info(`✓ 短信测试发送 OK (configId=${opts.configId}, to=${opts.phone})`)
cmdSummary = { configId: opts.configId, phone: opts.phone, ok: true }
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`sms test 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'integration sms-test',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
log.info(`✓ 短信测试发送 OK (configId=${opts.configId}, to=${opts.phone})`)
})
installHelpHook(cmd, {
purpose: '短信测试发送 (修复 v0.10 假 PASS 端点)',
+68 -38
View File
@@ -12,11 +12,15 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log } from '../../core/log.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface WebhookTestOpts {
configId?: string
url?: string
payload?: string
/** v2.1+ (2026-07-21): --verbose / --json (CommandLog 落盘对应字段) */
verbose?: boolean
json?: boolean
}
export function buildIntegrationWebhookTestCommand(): Command {
@@ -26,51 +30,77 @@ export function buildIntegrationWebhookTestCommand(): Command {
.option('--configId <id>', 'AccountConfig id (已配置 webhook 账号)')
.option('--url <u>', '临时 webhook URL (不依赖 config, 单独测试)')
.option('--payload <p>', 'JSON payload (字符串)', '{}')
addOutputOptions(cmd)
.action(async (opts: WebhookTestOpts) => {
if (!opts.configId && !opts.url) {
log.error('必须传 --configId 或 --url 之一')
process.exit(2)
}
// 输出过滤: 默认静默
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
let body: Record<string, unknown>
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
if (opts.configId) {
// 走 AccountConfig 模式: 拉取 config + 测试
const configR = await c.get<Record<string, unknown>>(`/message/AccountConfig/${opts.configId}`)
if (configR.code !== 200 || !configR.data) {
const enhanced = enhanceFromBackend(configR.msg || 'id 不存在', 'configId', { entity: 'integration' })
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '配置拉取' })}`)
process.exit(1)
try {
if (!opts.configId && !opts.url) {
throw new Error('必须传 --configId 或 --url 之一')
}
body = {
...configR.data,
testType: 'testSendWebhook',
}
} else {
// 直发模式: 仅传 url + payload
body = {
webhookUrl: opts.url,
testType: 'testSendWebhook',
}
}
if (opts.payload) {
try {
body = { ...body, ...JSON.parse(opts.payload) }
} catch (e) {
log.error(`--payload JSON 解析失败: ${(e as Error).message}`)
process.exit(2)
}
}
let body: Record<string, unknown>
const r = await c.postJson('/message/AccountConfig/testSendWebhook', body)
if (r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'webhook', { entity: 'integration' })
log.error(` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`)
process.exit(1)
if (opts.configId) {
// 走 AccountConfig 模式: 拉取 config + 测试
const configR = await c.get<Record<string, unknown>>(`/message/AccountConfig/${opts.configId}`)
if (configR.code !== 200 || !configR.data) {
const enhanced = enhanceFromBackend(configR.msg || 'id 不存在', 'configId', { entity: 'integration' })
throw new Error(formatErrorLine(enhanced, { step: 0, stepName: '配置拉取' }))
}
body = {
...configR.data,
testType: 'testSendWebhook',
}
} else {
// 直发模式: 仅传 url + payload
body = {
webhookUrl: opts.url,
testType: 'testSendWebhook',
}
}
if (opts.payload) {
try {
body = { ...body, ...JSON.parse(opts.payload) }
} catch (e) {
throw new Error(`--payload JSON 解析失败: ${(e as Error).message}`)
}
}
const r = await c.postJson('/message/AccountConfig/testSendWebhook', body)
if (r.code !== 200) {
const enhanced = enhanceFromBackend(r.msg || '', 'webhook', { entity: 'integration' })
throw new Error(formatErrorLine(enhanced, { step: 1, stepName: '后端API' }))
}
log.info(`✓ Webhook 测试发送 OK (configId=${opts.configId || '-'}, url=${opts.url || '(from config)'})`)
cmdSummary = {
configId: opts.configId || null,
url: opts.url || '(from config)',
ok: true,
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`webhook test 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'integration webhook-test',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
if (cmdError) process.exit(1)
}
log.info(`✓ Webhook 测试发送 OK (configId=${opts.configId || '-'}, url=${opts.url || '(from config)'})`)
})
installHelpHook(cmd, {
purpose: 'Webhook 测试发送 (修复 v0.10 假 PASS 端点)',
+54 -23
View File
@@ -5,11 +5,14 @@ import { Command } from 'commander'
import { readStorageConfig, defaultYmlPath, maskPlatform } from './_helpers.ts'
import { log, printJson } from '../../core/log.ts'
import { installHelpHook } from '../../core/help.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (无 appCode, 跳过 L3 落盘, 仅 L1 summary)
interface InfoOpts {
profile?: string
yml?: string
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildStorageInfoCommand(): Command {
@@ -18,32 +21,60 @@ export function buildStorageInfoCommand(): Command {
.argument('<platform>', 'platform 实例名, 如 local-plus-1 / aliyun-oss-1 / minio-1')
.option('--profile <p>', 'spring profile (默认 dev)', 'dev')
.option('--yml <path>', '显式指定 yml 路径')
.option('--json', '原始 JSON 输出 (脱敏后)', false)
addOutputOptions(cmd)
.action(async (platform: string, opts: InfoOpts) => {
const ymlPath = opts.yml || defaultYmlPath(opts.profile)
const cfg = readStorageConfig(ymlPath)
const found = cfg.platforms.find((p) => p.name === platform)
if (!found) {
const avail = cfg.platforms.map((p) => p.name).join(', ') || '(无)'
log.error(`platform '${platform}' 不在 yml 中, 可用: ${avail}`)
process.exit(2)
}
const masked = maskPlatform(found)
if (opts.json) {
printJson({
yml: ymlPath,
// 输出过滤: 默认静默
setupOutputFilter(opts)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = { platform }
try {
const ymlPath = opts.yml || defaultYmlPath(opts.profile)
const cfg = readStorageConfig(ymlPath)
const found = cfg.platforms.find((p) => p.name === platform)
if (!found) {
const avail = cfg.platforms.map((p) => p.name).join(', ') || '(无)'
throw new Error(`platform '${platform}' 不在 yml 中, 可用: ${avail}`)
}
const masked = maskPlatform(found)
cmdSummary = {
platform,
type: found.type,
isDefault: found.name === cfg.defaultPlatform,
platform: masked,
yml: ymlPath,
}
if (opts.json) {
printJson({
yml: ymlPath,
isDefault: found.name === cfg.defaultPlatform,
platform: masked,
})
return
}
log.info(`platform: ${found.name} type: ${found.type} active: ${found.name === cfg.defaultPlatform ? '✓' : '✗'}`)
log.info(`yml-path: ${found.ymlPath}`)
console.log('')
const maxKeyLen = Math.max(...Object.keys(masked.raw).map((k) => k.length))
for (const [k, v] of Object.entries(masked.raw)) {
const key = k.padEnd(maxKeyLen + 2)
console.log(` ${key} ${JSON.stringify(v)}`)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`storage info 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 输出 CommandLog (无 appCode, 跳过 L3 落盘, 仅 L1 summary)
printCommandEnd({
command: 'storage info',
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
return
}
log.info(`platform: ${found.name} type: ${found.type} active: ${found.name === cfg.defaultPlatform ? '✓' : '✗'}`)
log.info(`yml-path: ${found.ymlPath}`)
console.log('')
const maxKeyLen = Math.max(...Object.keys(masked.raw).map((k) => k.length))
for (const [k, v] of Object.entries(masked.raw)) {
const key = k.padEnd(maxKeyLen + 2)
console.log(` ${key} ${JSON.stringify(v)}`)
if (cmdError) process.exit(1)
}
})
installHelpHook(cmd, {
+57 -25
View File
@@ -8,11 +8,14 @@ import { Command } from 'commander'
import { readStorageConfig, defaultYmlPath, maskPlatform } from './_helpers.ts'
import { log, printJson } from '../../core/log.ts'
import { installHelpHook } from '../../core/help.ts'
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (无 appCode, 跳过 L3 落盘, 仅 L1 summary)
interface ListOpts {
profile?: string
yml?: string
json?: boolean
/** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */
verbose?: boolean
}
export function buildStorageListCommand(): Command {
@@ -20,35 +23,64 @@ export function buildStorageListCommand(): Command {
.description('列出 application-{profile}.yml 中 file-storage 配置的所有后端')
.option('--profile <p>', 'spring profile (默认 dev)', 'dev')
.option('--yml <path>', '显式指定 yml 路径 (覆盖 --profile 默认推断)')
.option('--json', '原始 JSON 输出', false)
addOutputOptions(cmd)
.action(async (opts: ListOpts) => {
const ymlPath = opts.yml || defaultYmlPath(opts.profile)
const cfg = readStorageConfig(ymlPath)
if (opts.json) {
printJson({
// 输出过滤: 默认静默
setupOutputFilter(opts)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
try {
const ymlPath = opts.yml || defaultYmlPath(opts.profile)
const cfg = readStorageConfig(ymlPath)
cmdSummary = {
profile: opts.profile,
yml: ymlPath,
defaultPlatform: cfg.defaultPlatform,
thumbnailSuffix: cfg.thumbnailSuffix,
platforms: cfg.platforms.map(maskPlatform),
total: cfg.platforms.length,
}
if (opts.json) {
printJson({
yml: ymlPath,
defaultPlatform: cfg.defaultPlatform,
thumbnailSuffix: cfg.thumbnailSuffix,
platforms: cfg.platforms.map(maskPlatform),
})
return
}
log.info(`yml: ${ymlPath}`)
log.info(`default-platform: ${cfg.defaultPlatform}`)
log.info(`thumbnail-suffix: ${cfg.thumbnailSuffix}`)
console.log('')
console.log('TYPE NAME EN-STORE EN-ACCESS ACTIVE YML-PATH')
console.log('-'.repeat(95))
for (const p of cfg.platforms) {
const type = p.type.padEnd(16)
const name = p.name.padEnd(18)
const store = (p.enableStorage ? 'true ' : 'false').padEnd(10)
const access = (p.enableAccess ? 'true ' : 'false').padEnd(11)
const active = (p.name === cfg.defaultPlatform ? '✓' : ' ').padEnd(8)
console.log(`${type}${name}${store}${access}${active}${p.ymlPath}`)
}
if (cfg.platforms.length === 0) {
log.warn('yml 中未发现任何已知后端 (7 种 backend-type 都没出现)')
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`storage list 失败: ${cmdError}`)
} finally {
// v2.1+ (2026-07-21): 输出 CommandLog (无 appCode, 跳过 L3 落盘, 仅 L1 summary)
printCommandEnd({
command: 'storage list',
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
return
}
log.info(`yml: ${ymlPath}`)
log.info(`default-platform: ${cfg.defaultPlatform}`)
log.info(`thumbnail-suffix: ${cfg.thumbnailSuffix}`)
console.log('')
console.log('TYPE NAME EN-STORE EN-ACCESS ACTIVE YML-PATH')
console.log('-'.repeat(95))
for (const p of cfg.platforms) {
const type = p.type.padEnd(16)
const name = p.name.padEnd(18)
const store = (p.enableStorage ? 'true ' : 'false').padEnd(10)
const access = (p.enableAccess ? 'true ' : 'false').padEnd(11)
const active = (p.name === cfg.defaultPlatform ? '✓' : ' ').padEnd(8)
console.log(`${type}${name}${store}${access}${active}${p.ymlPath}`)
}
if (cfg.platforms.length === 0) {
log.warn('yml 中未发现任何已知后端 (7 种 backend-type 都没出现)')
if (cmdError) process.exit(1)
}
})
installHelpHook(cmd, {