befly 3.8.27 → 3.8.30

package/main.ts

@@ -4,12 +4,11 @@
  */
 
 // ========== 外部依赖 ==========
-import { calcPerfTime } from 'befly-util';
+import { calcPerfTime } from 'befly-shared/calcPerfTime';
 
 // ========== 相对导入 ==========
 import { Logger } from './lib/logger.js';
 import { Cipher } from './lib/cipher.js';
-import { Jwt } from './lib/jwt.js';
 import { Connect } from './lib/connect.js';
 import { DbHelper } from './lib/dbHelper.js';
 import { RedisHelper } from './lib/redisHelper.js';
@@ -103,7 +102,7 @@ export class Befly {
                     '/*': staticHandler(this.config)
                 },
                 error: (error: Error) => {
-                    Logger.error('服务启动时发生错误', error);
+                    Logger.error({ err: error }, '服务启动时发生错误');
                     return Response.json({ code: 1, msg: '内部服务器错误' });
                 }
             });
@@ -128,7 +127,7 @@ export class Befly {
                     await Connect.disconnect();
                     Logger.info('数据库连接已关闭');
                 } catch (error: any) {
-                    Logger.error('关闭数据库连接时出错:', error);
+                    Logger.error({ err: error }, '关闭数据库连接时出错');
                 }
 
                 Logger.info('服务器已优雅关闭');
@@ -140,20 +139,8 @@ export class Befly {
 
             return server;
         } catch (error: any) {
-            Logger.error('项目启动失败', error);
+            Logger.error({ err: error }, '项目启动失败');
             process.exit(1);
         }
     }
 }
-
-// 核心类和工具导出
-export {
-    // 配置
-    Logger,
-    Cipher,
-    Jwt,
-    Database,
-    DbHelper,
-    RedisHelper,
-    coreDir
-};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.8.27",
+    "version": "3.8.30",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -15,10 +15,7 @@
             "types": "./main.ts",
             "default": "./main.ts"
         },
-        "./types": {
-            "types": "./types/index.ts",
-            "default": "./types/index.ts"
-        }
+        "./*": "./*"
     },
     "scripts": {
         "bundler": "bun build ./main.ts --outfile ./main.single.ts --minify --target bun"
@@ -66,12 +63,16 @@
         "bun": ">=1.3.0"
     },
     "dependencies": {
-        "befly-util": "^1.0.6",
+        "befly-shared": "^1.1.1",
         "chalk": "^5.6.2",
-        "es-toolkit": "^1.41.0",
-        "pathe": "^2.0.3"
+        "es-toolkit": "^1.42.0",
+        "fast-jwt": "^6.0.2",
+        "fast-xml-parser": "^5.3.2",
+        "pathe": "^2.0.3",
+        "pino": "^10.1.0",
+        "pino-roll": "^4.0.0"
     },
-    "gitHead": "54c0f11f65a56f7df036fdf386b72329496777b4",
+    "gitHead": "2031550167896390ac58c50aeb52b8c23426844e",
     "devDependencies": {
         "typescript": "^5.9.3"
     }

package/paths.ts

@@ -46,9 +46,6 @@ export const corePluginDir = join(__dirname, 'plugins');
  */
 export const coreHookDir = join(__dirname, 'hooks');
 
-/**
- * Core 框架 API 目录
-
 /**
  * Core 框架 API 目录
  * @description packages/core/apis/
@@ -93,9 +90,6 @@ export const projectPluginDir = join(projectDir, 'plugins');
  */
 export const projectHookDir = join(projectDir, 'hooks');
 
-/**
- * 项目 API 目录
-
 /**
  * 项目 API 目录
  * @description {projectDir}/apis/

package/plugins/db.ts

@@ -26,14 +26,14 @@ const dbPlugin: Plugin = {
 
             return dbManager;
         } catch (error: any) {
-            Logger.error('数据库初始化失败', error);
+            Logger.error({ err: error }, '数据库初始化失败');
 
             // 清理资源
             if (sql) {
                 try {
                     await sql.close();
                 } catch (cleanupError: any) {
-                    Logger.error('清理连接池失败:', cleanupError);
+                    Logger.error({ err: cleanupError }, '清理连接池失败');
                 }
             }
 

package/plugins/jwt.ts

@@ -1,15 +1,15 @@
 /**
  * JWT 插件
- * 提供 JSON Web Token 签名和验证功能
  */
 
 import { Jwt } from '../lib/jwt.js';
 
 import type { Plugin } from '../types/plugin.js';
 
