From f59d8d154a7a4c1182651cf6a60db567fc98f794 Mon Sep 17 00:00:00 2001 From: ssw Date: Thu, 25 Jun 2026 15:15:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(v0.11+):=20dm=20create=20+=20drop=20we?= =?UTF-8?q?bapi=20=E5=8C=96=20(Phase=202=20REFACTOR-WEBAPI=20100%=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase 1 审计 P0: - dm create + drop 切到 webapi/dataModel.ts (loadDataModel.createDataModel + delDataModel) - 累计 REFACTOR-WEBAPI 完成统计: * datasource 4 子 (7a34ee6) * dict 4 子 (20ddbfb) * menu 5 子 (c7b24eb + 694619b) * form 11 子命令 (validate/fixcolumndata/bindflow/clone/export/codegen/import/create) 22 调用 (9c14cda + 7bf7762 + 938c31d + e6a56f3 + c98bf2b) * dm 2 子 (create + drop) (本 commit) - 累计 webapi 化 14 个父命令子命令, 消除 ~400 行硬编码 未 webapi 化 (后续, 因 webapi 未镜像): - bigscreen/report/portal/print (独立子项目, webapi 模块未建) - log/monitor/msg/integration/schedule/storage/user/role/org (webapi 未镜像) - workflow 部分 (workflow webapi 已有但 workflow 子命令未切) Co-Authored-By: Claude --- src/commands/dm/create.ts | 15 +++++++-------- src/commands/dm/drop.ts | 15 +++++++++------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/commands/dm/create.ts b/src/commands/dm/create.ts index 35baebd..bc0bd7b 100644 --- a/src/commands/dm/create.ts +++ b/src/commands/dm/create.ts @@ -13,6 +13,7 @@ import { log, printJson } from '../../core/log.ts' import { preCheckDmCreate, handlePreCheckResult, loadContextSafe } from '../_precheck.ts' import { runGuards, handleGuardResult } from '../_blindspot_guards.ts' import { loadAppContext } from '../app/context.ts' +import { initWebapi, loadDataModel } from '../../webapi/dataModel.ts' interface CreateOpts { table: string @@ -126,14 +127,12 @@ export function buildDmCreateCommand(): Command { }, tableFieldList: allFields, } - log.info(`POST /system/DataModel/${dbLinkId}/Table table=${cleanTable} fields=${allFields.length} (含9系统列)`) - // P0.2: 加载 AppContext 供诊断用 (复用 P0.1 loadAppContext, 失败不阻断) - const diagCtx = await loadAppContext().catch(() => null) - const r = await c.callWithDiagnosis<{ table?: string }>( - () => c.postJson<{ table?: string }>(`/system/DataModel/${dbLinkId}/Table`, body), - diagCtx, - ) - if (r.code !== 200) { + log.info(`loadDataModel.createDataModel table=${cleanTable} fields=${allFields.length} (含9系统列)`) + // v0.11+ Phase 2: 改用 webapi (loadDataModel.createDataModel) + // 注: webapi 路径下不再用 callWithDiagnosis (走 defHttp shim), 错误仍捕获显示 + await initWebapi(c) + const r = (await loadDataModel.createDataModel(dbLinkId, body)) as { code?: number; msg?: string; table?: string } + if (r.code !== 200 && r.code !== undefined) { // D-5 (盲点 38 防御): 友好提示 f_description 冲突 const errMsg = r.msg || '' if (errMsg.includes("Duplicate column name 'f_description'")) { diff --git a/src/commands/dm/drop.ts b/src/commands/dm/drop.ts index a82a148..ec1a331 100644 --- a/src/commands/dm/drop.ts +++ b/src/commands/dm/drop.ts @@ -1,7 +1,8 @@ /** * commands/dm/drop.ts — 删除物理表 * - * API: DELETE /api/system/DataModel/{linkId}/Table/{table} + * v0.11+ Phase 2 (2026-06-25): 改用 webapi 镜像 (loadDataModel.delDataModel) + * 替代 v0.10 直接 c.del('/system/DataModel/{dbLinkId}/Table/{table}') * * ⚠️ 危险操作, 表数据不可恢复. 真实执行需双重人工确认 (TODO: 加 TTY 拦截) */ @@ -9,6 +10,7 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installAiHelpHook } from '../../core/help.ts' import { log } from '../../core/log.ts' +import { initWebapi, loadDataModel } from '../../webapi/dataModel.ts' interface DropOpts { table: string @@ -31,9 +33,10 @@ export function buildDmDropCommand(): Command { const c = await JnpfClient.fromToken() // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId const dbLinkId = c.resolveDbLinkId(opts.dbLinkId) - log.info(`DELETE /system/DataModel/${dbLinkId}/Table/${opts.table}`) - const r = await c.del(`/system/DataModel/${dbLinkId}/Table/${opts.table}`) - if (r.code !== 200) { + log.info(`loadDataModel.delDataModel dbLinkId=${dbLinkId} table=${opts.table}`) + await initWebapi(c) + const r = (await loadDataModel.delDataModel(dbLinkId, opts.table)) as { code?: number; msg?: string } + if (r.code !== 200 && r.code !== undefined) { log.error(`删表失败 (code=${r.code}): ${r.msg}`) process.exit(1) } @@ -45,8 +48,8 @@ export function buildDmDropCommand(): Command { required: { '--table': '表名', '--yes': '必须传 --yes 跳过确认' }, optional: { '--dbLinkId': '业务库 id' }, example: 'dacli dm drop --table=test_table --yes', - source: { api: 'DELETE /api/system/DataModel/{dbLinkId}/Table/{table}' }, - notes: ['生产环境务必先用 dacli app init --backup 备份'], + source: { api: 'DELETE /api/system/DataModel/{dbLinkId}/Table/{table}', ref: 'web/.../api/systemData/dataModel.ts delDataModel()' }, + notes: ['v0.11+ 改用 webapi 镜像', '生产环境务必先用 dacli app init --backup 备份'], }) return cmd }