266 lines
11 KiB
TypeScript
266 lines
11 KiB
TypeScript
/**
|
|
* commands/app/create.ts — 真·应用创建
|
|
*
|
|
* 借鉴: 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 版本地)
|
|
*
|
|
* 兼容:
|
|
* - ssw-common 不存在 → 步骤 2/3 警告跳过, 用户后续手动建 DataSource
|
|
* - 应用已存在 → 走"幂等"模式, 跳过创建, 返回已有 systemId
|
|
*
|
|
* 不做 (留给后续):
|
|
* - 写 application-dev.yml: TS 版不动文件系统, 改在 ssw-common 走 spring 默认
|
|
* - 重启 JNPF: 走 dacli.conf, 留给 v0.9 集成
|
|
*/
|
|
import { Command } from 'commander'
|
|
import { JnpfClient } from '../../core/client.ts'
|
|
import { installAiHelpHook } from '../../core/help.ts'
|
|
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'
|
|
|
|
interface CreateOpts {
|
|
appCode: string
|
|
appName: string
|
|
dbName?: string
|
|
account?: string
|
|
password?: string
|
|
/** 已存在则强制重建 (删旧 datasource + 重建) */
|
|
forceRebuild?: boolean
|
|
/** 跳过 saveAppAuthorization (默认走) */
|
|
skipGrant?: boolean
|
|
/** 跳过 ssw-common 真建 DB (默认走) */
|
|
skipDb?: boolean
|
|
json?: boolean
|
|
}
|
|
|
|
interface AppItem {
|
|
id?: string
|
|
fullName?: string
|
|
enCode?: string
|
|
}
|
|
|
|
interface DsItem {
|
|
id?: string
|
|
fullName?: string
|
|
enCode?: string
|
|
}
|
|
|
|
export function buildAppCreateCommand(): Command {
|
|
const cmd = new Command('create')
|
|
.description('真·创建 JNPF 应用 (System+DB+DataSource+授权+重登, 端到端 0 差错)')
|
|
.requiredOption('--appCode <code>', '应用编码 (英文, 唯一)')
|
|
.requiredOption('--appName <name>', '应用中文名称')
|
|
.option('--dbName <db>', '数据库名 (默认同 appCode)')
|
|
.option('--account <a>', '管理员账号 (默认 admin)', 'admin')
|
|
.option('--password <p>', '管理员密码 (默认 123456)', '123456')
|
|
.option('--force-rebuild', '已存在时强制删旧 datasource 重建', false)
|
|
.option('--skip-grant', '跳过 saveAppAuthorization', false)
|
|
.option('--skip-db', '跳过 ssw-common 真建 DB (用户已建好)', false)
|
|
.option('--json', '原始 JSON 输出', false)
|
|
.action(async (opts: CreateOpts) => {
|
|
const dbName = opts.dbName || opts.appCode
|
|
log.info(`开始创建应用: ${opts.appCode} (${opts.appName})`)
|
|
log.dim(` dbName=${dbName}, force-rebuild=${!!opts.forceRebuild}, skip-db=${!!opts.skipDb}, skip-grant=${!!opts.skipGrant}`)
|
|
|
|
// === 0. 拿当前 token (developSystem 登录态, 后面切换) ===
|
|
const c = await JnpfClient.fromToken()
|
|
log.dim(` 当前登录: ${c.account} @ ${c.appCode} (baseUrl=${c.baseUrl})`)
|
|
|
|
// === 1. 创建系统 (幂等: 已存在则复用) ===
|
|
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 || ''
|
|
if (systemId) {
|
|
log.ok(` ✓ 系统已存在: systemId=${systemId} (复用)`)
|
|
} else {
|
|
const body = {
|
|
fullName: opts.appName,
|
|
enCode: opts.appCode,
|
|
icon: 'icon-ym icon-ym-left-join',
|
|
backgroundColor: '#008cff',
|
|
isMain: 0,
|
|
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' })
|
|
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 || ''
|
|
if (!systemId) {
|
|
log.error(` ✗ 系统创建后未找到 id, 可能 JNPF 异常`)
|
|
process.exit(1)
|
|
}
|
|
log.ok(` ✓ 系统创建: systemId=${systemId}`)
|
|
}
|
|
|
|
// === 2. 创建 MySQL 数据库 (ssw-common /dblinkExt/createDatabase) ===
|
|
let dbLinkId = ''
|
|
if (!opts.skipDb) {
|
|
log.info(`[2/5] 创建 MySQL DB '${dbName}'...`)
|
|
const r2 = await c.postJson<boolean>('/common/dblinkExt/createDatabase', { dbName, dbType: 'MySQL' })
|
|
if (r2.code === 200) {
|
|
log.ok(` ✓ DB '${dbName}' 创建/已存在`)
|
|
} else if (r2.code === 404) {
|
|
log.warn(` ⚠ ssw-common 未加载, 跳过真建 DB. DataSource 也跳过, 请手动建.`)
|
|
opts.skipDb = true
|
|
} else {
|
|
log.error(` ✗ createDatabase 失败: code=${r2.code} ${r2.msg}`)
|
|
process.exit(1)
|
|
}
|
|
} else {
|
|
log.dim(' (--skip-db 跳过)')
|
|
}
|
|
|
|
// === 3. 创建 DataSource (幂等; --force-rebuild 删旧重建) ===
|
|
if (!opts.skipDb) {
|
|
log.info('[3/5] 创建 DataSource...')
|
|
// 3.1 查现有 DataSource
|
|
const dsList = await c.get<{ list: DsItem[] }>('/system/DataSource', { currentPage: 1, pageSize: 100 })
|
|
const existing = dsList.data?.list?.find((x) => x.fullName === opts.appCode)
|
|
if (existing?.id && !opts.forceRebuild) {
|
|
dbLinkId = existing.id
|
|
log.ok(` ✓ DataSource 已存在: dbLinkId=${dbLinkId} (复用)`)
|
|
} else {
|
|
if (existing?.id && opts.forceRebuild) {
|
|
log.warn(` ⚡ --force-rebuild: 删旧 DataSource ${existing.id}`)
|
|
await c.del(`/system/DataSource/${existing.id}`)
|
|
}
|
|
// 3.2 用 ssw-common dblinkExt/create (默认从 yml 读 host/port/user/password)
|
|
const body = {
|
|
fullName: opts.appCode,
|
|
dbType: 'MySQL',
|
|
serviceName: dbName,
|
|
description: `${opts.appName} 数据源`,
|
|
}
|
|
const r3 = await c.postJson<string>('/common/dblinkExt/create', body)
|
|
// dblinkExt/create 返回格式: {"code":200, "msg":"<dbLinkId>", "data":null}
|
|
// 兼容 data 也可能有 id 的旧版本
|
|
const newId = r3.code === 200 ? (typeof r3.data === 'string' ? r3.data : r3.msg) : ''
|
|
if (r3.code === 200 && newId) {
|
|
dbLinkId = String(newId)
|
|
log.ok(` ✓ DataSource 创建: dbLinkId=${dbLinkId}`)
|
|
} else {
|
|
log.error(` ✗ dblinkExt/create 失败: code=${r3.code} ${r3.msg}`)
|
|
process.exit(1)
|
|
}
|
|
}
|
|
}
|
|
|
|
// === 4. 授权: isAllDevUser=1 全员开发者可见此应用 ===
|
|
if (!opts.skipGrant) {
|
|
log.info('[4/5] 授权 (isAllDevUser=1)...')
|
|
const grantBody = {
|
|
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) {
|
|
log.ok(` ✓ 授权完成 (全员可见)`)
|
|
} else {
|
|
log.warn(` ⚠ 授权失败 (非致命): code=${r4.code} ${r4.msg}`)
|
|
}
|
|
} else {
|
|
log.dim(' (--skip-grant 跳过)')
|
|
}
|
|
|
|
// === 5. 重新登录 newAppCode + 保存 token ===
|
|
log.info('[5/5] 重新登录新 appCode...')
|
|
try {
|
|
const c2 = await JnpfClient.login({
|
|
baseUrl: c.baseUrl,
|
|
appCode: opts.appCode,
|
|
account: opts.account || 'admin',
|
|
password: opts.password || '123456',
|
|
})
|
|
const tf: TokenFile = {
|
|
baseUrl: c2.baseUrl,
|
|
appCode: opts.appCode,
|
|
account: opts.account || 'admin',
|
|
token: c2.token,
|
|
loginAt: new Date().toISOString(),
|
|
dbLinkId: dbLinkId || c2.dbLinkId,
|
|
}
|
|
saveToken(tf)
|
|
log.ok(` ✓ 已登录 + 保存 token (appCode=${opts.appCode}, dbLinkId=${tf.dbLinkId})`)
|
|
} catch (e) {
|
|
log.warn(` ⚠ 切换登录失败: ${(e as Error).message}`)
|
|
log.warn(` 请手动: dacli app login --account=admin --password=123456 --appCode=${opts.appCode}`)
|
|
}
|
|
|
|
log.info('================================')
|
|
log.ok('应用创建完成')
|
|
const summary = {
|
|
appCode: opts.appCode,
|
|
appName: opts.appName,
|
|
systemId,
|
|
dbLinkId,
|
|
dbName,
|
|
}
|
|
if (opts.json) {
|
|
console.log(JSON.stringify(summary, null, 2))
|
|
} else {
|
|
log.info(` appCode : ${summary.appCode}`)
|
|
log.info(` appName : ${summary.appName}`)
|
|
log.info(` systemId : ${summary.systemId}`)
|
|
log.info(` dbLinkId : ${summary.dbLinkId || '(跳过 DB)'}`)
|
|
log.info(` dbName : ${summary.dbName}`)
|
|
log.info('')
|
|
log.info('下一步:')
|
|
log.info(` dacli form list # 应有 0 个 form`)
|
|
log.info(` dacli dm create --table=... # 建第一个业务表`)
|
|
log.info(` dacli form create --enCode=... --table=...`)
|
|
log.info(` 浏览器: http://nginx/jnpf_app_${opts.appCode}`)
|
|
}
|
|
})
|
|
|
|
installAiHelpHook(cmd, {
|
|
purpose: '真·创建 JNPF 应用 (System+DB+DataSource+授权+重登, 端到端 0 差错). 替代 Java 版 dacli app init.',
|
|
required: {
|
|
'--appCode': '应用编码 (英文, 唯一)',
|
|
'--appName': '应用中文名称',
|
|
},
|
|
optional: {
|
|
'--dbName': '数据库名 (默认同 appCode)',
|
|
'--account': '管理员账号 (默认 admin)',
|
|
'--password': '管理员密码 (默认 123456)',
|
|
'--force-rebuild': '已存在 DataSource 时强制删旧重建',
|
|
'--skip-grant': '跳过 saveAppAuthorization (默认走全员)',
|
|
'--skip-db': '跳过真建 DB + DataSource (用户已建好)',
|
|
'--json': '原始 JSON 输出',
|
|
},
|
|
example: [
|
|
'dacli app create --appCode=tdss --appName=可信数据空间增强版',
|
|
'dacli app create --appCode=tdss --appName=可信数据空间增强版 --dbName=tdss_db',
|
|
'dacli app create --appCode=tdss --appName=可信数据空间增强版 --force-rebuild',
|
|
].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',
|
|
ref: 'docs/dacli/ssw-dacli/src/main/java/ssw/dacli/commands/InitAppCommand.java (Java 借鉴)',
|
|
},
|
|
notes: [
|
|
'**幂等**: 应用/DataSource 已存在则复用 (除 --force-rebuild)',
|
|
'**ssw-common 必需**: 真建 DB 走 /common/dblinkExt/createDatabase, 未加载时 --skip-db 跳过',
|
|
'**yml**: 不动文件, ssw-common 走 spring.datasource.* 默认 (host/port/user/pwd)',
|
|
'**0 差错检查**: 流程末尾自动切换登录 + 保存 token, 失败留警告但不退出',
|
|
],
|
|
})
|
|
return cmd
|
|
}
|