-export default {
-    name: 'jwt',
+const jwtPlugin: Plugin = {
     handler: (context, config) => {
-        return Jwt;
+        return new Jwt(config?.auth);
     }
-} as Plugin;
+};
+
+export default jwtPlugin;

package/plugins/redis.ts

@@ -26,7 +26,7 @@ const redisPlugin: Plugin = {
             // 返回 RedisHelper 实例
             return new RedisHelper(config.prefix);
         } catch (error: any) {
-            Logger.error('Redis 初始化失败', error);
+            Logger.error({ err: error }, 'Redis 初始化失败');
 
             // 插件内禁止直接退出进程，抛出异常交由主流程统一处理
             throw error;

package/router/api.ts

@@ -4,7 +4,7 @@
  */
 
 // 外部依赖
-import { genShortId } from 'befly-util';
+import { genShortId } from 'befly-shared/genShortId';
 
 // 相对导入
 import { FinalResponse } from '../util.js';
@@ -88,7 +88,7 @@ export function apiHandler(apis: Map<string, ApiRoute>, hooks: Hook[], context:
         } catch (err: any) {
             // 全局错误处理
             const errorPath = ctx.api ? apiPath : req.url;
-            Logger.error(`请求错误: ${errorPath}`, err);
+            Logger.error({ err: err, path: errorPath }, '请求错误');
             ctx.result = {
                 code: 1,
                 msg: '内部服务错误'

package/router/static.ts

@@ -55,8 +55,7 @@ export function staticHandler(config: BeflyOptions) {
                 );
             }
         } catch (error: any) {
-            // 记录详细的错误日志
-            Logger.error('静态文件处理失败', error);
+            Logger.error({ err: error }, '静态文件处理失败');
 
             return Response.json(
                 {

package/sync/syncAll.ts

@@ -32,9 +32,9 @@ export async function syncAllCommand(config: BeflyOptions, options: SyncOptions
 
         // 输出总结
         const totalTimeSeconds = ((Date.now() - startTime) / 1000).toFixed(2);
-        Logger.info(`同步完成 (耗时 ${totalTimeSeconds}s)`);
+        Logger.info({ duration: totalTimeSeconds }, '同步完成');
     } catch (error: any) {
-        Logger.error('同步过程中发生错误', error);
+        Logger.error({ err: error }, '同步过程中发生错误');
         throw error;
     }
 }

package/sync/syncApi.ts

@@ -13,8 +13,11 @@
 import { readdirSync, statSync } from 'node:fs';
 import { join, dirname, relative, basename } from 'pathe';
 import { Connect } from '../lib/connect.js';
+import { DbHelper } from '../lib/dbHelper.js';
 import { RedisHelper } from '../lib/redisHelper.js';
-import { scanFiles, scanAddons, addonDirExists, getAddonDir } from 'befly-util';
+import { RedisKeys } from 'befly-shared/redisKeys';
+import { scanFiles } from 'befly-shared/scanFiles';
+import { scanAddons, addonDirExists, getAddonDir } from 'befly-shared/addonHelper';
 
 import { Logger } from '../lib/logger.js';
 import { projectDir } from '../paths.js';
@@ -59,7 +62,7 @@ async function extractApiInfo(filePath: string, apiRoot: string, type: 'app' | '
             addonTitle: addonTitle || addonName
         };
     } catch (error: any) {
-        Logger.error('同步 API 失败:', error);
+        Logger.error({ err: error }, '同步 API 失败');
         throw error;
     }
 }
@@ -136,7 +139,7 @@ async function scanAllApis(projectRoot: string): Promise<ApiInfo[]> {
 
         return apis;
     } catch (error: any) {
-        Logger.error(`接口扫描失败:`, error);
+        Logger.error({ err: error }, '接口扫描失败');
         return apis;
     }
 }
