befly 3.9.23 → 3.9.27

package/docs/api.md

@@ -1430,7 +1430,7 @@ export default {
         }
 
         // 查询订单明细
-        const items = await befly.db.getAll({
+        const itemsResult = await befly.db.getAll({
             table: 'order_item',
             where: { orderId: order.id }
         });
@@ -1438,6 +1438,14 @@ export default {
         // 查询用户信息
         const user = await befly.db.getOne({
             table: 'user',
+            where: { id: order.userId }
+        });
+
+        return befly.tool.Yes('查询成功', {
+            order: order,
+            items: itemsResult.lists,  // 订单明细列表
+            user: user
+        });
             where: { id: order.userId },
             columns: ['id', 'username', 'nickname', 'phone']
         });
@@ -1494,11 +1502,13 @@ export default {
 
         if (!config) {
             // 缓存不存在，从数据库查询
-            config = await befly.db.getAll({
+            const result = await befly.db.getAll({
                 table: 'sys_config',
                 where: { state: 1 }
             });
 
+            config = result.lists; // 获取配置列表
+
             // 写入缓存
             await befly.redis.set(cacheKey, JSON.stringify(config), 'EX', 300);
         } else {
@@ -1546,8 +1556,8 @@ export default {
 export default {
     name: '导出用户数据',
     handler: async (befly, ctx) => {
-        // 查询所有用户（不分页）
-        const users = await befly.db.getAll({
+        // 查询所有用户（不分页，注意上限 10000 条）
+        const result = await befly.db.getAll({
             table: 'user',
             columns: ['id', 'username', 'nickname', 'email', 'phone', 'createdAt'],
             where: { state: 1 },
@@ -1556,11 +1566,11 @@ export default {
 
         // 转换为 CSV 格式
         const headers = ['ID', '用户名', '昵称', '邮箱', '手机', '注册时间'];
-        const rows = users.map((u: any) => [u.id, u.username, u.nickname, u.email, u.phone, new Date(u.createdAt).toLocaleString()]);
+        const rows = result.lists.map((u: any) => [u.id, u.username, u.nickname, u.email, u.phone, new Date(u.createdAt).toLocaleString()]);
 
         const csv = [headers.join(','), ...rows.map((r: any[]) => r.join(','))].join('\n');
 
-        // 返回 CSV 文件
+        // 返回 CSV 文件（注意：如果 total > 10000，只会导出前 10000 条）
         return new Response(csv, {
             headers: {
                 'Content-Type': 'text/csv; charset=utf-8',

package/docs/database.md

@@ -321,22 +321,39 @@ const result = await befly.db.getList({
 
 查询所有满足条件的记录（有上限保护，最多 10000 条）。
 
+**返回值**：`{ lists: T[], total: number }`
+
+- `lists`：数据数组（受 MAX_LIMIT 保护，最多 10000 条）
+- `total`：真实总记录数（不受 MAX_LIMIT 限制）
+
 ```typescript
 // 查询所有
-const users = await befly.db.getAll({
+const result = await befly.db.getAll({
     table: 'user'
 });
+// result: { lists: [...], total: 实际总数 }
 
 // 带条件
-const activeUsers = await befly.db.getAll({
+const activeResult = await befly.db.getAll({
     table: 'user',
     fields: ['id', 'username'],
     where: { state: 1 },
     orderBy: ['sort#ASC']
 });
+
+// 访问数据
+console.log(activeResult.lists); // 数据数组（最多 10000 条）
+console.log(activeResult.total); // 真实总数（如 100000）
 ```
 
-> ⚠️ **警告**：此方法可能返回大量数据，建议使用 `getList` 分页查询。超过 1000 条会输出警告日志。
+**重要说明**：
+
+- `total` 是查询满足条件的真实总记录数
+- `lists` 受 `MAX_LIMIT = 10000` 保护，最多返回 10000 条
+- 如果总数超过 10000，`lists.length < total`
+- 建议使用 `getList` 进行分页查询
+
+> ⚠️ **警告**：此方法可能返回大量数据。超过 1000 条会输出警告日志，达到 10000 条会提示只返回部分数据。
 
 ### getCount - 查询数量
 
@@ -659,6 +676,7 @@ const allOrders = await befly.db.getAll({
     where: { 'order.state': 1 },
     orderBy: ['order.id#DESC']
 });
+// 返回: { lists: [...最多10000条], total: 真实总数 }
 ```
 
 ### JoinOption 参数说明

package/docs/redis.md

@@ -438,13 +438,14 @@ let articles = await befly.redis.getObject(cacheKey);
 
 if (!articles) {
     // 缓存未命中，查询数据库
-    articles = await befly.db.getAll({
+    const result = await befly.db.getAll({
         table: 'article',
         fields: ['id', 'title', 'viewCount'],
-        orderBy: ['viewCount#DESC'],
-        limit: 10
+        orderBy: ['viewCount#DESC']
     });
 
+    articles = result.lists; // 获取数据列表（最多 10000 条）
+
     // 写入缓存，5分钟过期
     await befly.redis.setObject(cacheKey, articles, 300);
 }

package/lib/cacheHelper.ts

@@ -42,7 +42,7 @@ export class CacheHelper {
             });
 
             // 缓存到 Redis
-            const result = await this.befly.redis.setObject(RedisKeys.apisAll(), apiList);
+            const result = await this.befly.redis.setObject(RedisKeys.apisAll(), apiList.lists);
 
             if (result === null) {
                 Logger.warn('⚠️ 接口缓存失败');
@@ -72,7 +72,7 @@ export class CacheHelper {
             });
 
             // 缓存到 Redis
-            const result = await this.befly.redis.setObject(RedisKeys.menusAll(), menus);
+            const result = await this.befly.redis.setObject(RedisKeys.menusAll(), menus.lists);
 
             if (result === null) {
                 Logger.warn('⚠️ 菜单缓存失败');
@@ -111,14 +111,14 @@ export class CacheHelper {
 
             // 构建接口 ID -> 路径的映射（避免重复过滤）
             const apiMap = new Map<number, string>();
-            for (const api of allApis) {
+            for (const api of allApis.lists) {
                 apiMap.set(api.id, `${api.method}${api.path}`);
             }
 
             // 收集需要缓存的角色权限
             const cacheOperations: Array<{ roleCode: string; apiPaths: string[] }> = [];
 
-            for (const role of roles) {
+            for (const role of roles.lists) {
                 if (!role.apis) continue;
 
                 // 解析角色的接口 ID 列表并映射到路径

package/lib/dbHelper.ts

@@ -13,7 +13,7 @@ import { RedisTTL, RedisKeys } from 'befly-shared/redisKeys';
 import { Logger } from './logger.js';
 import type { WhereConditions, JoinOption } from '../types/common.js';
 import type { BeflyContext } from '../types/befly.js';
-import type { QueryOptions, InsertOptions, UpdateOptions, DeleteOptions, ListResult, TransactionCallback } from '../types/database.js';
+import type { QueryOptions, InsertOptions, UpdateOptions, DeleteOptions, ListResult, AllResult, TransactionCallback } from '../types/database.js';
 
 /**
  * 数据库助手类
@@ -691,40 +691,66 @@ export class DbHelper {
      *     where: { 'o.state': 1 }
      * })
      */
-    async getAll<T extends Record<string, any> = Record<string, any>>(options: Omit<QueryOptions, 'page' | 'limit'>): Promise<T[]> {
+    async getAll<T extends Record<string, any> = Record<string, any>>(options: Omit<QueryOptions, 'page' | 'limit'>): Promise<AllResult<T>> {
         // 添加硬性上限保护，防止内存溢出
         const MAX_LIMIT = 10000;
         const WARNING_LIMIT = 1000;
 
         const prepared = await this.prepareQueryOptions({ ...options, page: 1, limit: 10 });
 
-        const builder = new SqlBuilder().select(prepared.fields).from(prepared.table).where(this.addDefaultStateFilter(prepared.where)).limit(MAX_LIMIT);
+        const whereFiltered = this.addDefaultStateFilter(prepared.where);
+
+        // 查询真实总数
+        const countBuilder = new SqlBuilder().select(['COUNT(*) as total']).from(prepared.table).where(whereFiltered);
+
+        // 添加 JOIN（计数也需要）
+        this.applyJoins(countBuilder, prepared.joins);
+
+        const { sql: countSql, params: countParams } = countBuilder.toSelectSql();
+        const countResult = await this.executeWithConn(countSql, countParams);
+        const total = countResult?.[0]?.total || 0;
+
+        // 如果总数为 0，直接返回
+        if (total === 0) {
+            return {
+                lists: [],
+                total: 0
+            };
+        }
+
+        // 查询数据（受上限保护）
+        const dataBuilder = new SqlBuilder().select(prepared.fields).from(prepared.table).where(whereFiltered).limit(MAX_LIMIT);
 
         // 添加 JOIN
-        this.applyJoins(builder, prepared.joins);
+        this.applyJoins(dataBuilder, prepared.joins);
 
         if (prepared.orderBy && prepared.orderBy.length > 0) {
-            builder.orderBy(prepared.orderBy);
+            dataBuilder.orderBy(prepared.orderBy);
         }
 
-        const { sql, params } = builder.toSelectSql();
-        const result = (await this.executeWithConn(sql, params)) || [];
+        const { sql: dataSql, params: dataParams } = dataBuilder.toSelectSql();
+        const result = (await this.executeWithConn(dataSql, dataParams)) || [];
 
         // 警告日志：返回数据超过警告阈值
         if (result.length >= WARNING_LIMIT) {
-            Logger.warn({ table: options.table, count: result.length }, 'getAll 返回数据过多，建议使用 getList 分页查询');
+            Logger.warn({ table: options.table, count: result.length, total: total }, 'getAll 返回数据过多，建议使用 getList 分页查询');
         }
 
         // 如果达到上限，额外警告
         if (result.length >= MAX_LIMIT) {
-            Logger.warn({ table: options.table, limit: MAX_LIMIT }, 'getAll 达到最大限制，可能还有更多数据');
+            Logger.warn({ table: options.table, limit: MAX_LIMIT, total: total }, `getAll 达到最大限制 ${MAX_LIMIT}，实际总数 ${total}，只返回前 ${MAX_LIMIT} 条`);
         }
 
         // 字段名转换：下划线 → 小驼峰
         const camelResult = arrayKeysToCamel<T>(result);
 
         // 转换 BIGINT 字段（id, pid 等）为数字类型
-        return this.convertBigIntFields<T>(camelResult);
+        const lists = this.convertBigIntFields<T>(camelResult);
+
+        return {
+            lists: lists,
+            total: total
+        };
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.9.23",
+    "version": "3.9.27",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -74,7 +74,7 @@
         "pino": "^10.1.0",
         "pino-roll": "^4.0.0"
     },
-    "gitHead": "9b5f1999ae83f1f0842f763845ec9d3e80e01f19",
+    "gitHead": "1f449cb3921fc8536f7392f039a6655b1b07b5e5",
     "devDependencies": {
         "typescript": "^5.9.3"
     }

package/sync/syncApi.ts

@@ -199,11 +199,11 @@ async function syncApis(helper: any, apis: ApiInfo[]): Promise<void> {
 async function deleteObsoleteRecords(helper: any, apiPaths: Set<string>): Promise<void> {
     const allRecords = await helper.getAll({
         table: 'addon_admin_api',
-        fields: ['id', 'path'],
+        fields: ['id', 'addonName', 'path', 'method'],
         where: { state$gte: 0 }
     });
 
-    for (const record of allRecords) {
+    for (const record of allRecords.lists) {
         if (record.path && !apiPaths.has(record.path)) {
             await helper.delForce({
                 table: 'addon_admin_api',
@@ -255,7 +255,7 @@ export async function syncApiCommand(options: SyncApiOptions = {}): Promise<void
             });
 
             const redisHelper = new RedisHelper();
-            await redisHelper.setObject(RedisKeys.apisAll(), apiList);
+            await redisHelper.setObject(RedisKeys.apisAll(), apiList.lists);
         } catch (error: any) {
             // 忽略缓存错误
         }

package/sync/syncDev.ts

@@ -64,12 +64,12 @@ export async function syncDevCommand(options: SyncDevOptions = {}): Promise<void
             fields: ['id']
         });
 
-        if (!allMenus || !Array.isArray(allMenus)) {
+        if (!allMenus || !Array.isArray(allMenus.lists)) {
             Logger.debug('[SyncDev] 菜单数据为空，跳过开发者账号同步');
             return;
         }
 
-        const menuIds = allMenus.length > 0 ? allMenus.map((m: any) => m.id).join(',') : '';
+        const menuIds = allMenus.lists.length > 0 ? allMenus.lists.map((m: any) => m.id).join(',') : '';
 
         // 查询所有接口 ID
         const existApi = await helper.tableExists('addon_admin_api');
@@ -80,8 +80,8 @@ export async function syncDevCommand(options: SyncDevOptions = {}): Promise<void
                 fields: ['id']
             });
 
-            if (allApis && Array.isArray(allApis) && allApis.length > 0) {
-                apiIds = allApis.map((a: any) => a.id).join(',');
+            if (allApis && Array.isArray(allApis.lists) && allApis.lists.length > 0) {
+                apiIds = allApis.lists.map((a: any) => a.id).join(',');
             }
         }
 

package/sync/syncMenu.ts

@@ -91,7 +91,7 @@ async function scanViewsDir(viewsDir: string, prefix: string, parentPath: string
         const menu: MenuConfig = {
             name: meta.name,
             path: fullPath,
-            sort: meta.order || 100
+            sort: meta.order || 1
         };
 
         // 递归扫描子目录
@@ -104,7 +104,7 @@ async function scanViewsDir(viewsDir: string, prefix: string, parentPath: string
     }
 
     // 按 sort 排序
-    menus.sort((a, b) => (a.sort || 100) - (b.sort || 100));
+    menus.sort((a, b) => (a.sort || 1) - (b.sort || 1));
 
     return menus;
 }
@@ -192,7 +192,7 @@ async function syncMenuRecursive(helper: any, menu: MenuConfig, pid: number, exi
     if (existing) {
         menuId = existing.id;
 
-        const needUpdate = existing.pid !== pid || existing.name !== menu.name || existing.sort !== (menu.sort || 0);
+        const needUpdate = existing.pid !== pid || existing.name !== menu.name || existing.sort !== (menu.sort || 1);
 
         if (needUpdate) {
             await helper.updData({
@@ -201,7 +201,7 @@ async function syncMenuRecursive(helper: any, menu: MenuConfig, pid: number, exi
                 data: {
                     pid: pid,
                     name: menu.name,
-                    sort: menu.sort || 0
+                    sort: menu.sort || 1
                 }
             });
         }
@@ -212,7 +212,7 @@ async function syncMenuRecursive(helper: any, menu: MenuConfig, pid: number, exi
                 pid: pid,
                 name: menu.name,
                 path: menu.path || '',
-                sort: menu.sort || 0
+                sort: menu.sort || 1
             }
         });
     }
@@ -235,7 +235,7 @@ async function syncMenus(helper: any, menus: MenuConfig[]): Promise<void> {
         fields: ['id', 'pid', 'name', 'path', 'sort']
     });
     const existingMenuMap = new Map<string, any>();
-    for (const menu of allExistingMenus) {
+    for (const menu of allExistingMenus.lists) {
         if (menu.path) {
             existingMenuMap.set(menu.path, menu);
         }
@@ -261,7 +261,7 @@ async function deleteObsoleteRecords(helper: any, configPaths: Set<string>): Pro
         where: { state$gte: 0 }
     });
 
-    for (const record of allRecords) {
+    for (const record of allRecords.lists) {
         if (record.path && !configPaths.has(record.path)) {
             await helper.delForce({
                 table: 'addon_admin_menu',
@@ -375,7 +375,7 @@ export async function syncMenuCommand(options: SyncMenuOptions = {}): Promise<vo
         // 8. 缓存菜单数据到 Redis
         try {
             const redisHelper = new RedisHelper();
-            await redisHelper.setObject(RedisKeys.menusAll(), allMenusData);
+            await redisHelper.setObject(RedisKeys.menusAll(), allMenusData.lists);
         } catch (error: any) {
             Logger.warn({ err: error }, 'Redis 缓存菜单数据失败');
         }

package/tests/cacheHelper.test.ts

@@ -76,7 +76,7 @@ describe('CacheHelper', () => {
                 { id: 1, name: '登录', path: '/api/login', method: 'POST' },
                 { id: 2, name: '用户列表', path: '/api/user/list', method: 'GET' }
             ];
-            mockDb.getAll = mock(() => Promise.resolve(apis));
+            mockDb.getAll = mock(() => Promise.resolve({ lists: apis, total: apis.length }));
 
             await cacheHelper.cacheApis();
 
@@ -115,7 +115,7 @@ describe('CacheHelper', () => {
                 { id: 1, pid: 0, name: '首页', path: '/home', sort: 1 },
                 { id: 2, pid: 0, name: '用户管理', path: '/user', sort: 2 }
             ];
-            mockDb.getAll = mock(() => Promise.resolve(menus));
+            mockDb.getAll = mock(() => Promise.resolve({ lists: menus, total: menus.length }));
 
             await cacheHelper.cacheMenus();
 
@@ -148,9 +148,9 @@ describe('CacheHelper', () => {
             ];
 
             mockDb.getAll = mock((opts: any) => {
-                if (opts.table === 'addon_admin_role') return Promise.resolve(roles);
-                if (opts.table === 'addon_admin_api') return Promise.resolve(apis);
-                return Promise.resolve([]);
+                if (opts.table === 'addon_admin_role') return Promise.resolve({ lists: roles, total: roles.length });
+                if (opts.table === 'addon_admin_api') return Promise.resolve({ lists: apis, total: apis.length });
+                return Promise.resolve({ lists: [], total: 0 });
             });
 
             await cacheHelper.cacheRolePermissions();
@@ -169,9 +169,9 @@ describe('CacheHelper', () => {
             const apis = [{ id: 1, path: '/api/login', method: 'POST' }];
 
             mockDb.getAll = mock((opts: any) => {
-                if (opts.table === 'addon_admin_role') return Promise.resolve(roles);
-                if (opts.table === 'addon_admin_api') return Promise.resolve(apis);
-                return Promise.resolve([]);
+                if (opts.table === 'addon_admin_role') return Promise.resolve({ lists: roles, total: roles.length });
+                if (opts.table === 'addon_admin_api') return Promise.resolve({ lists: apis, total: apis.length });
+                return Promise.resolve({ lists: [], total: 0 });
             });
 
             await cacheHelper.cacheRolePermissions();
@@ -188,9 +188,9 @@ describe('CacheHelper', () => {
             const apis = [{ id: 1, path: '/api/test', method: 'GET' }];
 
             mockDb.getAll = mock((opts: any) => {
-                if (opts.table === 'addon_admin_role') return Promise.resolve(roles);
-                if (opts.table === 'addon_admin_api') return Promise.resolve(apis);
-                return Promise.resolve([]);
+                if (opts.table === 'addon_admin_role') return Promise.resolve({ lists: roles, total: roles.length });
+                if (opts.table === 'addon_admin_api') return Promise.resolve({ lists: apis, total: apis.length });
+                return Promise.resolve({ lists: [], total: 0 });
             });
 
             await cacheHelper.cacheRolePermissions();

package/types/database.d.ts

@@ -163,6 +163,16 @@ export interface ListResult<T = any> {
     pages: number;
 }
 
+/**
+ * 全部查询结果
+ */
+export interface AllResult<T = any> {
+    /** 数据列表 */
+    lists: T[];
+    /** 总条数 */
+    total: number;
+}
+
 /**
  * 事务回调函数
  */
@@ -269,7 +279,7 @@ export interface DbHelper {
      * @template K - 表名类型
      * @returns 返回类型自动推断为对应表的记录数组
      */
-    getAll<K extends TableName>(options: Omit<TypedQueryOptions<K>, 'page' | 'limit'>): Promise<TableType<K>[]>;
+    getAll<K extends TableName>(options: Omit<TypedQueryOptions<K>, 'page' | 'limit'>): Promise<AllResult<TableType<K>>>;
 
     /**
      * 插入数据（类型安全版本）
@@ -314,7 +324,7 @@ export interface DbHelper {
      * 查询所有数据（兼容版本，需手动指定泛型）
      * @template T - 返回类型
      */
-    getAll<T = any>(options: Omit<QueryOptions, 'page' | 'limit'>): Promise<T[]>;
+    getAll<T = any>(options: Omit<QueryOptions, 'page' | 'limit'>): Promise<AllResult<T>>;
 
     /**
      * 插入数据（兼容版本）