befly 3.2.1 → 3.3.0

package/{scripts → commands}/syncDb/table.ts

@@ -7,9 +7,9 @@
  * - 应用变更计划
  */
 
-import { Logger } from '../../utils/logger.js';
-import { toSnakeCase } from '../../utils/helper.js';
-import { parseRule } from '../../utils/helper.js';
+import { snakeCase } from 'es-toolkit/string';
+import { parseRule } from '../../util.js';
+import { Logger } from '../../lib/logger.js';
 import { IS_MYSQL, IS_PG, IS_SQLITE, SYSTEM_INDEX_FIELDS, CHANGE_TYPE_LABELS, typeMapping } from './constants.js';
 import { quoteIdentifier, logFieldChange, resolveDefaultValue, generateDefaultSql, isStringOrArrayType, getSqlType } from './helpers.js';
 import { buildIndexSQL, generateDDLClause, isPgCompatibleTypeChange } from './ddl.js';
@@ -58,7 +58,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
 
     for (const [fieldKey, fieldRule] of Object.entries(fields)) {
         // 转换字段名为下划线格式（用于与数据库字段对比）
-        const dbFieldName = toSnakeCase(fieldKey);
+        const dbFieldName = snakeCase(fieldKey);
 
         if (existingColumns[dbFieldName]) {
             const comparison = compareFieldDefinition(existingColumns[dbFieldName], fieldRule, dbFieldName);
@@ -145,7 +145,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
             const parsed = parseRule(fieldRule);
             const { name: fieldName, type: fieldType, max: fieldMax, default: fieldDefault } = parsed;
             const lenPart = isStringOrArrayType(fieldType) ? ` 长度:${parseInt(String(fieldMax))}` : '';
-            Logger.info(`[新增字段] ${tableName}.${dbFieldName} 类型:${fieldType}${lenPart} 默认:${fieldDefault ?? 'NULL'}`);
+            Logger.info(`  + 新增字段 ${dbFieldName} (${fieldType}${lenPart})`);
             addClauses.push(generateDDLClause(fieldKey, fieldRule, true));
             changed = true;
             globalCount.addFields++;
@@ -165,7 +165,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
     // 检查业务字段索引
     for (const [fieldKey, fieldRule] of Object.entries(fields)) {
         // 转换字段名为下划线格式
-        const dbFieldName = toSnakeCase(fieldKey);
+        const dbFieldName = snakeCase(fieldKey);
 
         const parsed = parseRule(fieldRule);
         const indexName = `idx_${dbFieldName}`;
@@ -185,7 +185,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
     if (IS_PG) {
         for (const [fieldKey, fieldRule] of Object.entries(fields)) {
             // 转换字段名为下划线格式
-            const dbFieldName = toSnakeCase(fieldKey);
+            const dbFieldName = snakeCase(fieldKey);
 
             if (existingColumns[dbFieldName]) {
                 const parsed = parseRule(fieldRule);

package/{scripts → commands}/syncDb/tableCreate.ts

@@ -8,12 +8,13 @@
  *
  * 注意：此模块从 table.ts 中提取，用于解除循环依赖
  */
-
-import { Logger } from '../../utils/logger.js';
+import { snakeCase } from 'es-toolkit/string';
+import { parseRule } from '../../util.js';
+import { Logger } from '../../lib/logger.js';
 import { IS_MYSQL, IS_PG, MYSQL_TABLE_CONFIG } from './constants.js';
 import { quoteIdentifier } from './helpers.js';
 import { buildSystemColumnDefs, buildBusinessColumnDefs, buildIndexSQL } from './ddl.js';
-import { parseRule, toSnakeCase } from '../../utils/helper.js';
+
 import type { SQL } from 'bun';
 
 // 是否为计划模式（从环境变量读取）
@@ -48,7 +49,7 @@ async function addPostgresComments(sql: SQL, tableName: string, fields: Record<s
     // 业务字段注释
     for (const [fieldKey, fieldRule] of Object.entries(fields)) {
         // 转换字段名为下划线格式
-        const dbFieldName = toSnakeCase(fieldKey);
+        const dbFieldName = snakeCase(fieldKey);
 
         const parsed = parseRule(fieldRule);
         const { name: fieldName } = parsed;
@@ -85,7 +86,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
     // 业务字段索引
     for (const [fieldKey, fieldRule] of Object.entries(fields)) {
         // 转换字段名为下划线格式
-        const dbFieldName = toSnakeCase(fieldKey);
+        const dbFieldName = snakeCase(fieldKey);
 
         const parsed = parseRule(fieldRule);
         if (parsed.index === 1) {
@@ -132,7 +133,7 @@ export async function createTable(sql: SQL, tableName: string, fields: Record<st
         Logger.info(`[计划] ${createSQL.replace(/\n+/g, ' ')}`);
     } else {
         await sql.unsafe(createSQL);
-        Logger.info(`[新建表] ${tableName}`);
+        Logger.info(`  ✓ 新建表`);
     }
 
     // PostgreSQL: 添加列注释

package/{scripts → commands}/syncDb/types.ts

@@ -83,10 +83,10 @@ export interface GlobalStats {
  */
 export interface ParsedFieldRule {
     name: string;
-    type: string;
-    min: any;
-    max: any;
+    type: 'string' | 'number' | 'text' | 'array_string' | 'array_text';
+    min: number | null;
+    max: number | null;
     default: any;
-    index: number;
-    regex: string;
+    index: 0 | 1;
+    regex: string | null;
 }

package/{scripts → commands}/syncDb/version.ts

@@ -5,8 +5,8 @@
  * - 数据库版本验证（MySQL/PostgreSQL/SQLite）
  */
 
-import { Logger } from '../../utils/logger.js';
 import { Env } from '../../config/env.js';
+import { Logger } from '../../lib/logger.js';
 import { DB_VERSION_REQUIREMENTS, IS_MYSQL, IS_PG, IS_SQLITE } from './constants.js';
 import type { SQL } from 'bun';
 

package/commands/syncDb.ts

@@ -0,0 +1,35 @@
+/**
+ * SyncDb 命令 - 同步数据库表结构
+ */
+
+import { Command } from 'commander';
+import { join } from 'pathe';
+import { existsSync } from 'node:fs';
+import ora from 'ora';
+import { Logger } from '../lib/logger.js';
+import { SyncDb } from './syncDb/index.js';
+
+interface SyncDbOptions {
+    table?: string;
+    dryRun: boolean;
+}
+
+export async function syncDbCommand(options: SyncDbOptions) {
+    try {
+        // 设置环境变量
+        if (options.dryRun) {
+            process.env.SYNC_DRY_RUN = '1';
+        }
+
+        if (options.table) {
+            process.env.SYNC_TABLE = options.table;
+        }
+
+        // 执行同步
+        await SyncDb();
+        Logger.info('数据库表结构同步完成');
+    } catch (error: any) {
+        Logger.error('数据库同步失败:', error);
+        process.exit(1);
+    }
+}

package/commands/syncDev.ts

@@ -0,0 +1,174 @@
+/**
+ * SyncDev 命令 - 同步开发者管理员到数据库
+ * - 邮箱: 通过 DEV_EMAIL 环境变量配置（默认 dev@qq.com）
+ * - 姓名: 开发者
+ * - 密码: 使用 bcrypt 加密，通过 DEV_PASSWORD 环境变量配置
+ * - 角色: roleCode=dev, roleType=admin
+ * - 表名: core_admin
+ */
+
+import { Logger } from '../lib/logger.js';
+import { Cipher } from '../lib/cipher.js';
+import { Database } from '../lib/database.js';
+import { Env } from '../config/env.js';
+
+interface SyncDevOptions {
+    plan?: boolean;
+}
+
+/**
+ * SyncDev 命令主函数
+ */
+export async function syncDevCommand(options: SyncDevOptions = {}) {
+    try {
+        if (options.plan) {
+            Logger.info('[计划] 同步完成后将初始化/更新开发管理员账号（plan 模式不执行）');
+            return;
+        }
+
+        if (!Env.DEV_PASSWORD) {
+            Logger.warn('跳过开发管理员初始化：缺少 DEV_PASSWORD 配置');
+            return;
+        }
+
+        Logger.info('开始同步开发管理员账号...\n');
+
+        // 连接数据库（SQL + Redis）
+        await Database.connect();
+
+        const helper = Database.getDbHelper();
+
+        // 检查 core_admin 表是否存在
+        const existAdmin = await helper.tableExists('core_admin');
+        if (!existAdmin) {
+            Logger.warn('跳过开发管理员初始化：未检测到 core_admin 表');
+            return;
+        }
+
+        // 检查 core_role 表是否存在
+        const existRole = await helper.tableExists('core_role');
+        if (!existRole) {
+            Logger.warn('跳过开发管理员初始化：未检测到 core_role 表');
+            return;
+        }
+
+        // 检查 core_menu 表是否存在
+        const existMenu = await helper.tableExists('core_menu');
+        if (!existMenu) {
+            Logger.warn('跳过开发管理员初始化：未检测到 core_menu 表');
+            return;
+        }
+
+        // 查询所有菜单 ID
+        const allMenus = await helper.getAll({
+            table: 'core_menu',
+            fields: ['id']
+        });
+
+        if (!allMenus || !Array.isArray(allMenus)) {
+            Logger.warn('查询菜单失败或菜单表为空');
+            return;
+        }
+
+        const menuIds = allMenus.length > 0 ? allMenus.map((m: any) => m.id).join(',') : '';
+        Logger.info(`查询到 ${allMenus.length} 个菜单，ID 列表: ${menuIds || '(空)'}`);
+
+        // 查询所有接口 ID
+        const existApi = await helper.tableExists('core_api');
+        let apiIds = '';
+        if (existApi) {
+            const allApis = await helper.getAll({
+                table: 'core_api',
+                fields: ['id']
+            });
+
+            if (allApis && Array.isArray(allApis) && allApis.length > 0) {
+                apiIds = allApis.map((a: any) => a.id).join(',');
+                Logger.info(`查询到 ${allApis.length} 个接口，ID 列表: ${apiIds}`);
+            } else {
+                Logger.info('未查询到接口数据');
+            }
+        } else {
+            Logger.info('接口表不存在，跳过接口权限配置');
+        }
+
+        // 查询或创建 dev 角色
+        let devRole = await helper.getOne({
+            table: 'core_role',
+            where: { code: 'dev' }
+        });
+
+        if (devRole) {
+            // 更新 dev 角色的菜单和接口权限
+            await helper.updData({
+                table: 'core_role',
+                where: { code: 'dev' },
+                data: {
+                    name: '开发者角色',
+                    description: '拥有所有菜单和接口权限的开发者角色',
+                    menus: menuIds,
+                    apis: apiIds
+                }
+            });
+            Logger.info('dev 角色菜单和接口权限已更新');
+        } else {
+            // 创建 dev 角色
+            const roleId = await helper.insData({
+                table: 'core_role',
+                data: {
+                    name: '开发者角色',
+                    code: 'dev',
+                    description: '拥有所有菜单和接口权限的开发者角色',
+                    menus: menuIds,
+                    apis: apiIds,
+                    sort: 0
+                }
+            });
+            devRole = { id: roleId };
+            Logger.info('dev 角色已创建');
+        }
+
+        // 使用 bcrypt 加密密码
+        const hashed = await Cipher.hashPassword(Env.DEV_PASSWORD);
+
+        // 准备开发管理员数据
+        const devData = {
+            name: '开发者',
+            nickname: '开发者',
+            email: Env.DEV_EMAIL,
+            username: 'dev',
+            password: hashed,
+            roleId: devRole.id,
+            roleCode: 'dev',
+            roleType: 'admin'
+        };
+
+        // 查询现有账号
+        const existing = await helper.getOne({
+            table: 'core_admin',
+            where: { email: Env.DEV_EMAIL }
+        });
+
+        if (existing) {
+            // 更新现有账号
+            await helper.updData({
+                table: 'core_admin',
+                where: { email: Env.DEV_EMAIL },
+                data: devData
+            });
+            Logger.info(`✅ 开发管理员已更新：email=${Env.DEV_EMAIL}, username=dev, roleCode=dev, roleType=admin`);
+        } else {
+            // 插入新账号
+            await helper.insData({
+                table: 'core_admin',
+                data: devData
+            });
+            Logger.info(`✅ 开发管理员已初始化：email=${Env.DEV_EMAIL}, username=dev, roleCode=dev, roleType=admin`);
+        }
+    } catch (error: any) {
+        Logger.error('开发管理员同步失败:', error);
+        process.exit(1);
+    } finally {
+        await Database?.disconnect();
+    }
+}