@@ -184,7 +187,7 @@ async function syncApis(helper: any, apis: ApiInfo[]): Promise<void> {
                 });
             }
         } catch (error: any) {
-            Logger.error(`同步接口 "${api.name}" 失败:`, error);
+            Logger.error({ err: error, api: api.name }, '同步接口失败');
         }
     }
 }
@@ -222,7 +225,7 @@ export async function syncApiCommand(config: BeflyOptions, options: SyncApiOptio
         // 连接数据库（SQL + Redis）
         await Connect.connect(config);
 
-        const helper = Connect.getDbHelper();
+        const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
         // 1. 检查表是否存在（addon_admin_api 来自 addon-admin 组件）
         const exists = await helper.tableExists('addon_admin_api');
@@ -251,12 +254,12 @@ export async function syncApiCommand(config: BeflyOptions, options: SyncApiOptio
             });
 
             const redisHelper = new RedisHelper();
-            await redisHelper.setObject('apis:all', apiList);
+            await redisHelper.setObject(RedisKeys.apisAll(), apiList);
         } catch (error: any) {
             // 忽略缓存错误
         }
     } catch (error: any) {
-        Logger.error('API 同步失败:', error);
+        Logger.error({ err: error }, 'API 同步失败');
         throw error;
     } finally {
         await Connect.disconnect();

package/sync/syncDb/apply.ts

@@ -7,7 +7,7 @@
  */
 
 import { Logger } from '../../lib/logger.js';
-import { IS_MYSQL, IS_PG, IS_SQLITE, IS_PLAN, CHANGE_TYPE_LABELS, typeMapping } from './constants.js';
+import { isMySQL, isPG, isSQLite, IS_PLAN, CHANGE_TYPE_LABELS, getTypeMapping } from './constants.js';
 import { logFieldChange, resolveDefaultValue, isStringOrArrayType } from './helpers.js';
 import { executeDDLSafely, buildIndexSQL } from './ddl.js';
 import { rebuildSqliteTable } from './sqlite.js';
@@ -27,7 +27,7 @@ import type { FieldDefinition } from 'befly/types/common';
  * @returns 完整的 ALTER TABLE 语句
  */
 function buildAlterTableSQL(tableName: string, clauses: string[]): string {
-    if (IS_MYSQL) {
+    if (isMySQL()) {
         return `ALTER TABLE \`${tableName}\` ${clauses.join(', ')}, ALGORITHM=INSTANT, LOCK=NONE`;
     }
     return `ALTER TABLE "${tableName}" ${clauses.join(', ')}`;
@@ -51,7 +51,7 @@ export function compareFieldDefinition(existingColumn: ColumnInfo, fieldDef: Fie
     const changes: FieldChange[] = [];
 
     // 检查长度变化（string和array类型） - SQLite 不比较长度
-    if (!IS_SQLITE && isStringOrArrayType(fieldDef.type)) {
+    if (!isSQLite() && isStringOrArrayType(fieldDef.type)) {
         if (existingColumn.max !== fieldDef.max) {
             changes.push({
                 type: 'length',
@@ -62,7 +62,7 @@ export function compareFieldDefinition(existingColumn: ColumnInfo, fieldDef: Fie
     }
 
     // 检查注释变化（MySQL/PG 支持列注释）
-    if (!IS_SQLITE) {
+    if (!isSQLite()) {
         const currentComment = existingColumn.comment || '';
         if (currentComment !== fieldDef.name) {
             changes.push({
@@ -74,6 +74,7 @@ export function compareFieldDefinition(existingColumn: ColumnInfo, fieldDef: Fie
     }
 
     // 检查数据类型变化（只对比基础类型）
+    const typeMapping = getTypeMapping();
     const expectedType = typeMapping[fieldDef.type].toLowerCase();
     const currentType = existingColumn.type.toLowerCase();
 
@@ -127,7 +128,7 @@ export async function applyTablePlan(sql: SQL, tableName: string, fields: Record
     if (!plan || !plan.changed) return;
 
     // SQLite: 仅支持部分 ALTER；需要时走重建
-    if (IS_SQLITE) {
+    if (isSQLite()) {
         if (plan.modifyClauses.length > 0 || plan.defaultClauses.length > 0) {
             if (IS_PLAN) Logger.debug(`[计划] 重建表 ${tableName} 以应用列修改/默认值变化`);
             else await rebuildSqliteTable(sql, tableName, fields);
@@ -143,19 +144,19 @@ export async function applyTablePlan(sql: SQL, tableName: string, fields: Record
         if (clauses.length > 0) {
             const stmt = buildAlterTableSQL(tableName, clauses);
             if (IS_PLAN) Logger.debug(`[计划] ${stmt}`);
-            else if (IS_MYSQL) await executeDDLSafely(sql, stmt);
+            else if (isMySQL()) await executeDDLSafely(sql, stmt);
             else await sql.unsafe(stmt);
         }
     }
 
     // 默认值专用 ALTER（SQLite 不支持）
     if (plan.defaultClauses.length > 0) {
-        if (IS_SQLITE) {
+        if (isSQLite()) {
             Logger.warn(`SQLite 不支持修改默认值，表 ${tableName} 的默认值变更已跳过`);
         } else {
             const stmt = buildAlterTableSQL(tableName, plan.defaultClauses);
             if (IS_PLAN) Logger.debug(`[计划] ${stmt}`);
-            else if (IS_MYSQL) await executeDDLSafely(sql, stmt);
+            else if (isMySQL()) await executeDDLSafely(sql, stmt);
             else await sql.unsafe(stmt);
         }
     }
@@ -174,15 +175,14 @@ export async function applyTablePlan(sql: SQL, tableName: string, fields: Record
                     Logger.debug(`[索引变化] 删除索引 ${tableName}.${act.indexName} (${act.fieldName})`);
                 }
             } catch (error: any) {
-                Logger.error(`${act.action === 'create' ? '创建' : '删除'}索引失败`, error);
-                Logger.warn(`表名: ${tableName}, 索引名: ${act.indexName}, 字段: ${act.fieldName}`);
+                Logger.error({ err: error, table: tableName, index: act.indexName, field: act.fieldName }, `${act.action === 'create' ? '创建' : '删除'}索引失败`);
                 throw error;
             }
         }
     }
 
     // PG 列注释
-    if (IS_PG && plan.commentActions && plan.commentActions.length > 0) {
+    if (isPG() && plan.commentActions && plan.commentActions.length > 0) {
         for (const stmt of plan.commentActions) {
             if (IS_PLAN) Logger.info(`[计划] ${stmt}`);
             else await sql.unsafe(stmt);

package/sync/syncDb/constants.ts

@@ -63,17 +63,66 @@ export const MYSQL_TABLE_CONFIG = {
 // 是否为计划模式（仅输出 SQL 不执行）
 export const IS_PLAN = process.argv.includes('--plan');
 
-// 数据库类型判断
-export const DB = (process.env.DB_TYPE || 'mysql').toLowerCase();
-export const IS_MYSQL = DB === 'mysql';
-export const IS_PG = DB === 'postgresql' || DB === 'postgres';
-export const IS_SQLITE = DB === 'sqlite';
+// 数据库类型（运行时设置，默认 mysql）
+let _dbType: string = 'mysql';
 
-// 字段类型映射（按方言）
-export const typeMapping = {
-    number: IS_SQLITE ? 'INTEGER' : IS_PG ? 'BIGINT' : 'BIGINT',
-    string: IS_SQLITE ? 'TEXT' : IS_PG ? 'character varying' : 'VARCHAR',
-    text: IS_MYSQL ? 'MEDIUMTEXT' : 'TEXT',
-    array_string: IS_SQLITE ? 'TEXT' : IS_PG ? 'character varying' : 'VARCHAR',
-    array_text: IS_MYSQL ? 'MEDIUMTEXT' : 'TEXT'
+/**
+ * 设置数据库类型（由 syncDbCommand 调用）
+ * @param dbType - 数据库类型（mysql/postgresql/postgres/sqlite）
+ */
+export function setDbType(dbType: string): void {
+    _dbType = (dbType || 'mysql').toLowerCase();
+}
+
+/**
+ * 获取当前数据库类型
+ */
+export function getDbType(): string {
+    return _dbType;
+}
+
+// 数据库类型判断（getter 函数，运行时动态计算）
+export function isMySQL(): boolean {
+    return _dbType === 'mysql';
+}
+
+export function isPG(): boolean {
+    return _dbType === 'postgresql' || _dbType === 'postgres';
+}
+
+export function isSQLite(): boolean {
+    return _dbType === 'sqlite';
+}
+
+// 兼容旧代码的静态别名（通过 getter 实现动态获取）
+export const DB_TYPE = {
+    get current(): string {
+        return _dbType;
+    },
+    get IS_MYSQL(): boolean {
+        return isMySQL();
+    },
+    get IS_PG(): boolean {
+        return isPG();
+    },
+    get IS_SQLITE(): boolean {
+        return isSQLite();
+    }
 };
+
+/**
+ * 获取字段类型映射（根据当前数据库类型）
+ */
+export function getTypeMapping(): Record<string, string> {
+    const isSqlite = isSQLite();
+    const isPg = isPG();
+    const isMysql = isMySQL();
+
+    return {
+        number: isSqlite ? 'INTEGER' : isPg ? 'BIGINT' : 'BIGINT',
+        string: isSqlite ? 'TEXT' : isPg ? 'character varying' : 'VARCHAR',
+        text: isMysql ? 'MEDIUMTEXT' : 'TEXT',
+        array_string: isSqlite ? 'TEXT' : isPg ? 'character varying' : 'VARCHAR',
+        array_text: isMysql ? 'MEDIUMTEXT' : 'TEXT'
+    };
+}

package/sync/syncDb/ddl.ts

@@ -10,7 +10,7 @@
 
 import { snakeCase } from 'es-toolkit/string';
 import { Logger } from '../../lib/logger.js';
-import { IS_MYSQL, IS_PG, typeMapping } from './constants.js';
+import { isMySQL, isPG, getTypeMapping } from './constants.js';
 import { quoteIdentifier, escapeComment } from './helpers.js';
 import { resolveDefaultValue, generateDefaultSql, getSqlType } from './types.js';
 
@@ -31,7 +31,7 @@ export function buildIndexSQL(tableName: string, indexName: string, fieldName: s
     const indexQuoted = quoteIdentifier(indexName);
     const fieldQuoted = quoteIdentifier(fieldName);
 
-    if (IS_MYSQL) {
+    if (isMySQL()) {
         const parts = [];
         if (action === 'create') {
             parts.push(`ADD INDEX ${indexQuoted} (${fieldQuoted})`);
@@ -44,7 +44,7 @@ export function buildIndexSQL(tableName: string, indexName: string, fieldName: s
         return `ALTER TABLE ${tableQuoted} ${parts.join(', ')}`;
     }
 
-    if (IS_PG) {
+    if (isPG()) {
         if (action === 'create') {
             // 始终使用 CONCURRENTLY
             return `CREATE INDEX CONCURRENTLY IF NOT EXISTS ${indexQuoted} ON ${tableQuoted}(${fieldQuoted})`;
@@ -65,7 +65,7 @@ export function buildIndexSQL(tableName: string, indexName: string, fieldName: s
  * @returns 系统字段的列定义数组
  */
 export function buildSystemColumnDefs(): string[] {
-    if (IS_MYSQL) {
+    if (isMySQL()) {
         return ['`id` BIGINT UNSIGNED PRIMARY KEY AUTO_INCREMENT COMMENT "主键ID"', '`created_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "创建时间"', '`updated_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "更新时间"', '`deleted_at` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "删除时间"', '`state` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT "状态字段"'];
     }
     return ['"id" INTEGER PRIMARY KEY', '"created_at" INTEGER NOT NULL DEFAULT 0', '"updated_at" INTEGER NOT NULL DEFAULT 0', '"deleted_at" INTEGER NOT NULL DEFAULT 0', '"state" INTEGER NOT NULL DEFAULT 0'];
@@ -94,7 +94,7 @@ export function buildBusinessColumnDefs(fields: Record<string, FieldDefinition>)
         const uniqueSql = fieldDef.unique ? ' UNIQUE' : '';
         const nullableSql = fieldDef.nullable ? ' NULL' : ' NOT NULL';
 
-        if (IS_MYSQL) {
+        if (isMySQL()) {
             colDefs.push(`\`${dbFieldName}\` ${sqlType}${uniqueSql}${nullableSql}${defaultSql} COMMENT "${escapeComment(fieldDef.name)}"`);
         } else {
             colDefs.push(`"${dbFieldName}" ${sqlType}${uniqueSql}${nullableSql}${defaultSql}`);
@@ -126,10 +126,10 @@ export function generateDDLClause(fieldKey: string, fieldDef: FieldDefinition, i
     const uniqueSql = fieldDef.unique ? ' UNIQUE' : '';
     const nullableSql = fieldDef.nullable ? ' NULL' : ' NOT NULL';
 
-    if (IS_MYSQL) {
+    if (isMySQL()) {
         return `${isAdd ? 'ADD COLUMN' : 'MODIFY COLUMN'} \`${dbFieldName}\` ${sqlType}${uniqueSql}${nullableSql}${defaultSql} COMMENT "${escapeComment(fieldDef.name)}"`;
     }
-    if (IS_PG) {
+    if (isPG()) {
         if (isAdd) return `ADD COLUMN IF NOT EXISTS "${dbFieldName}" ${sqlType}${uniqueSql}${nullableSql}${defaultSql}`;
         // PG 修改：类型与非空可分条执行，生成 TYPE 改变；非空另由上层统一控制
         return `ALTER COLUMN "${dbFieldName}" TYPE ${sqlType}`;

package/sync/syncDb/helpers.ts

@@ -7,7 +7,7 @@
  * - 字段默认值应用
  */
 
-import { IS_MYSQL, IS_PG } from './constants.js';
+import { isMySQL, isPG } from './constants.js';
 import { Logger } from '../../lib/logger.js';
 
 // 从 types.ts 重新导出，保持向后兼容
@@ -26,8 +26,8 @@ export { isStringOrArrayType, getSqlType, resolveDefaultValue, generateDefaultSq
  * // SQLite: user_table
  */
 export function quoteIdentifier(identifier: string): string {
-    if (IS_MYSQL) return `\`${identifier}\``;
-    if (IS_PG) return `"${identifier}"`;
+    if (isMySQL()) return `\`${identifier}\``;
+    if (isPG()) return `"${identifier}"`;
     return identifier; // SQLite 无需引用
 }
 

package/sync/syncDb/schema.ts

@@ -7,7 +7,7 @@
  * - 获取表的索引信息
  */
 
-import { IS_MYSQL, IS_PG, IS_SQLITE } from './constants.js';
+import { isMySQL, isPG, isSQLite } from './constants.js';
 import type { ColumnInfo, IndexInfo } from '../../types.js';
 import type { SQL } from 'bun';
 
@@ -19,22 +19,21 @@ import type { SQL } from 'bun';
  * @param dbName - 数据库名称
  * @returns 表是否存在
  */
-export async function tableExists(sql: SQL, tableName: string, dbName?: string): Promise<boolean> {
+export async function tableExists(sql: SQL, tableName: string, dbName: string): Promise<boolean> {
     if (!sql) throw new Error('SQL 客户端未初始化');
-    const database = dbName || process.env.DB_NAME;
 
     try {
-        if (IS_MYSQL) {
-            const res = await sql`SELECT COUNT(*) AS count FROM information_schema.TABLES WHERE TABLE_SCHEMA = ${database} AND TABLE_NAME = ${tableName}`;
+        if (isMySQL()) {
+            const res = await sql`SELECT COUNT(*) AS count FROM information_schema.TABLES WHERE TABLE_SCHEMA = ${dbName} AND TABLE_NAME = ${tableName}`;
             return (res[0]?.count || 0) > 0;
         }
 
-        if (IS_PG) {
+        if (isPG()) {
             const res = await sql`SELECT COUNT(*)::int AS count FROM information_schema.tables WHERE table_schema = 'public' AND table_name = ${tableName}`;
             return (res[0]?.count || 0) > 0;
         }
 
-        if (IS_SQLITE) {
+        if (isSQLite()) {
             const res = await sql`SELECT name FROM sqlite_master WHERE type='table' AND name = ${tableName}`;
             return res.length > 0;
         }
@@ -61,16 +60,15 @@ export async function tableExists(sql: SQL, tableName: string, dbName?: string):
  * @param dbName - 数据库名称
  * @returns 列信息对象，键为列名，值为列详情
  */
-export async function getTableColumns(sql: SQL, tableName: string, dbName?: string): Promise<{ [key: string]: ColumnInfo }> {
+export async function getTableColumns(sql: SQL, tableName: string, dbName: string): Promise<{ [key: string]: ColumnInfo }> {
     const columns: { [key: string]: ColumnInfo } = {};
-    const database = dbName || process.env.DB_NAME;
 
     try {
-        if (IS_MYSQL) {
+        if (isMySQL()) {
             const result = await sql`
                 SELECT COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, IS_NULLABLE, COLUMN_DEFAULT, COLUMN_COMMENT, COLUMN_TYPE
                 FROM information_schema.COLUMNS
-                WHERE TABLE_SCHEMA = ${database} AND TABLE_NAME = ${tableName}
+                WHERE TABLE_SCHEMA = ${dbName} AND TABLE_NAME = ${tableName}
                 ORDER BY ORDINAL_POSITION
             `;
             for (const row of result) {
@@ -91,7 +89,7 @@ export async function getTableColumns(sql: SQL, tableName: string, dbName?: stri
                     comment: row.COLUMN_COMMENT
                 };
             }
-        } else if (IS_PG) {
+        } else if (isPG()) {
             const result = await sql`
                 SELECT column_name, data_type, character_maximum_length, is_nullable, column_default
                 FROM information_schema.columns
@@ -119,7 +117,7 @@ export async function getTableColumns(sql: SQL, tableName: string, dbName?: stri
                     comment: commentMap[row.column_name] ?? null
                 };
             }
-        } else if (IS_SQLITE) {
+        } else if (isSQLite()) {
             const result = await sql.unsafe(`PRAGMA table_info(${tableName})`);
             for (const row of result) {
                 let baseType = String(row.type || '').toUpperCase();
@@ -154,16 +152,15 @@ export async function getTableColumns(sql: SQL, tableName: string, dbName?: stri
  * @param dbName - 数据库名称
  * @returns 索引信息对象，键为索引名，值为列名数组
  */
-export async function getTableIndexes(sql: SQL, tableName: string, dbName?: string): Promise<IndexInfo> {
+export async function getTableIndexes(sql: SQL, tableName: string, dbName: string): Promise<IndexInfo> {
     const indexes: IndexInfo = {};
-    const database = dbName || process.env.DB_NAME;
 
     try {
-        if (IS_MYSQL) {
+        if (isMySQL()) {
             const result = await sql`
                 SELECT INDEX_NAME, COLUMN_NAME
                 FROM information_schema.STATISTICS
-                WHERE TABLE_SCHEMA = ${database}
+                WHERE TABLE_SCHEMA = ${dbName}
                     AND TABLE_NAME = ${tableName}
                     AND INDEX_NAME != 'PRIMARY'
                 ORDER BY INDEX_NAME
@@ -172,7 +169,7 @@ export async function getTableIndexes(sql: SQL, tableName: string, dbName?: stri
                 if (!indexes[row.INDEX_NAME]) indexes[row.INDEX_NAME] = [];
                 indexes[row.INDEX_NAME].push(row.COLUMN_NAME);
             }
-        } else if (IS_PG) {
+        } else if (isPG()) {
             const result = await sql`
                 SELECT indexname, indexdef
                 FROM pg_indexes
@@ -185,7 +182,7 @@ export async function getTableIndexes(sql: SQL, tableName: string, dbName?: stri
                     indexes[row.indexname] = [col];
                 }
             }
-        } else if (IS_SQLITE) {
+        } else if (isSQLite()) {
             const list = await sql.unsafe(`PRAGMA index_list(${tableName})`);
             for (const idx of list) {
                 const info = await sql.unsafe(`PRAGMA index_info(${idx.name})`);