befly 3.8.27 → 3.8.30

package/sync/syncDb/table.ts

@@ -9,7 +9,7 @@
 
 import { snakeCase } from 'es-toolkit/string';
 import { Logger } from '../../lib/logger.js';
-import { IS_MYSQL, IS_PG, CHANGE_TYPE_LABELS, typeMapping } from './constants.js';
+import { isMySQL, isPG, CHANGE_TYPE_LABELS, getTypeMapping } from './constants.js';
 import { logFieldChange, resolveDefaultValue, generateDefaultSql, isStringOrArrayType } from './helpers.js';
 import { generateDDLClause, isPgCompatibleTypeChange } from './ddl.js';
 import { getTableColumns, getTableIndexes } from './schema.js';
@@ -92,9 +92,9 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
                     }
 
                     if (v !== null && v !== '') {
-                        if (IS_PG) {
+                        if (isPG()) {
                             defaultClauses.push(`ALTER COLUMN "${dbFieldName}" SET DEFAULT ${v}`);
-                        } else if (IS_MYSQL && onlyDefaultChanged) {
+                        } else if (isMySQL() && onlyDefaultChanged) {
                             // MySQL 的 TEXT/BLOB 不允许 DEFAULT，跳过 text 类型
                             if (fieldDef.type !== 'text') {
                                 defaultClauses.push(`ALTER COLUMN \`${dbFieldName}\` SET DEFAULT ${v}`);
@@ -112,7 +112,8 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
                     }
 
                     if (hasTypeChange) {
-                        if (IS_PG && isPgCompatibleTypeChange(existingColumns[dbFieldName].type, typeMapping[fieldDef.type].toLowerCase())) {
+                        const typeMapping = getTypeMapping();
+                        if (isPG() && isPgCompatibleTypeChange(existingColumns[dbFieldName].type, typeMapping[fieldDef.type].toLowerCase())) {
                             Logger.debug(`[PG兼容类型变更] ${tableName}.${dbFieldName} ${existingColumns[dbFieldName].type} -> ${typeMapping[fieldDef.type].toLowerCase()} 允许执行`);
                         }
                     }
@@ -155,7 +156,7 @@ export async function modifyTable(sql: SQL, tableName: string, fields: Record<st
 
     // PG 列注释处理
     const commentActions = [];
-    if (IS_PG) {
+    if (isPG()) {
         for (const [fieldKey, fieldDef] of Object.entries(fields)) {
             // 转换字段名为下划线格式
             const dbFieldName = snakeCase(fieldKey);

package/sync/syncDb/tableCreate.ts

@@ -10,7 +10,7 @@
  */
 import { snakeCase } from 'es-toolkit/string';
 import { Logger } from '../../lib/logger.js';
-import { IS_MYSQL, IS_PG, IS_PLAN, MYSQL_TABLE_CONFIG } from './constants.js';
+import { isMySQL, isPG, IS_PLAN, MYSQL_TABLE_CONFIG } from './constants.js';
 import { quoteIdentifier } from './helpers.js';
 import { buildSystemColumnDefs, buildBusinessColumnDefs, buildIndexSQL } from './ddl.js';
 import { getTableIndexes } from './schema.js';
@@ -73,7 +73,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
 
     // 获取现有索引（MySQL 不支持 IF NOT EXISTS，需要先检查）
     let existingIndexes: Record<string, string[]> = {};
-    if (IS_MYSQL) {
+    if (isMySQL()) {
         existingIndexes = await getTableIndexes(sql, tableName, dbName);
     }
 
@@ -81,7 +81,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
     for (const sysField of systemIndexFields) {
         const indexName = `idx_${sysField}`;
         // MySQL 跳过已存在的索引
-        if (IS_MYSQL && existingIndexes[indexName]) {
+        if (isMySQL() && existingIndexes[indexName]) {
             continue;
         }
         const stmt = buildIndexSQL(tableName, indexName, sysField, 'create');
@@ -100,7 +100,7 @@ async function createTableIndexes(sql: SQL, tableName: string, fields: Record<st
         if (fieldDef.index === true) {
             const indexName = `idx_${dbFieldName}`;
             // MySQL 跳过已存在的索引
-            if (IS_MYSQL && existingIndexes[indexName]) {
+            if (isMySQL() && existingIndexes[indexName]) {
                 continue;
             }
             const stmt = buildIndexSQL(tableName, indexName, dbFieldName, 'create');
@@ -135,7 +135,7 @@ export async function createTable(sql: SQL, tableName: string, fields: Record<st
     const cols = colDefs.join(',\n            ');
     const tableQuoted = quoteIdentifier(tableName);
     const { ENGINE, CHARSET, COLLATE } = MYSQL_TABLE_CONFIG;
-    const createSQL = IS_MYSQL
+    const createSQL = isMySQL()
         ? `CREATE TABLE ${tableQuoted} (
             ${cols}
         ) ENGINE=${ENGINE} DEFAULT CHARSET=${CHARSET} COLLATE=${COLLATE}`
@@ -150,9 +150,9 @@ export async function createTable(sql: SQL, tableName: string, fields: Record<st
     }
 
     // PostgreSQL: 添加列注释
-    if (IS_PG && !IS_PLAN) {
+    if (isPG() && !IS_PLAN) {
         await addPostgresComments(sql, tableName, fields);
-    } else if (IS_PG && IS_PLAN) {
+    } else if (isPG() && IS_PLAN) {
         // 计划模式也要输出注释语句
         await addPostgresComments(sql, tableName, fields);
     }

package/sync/syncDb/types.ts

@@ -7,7 +7,7 @@
  * - 类型判断工具
  */
 
-import { IS_MYSQL, typeMapping } from './constants.js';
+import { isMySQL, getTypeMapping } from './constants.js';
 
 /**
  * 判断是否为字符串或数组类型（需要长度参数）
@@ -42,12 +42,13 @@ export function isStringOrArrayType(fieldType: string): boolean {
  * getSqlType('array_text', null) // => 'MEDIUMTEXT'
  */
 export function getSqlType(fieldType: string, fieldMax: number | null, unsigned: boolean = false): string {
+    const typeMapping = getTypeMapping();
     if (isStringOrArrayType(fieldType)) {
         return `${typeMapping[fieldType]}(${fieldMax})`;
     }
     // 处理 UNSIGNED 修饰符（仅 MySQL number 类型）
     const baseType = typeMapping[fieldType] || 'TEXT';
-    if (IS_MYSQL && fieldType === 'number' && unsigned) {
+    if (isMySQL() && fieldType === 'number' && unsigned) {
         return `${baseType} UNSIGNED`;
     }
     return baseType;

package/sync/syncDb/version.ts

@@ -6,7 +6,7 @@
  */
 
 import { Logger } from '../../lib/logger.js';
-import { DB_VERSION_REQUIREMENTS, IS_MYSQL, IS_PG, IS_SQLITE } from './constants.js';
+import { DB_VERSION_REQUIREMENTS, isMySQL, isPG, isSQLite } from './constants.js';
 import type { SQL } from 'bun';
 
 /**
@@ -23,7 +23,7 @@ import type { SQL } from 'bun';
 export async function ensureDbVersion(sql: SQL): Promise<void> {
     if (!sql) throw new Error('SQL 客户端未初始化');
 
-    if (IS_MYSQL) {
+    if (isMySQL()) {
         const r = await sql`SELECT VERSION() AS version`;
         if (!r || r.length === 0 || !r[0]?.version) {
             throw new Error('无法获取 MySQL 版本信息');
@@ -36,7 +36,7 @@ export async function ensureDbVersion(sql: SQL): Promise<void> {
         return;
     }
 
-    if (IS_PG) {
+    if (isPG()) {
         const r = await sql`SELECT version() AS version`;
         if (!r || r.length === 0 || !r[0]?.version) {
             throw new Error('无法获取 PostgreSQL 版本信息');
@@ -50,7 +50,7 @@ export async function ensureDbVersion(sql: SQL): Promise<void> {
         return;
     }
 
-    if (IS_SQLITE) {
+    if (isSQLite()) {
         const r = await sql`SELECT sqlite_version() AS version`;
         if (!r || r.length === 0 || !r[0]?.version) {
             throw new Error('无法获取 SQLite 版本信息');

package/sync/syncDb.ts

@@ -13,7 +13,9 @@ import { snakeCase } from 'es-toolkit/string';
 import { Connect } from '../lib/connect.js';
 import { RedisHelper } from '../lib/redisHelper.js';
 import { checkTable } from '../checks/checkTable.js';
-import { scanFiles, scanAddons, addonDirExists, getAddonDir } from 'befly-util';
+import { scanFiles } from 'befly-shared/scanFiles';
+import { scanAddons, addonDirExists, getAddonDir } from 'befly-shared/addonHelper';
+import { RedisKeys } from 'befly-shared/redisKeys';
 import { Logger } from '../lib/logger.js';
 import { projectDir } from '../paths.js';
 
@@ -23,6 +25,7 @@ import { tableExists } from './syncDb/schema.js';
 import { modifyTable } from './syncDb/table.js';
 import { createTable } from './syncDb/tableCreate.js';
 import { applyFieldDefaults } from './syncDb/helpers.js';
+import { setDbType } from './syncDb/constants.js';
 import type { SQL } from 'bun';
 import type { BeflyOptions, SyncDbOptions } from '../types/index.js';
 
@@ -46,6 +49,10 @@ export async function syncDbCommand(config: BeflyOptions, options: SyncDbOptions
         // 清空处理记录
         processedTables.length = 0;
 
+        // 设置数据库类型（从配置获取）
+        const dbType = config.db?.type || 'mysql';
+        setDbType(dbType);
+
         // 验证表定义文件
         await checkTable();
 
@@ -129,17 +136,11 @@ export async function syncDbCommand(config: BeflyOptions, options: SyncDbOptions
         // 清理 Redis 缓存（如果有表被处理）
         if (processedTables.length > 0) {
             const redisHelper = new RedisHelper();
-            for (const tableName of processedTables) {
-                const cacheKey = `table:columns:${tableName}`;
-                try {
-                    await redisHelper.del(cacheKey);
-                } catch (error: any) {
-                    Logger.warn(`清理表 ${tableName} 的缓存失败: ${error.message}`);
-                }
-            }
+            const cacheKeys = processedTables.map((tableName) => RedisKeys.tableColumns(tableName));
+            await redisHelper.delBatch(cacheKeys);
         }
     } catch (error: any) {
-        Logger.error('数据库同步失败', error);
+        Logger.error({ err: error }, '数据库同步失败');
         throw error;
     } finally {
         if (sql) {

package/sync/syncDev.ts

@@ -7,12 +7,15 @@
  * - 表名: addon_admin_admin
  */
 
-import { scanAddons, getAddonDir, normalizeModuleForSync } from 'befly-util';
+import { scanAddons, getAddonDir, normalizeModuleForSync } from 'befly-shared/addonHelper';
 
 import { Logger } from '../lib/logger.js';
 import { Cipher } from '../lib/cipher.js';
 import { Connect } from '../lib/connect.js';
 import { DbHelper } from '../lib/dbHelper.js';
+import { RedisHelper } from '../lib/redisHelper.js';
+import { CacheHelper } from '../lib/cacheHelper.js';
+
 import type { SyncDevOptions, SyncDevStats, BeflyOptions } from '../types/index.js';
 
 /**
@@ -33,7 +36,7 @@ export async function syncDevCommand(config: BeflyOptions, options: SyncDevOptio
         // 连接数据库（SQL + Redis）
         await Connect.connect(config);
 
-        const helper = Connect.getDbHelper();
+        const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
         // 检查 addon_admin_admin 表是否存在
         const existAdmin = await helper.tableExists('addon_admin_admin');
@@ -152,57 +155,16 @@ export async function syncDevCommand(config: BeflyOptions, options: SyncDevOptio
             });
         }
 
-        // 缓存角色权限数据到 Redis
+        // 缓存角色权限数据到 Redis（复用 CacheHelper 逻辑）
         try {
-            // 检查必要的表是否存在
-            const apiTableExists = await helper.tableExists('addon_admin_api');
-            const roleTableExists = await helper.tableExists('addon_admin_role');
-
-            if (apiTableExists && roleTableExists) {
-                // 查询所有角色
-                const roles = await helper.getAll({
-                    table: 'addon_admin_role',
-                    fields: ['id', 'code', 'apis']
-                });
-
-                // 查询所有接口
-                const allApis = await helper.getAll({
-                    table: 'addon_admin_api',
-                    fields: ['id', 'name', 'path', 'method', 'description', 'addonName']
-                });
-
-                const redis = Connect.getRedis();
-
-                // 为每个角色缓存接口权限
-                for (const role of roles) {
-                    if (!role.apis) continue;
-
-                    // 解析角色的接口 ID 列表
-                    const apiIds = role.apis
-                        .split(',')
-                        .map((id: string) => parseInt(id.trim()))
-                        .filter((id: number) => !isNaN(id));
-
-                    // 根据 ID 过滤出接口路径
-                    const roleApiPaths = allApis.filter((api: any) => apiIds.includes(api.id)).map((api: any) => `${api.method}${api.path}`);
-
-                    if (roleApiPaths.length === 0) continue;
-
-                    // 使用 Redis Set 缓存角色权限
-                    const redisKey = `role:apis:${role.code}`;
-
-                    // 先删除旧数据
-                    await redis.del(redisKey);
-
-                    // 批量添加到 Set（使用扩展运算符展开数组）
-                    await redis.sadd(redisKey, ...roleApiPaths);
-                }
-            }
+            const tempBefly = { db: helper, redis: new RedisHelper() } as any;
+            const cacheHelper = new CacheHelper(tempBefly);
+            await cacheHelper.cacheRolePermissions();
         } catch (error: any) {
             // 忽略缓存错误
         }
     } catch (error: any) {
-        Logger.error('同步开发者管理员失败', error);
+        Logger.error({ err: error }, '同步开发者管理员失败');
         throw error;
     } finally {
         await Connect.disconnect();

package/sync/syncMenu.ts

@@ -17,8 +17,11 @@
 import { join } from 'pathe';
 import { cloneDeep } from 'es-toolkit';
 import { Connect } from '../lib/connect.js';
+import { DbHelper } from '../lib/dbHelper.js';
 import { RedisHelper } from '../lib/redisHelper.js';
-import { scanAddons, getAddonDir, scanConfig } from 'befly-util';
+import { RedisKeys } from 'befly-shared/redisKeys';
+import { scanAddons, getAddonDir } from 'befly-shared/addonHelper';
+import { scanConfig } from 'befly-shared/scanConfig';
 import { Logger } from '../lib/logger.js';
 import { projectDir } from '../paths.js';
 
@@ -204,7 +207,7 @@ async function syncMenus(helper: any, menus: MenuConfig[]): Promise<void> {
         try {
             await syncMenuRecursive(helper, menu, 0, existingMenuMap, 1);
         } catch (error: any) {
-            Logger.error(`同步菜单 "${menu.name}" 失败`, error.message || String(error));
+            Logger.error({ err: error, menu: menu.name }, '同步菜单失败');
             throw error;
         }
     }
@@ -257,7 +260,7 @@ async function loadMenuConfigs(): Promise<Array<{ menus: MenuConfig[]; addonName
                 allMenus.push({ menus: menusWithPrefix, addonName: addonName });
             }
         } catch (error: any) {
-            Logger.warn(`读取 addon 配置失败 ${addonName}: ${error.message}`);
+            Logger.warn({ err: error, addon: addonName }, '读取 addon 配置失败');
         }
     }
 
@@ -276,7 +279,7 @@ async function loadMenuConfigs(): Promise<Array<{ menus: MenuConfig[]; addonName
             allMenus.push({ menus: appMenus, addonName: 'app' });
         }
     } catch (error: any) {
-        Logger.warn(`读取项目配置失败: ${error.message}`);
+        Logger.warn({ err: error }, '读取项目配置失败');
     }
 
     return allMenus;
@@ -301,7 +304,7 @@ export async function syncMenuCommand(config: BeflyOptions, options: SyncMenuOpt
         // 连接数据库（SQL + Redis）
         await Connect.connect(config);
 
-        const helper = Connect.getDbHelper();
+        const helper = new DbHelper({ redis: new RedisHelper() } as any, Connect.getSql());
 
         // 3. 检查表是否存在（addon_admin_menu 来自 addon-admin 组件）
         const exists = await helper.tableExists('addon_admin_menu');
@@ -330,12 +333,12 @@ export async function syncMenuCommand(config: BeflyOptions, options: SyncMenuOpt
         // 8. 缓存菜单数据到 Redis
         try {
             const redisHelper = new RedisHelper();
-            await redisHelper.setObject('menus:all', allMenusData);
+            await redisHelper.setObject(RedisKeys.menusAll(), allMenusData);
         } catch (error: any) {
-            Logger.warn(`Redis 缓存菜单数据失败: ${error.message}`);
+            Logger.warn({ err: error }, 'Redis 缓存菜单数据失败');
         }
     } catch (error: any) {
-        Logger.error('菜单同步失败', error);
+        Logger.error({ err: error }, '菜单同步失败');
         throw error;
     } finally {
         await Connect.disconnect();