befly 3.18.14 → 3.18.16

package/lib/dbHelper/dataOps.js

@@ -96,8 +96,8 @@ export const dataOpsMethods = {
     },
 
     async getAll(options) {
-        const MAX_LIMIT = 10000;
-        const WARNING_LIMIT = 1000;
+        const MAX_LIMIT = 100000;
+        const WARNING_LIMIT = 10000;
         const prepareOptions = this.buildQueryOptions(options, { page: 1, limit: 10 });
         const prepared = await this.prepareQueryOptions(prepareOptions, "getAll.options");
 

package/lib/dbHelper/validate.js

@@ -241,14 +241,14 @@ export function validateSafeFieldName(field) {
 }
 
 export function validatePageLimitRange(prepared, rawTable) {
-    if (prepared.page < 1 || prepared.page > 10000) {
+    if (prepared.page < 1 || prepared.page > 100000) {
         throw new Error(`页码必须在 1 到 10000 之间 (table: ${rawTable}, page: ${prepared.page}, limit: ${prepared.limit})`, {
             cause: null,
             code: "validation"
         });
     }
-    if (prepared.limit < 1 || prepared.limit > 1000) {
-        throw new Error(`每页数量必须在 1 到 1000 之间 (table: ${rawTable}, page: ${prepared.page}, limit: ${prepared.limit})`, {
+    if (prepared.limit < 1 || prepared.limit > 100000) {
+        throw new Error(`每页数量必须在 1 到 100000 之间 (table: ${rawTable}, page: ${prepared.page}, limit: ${prepared.limit})`, {
             cause: null,
             code: "validation"
         });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.18.14",
-    "gitHead": "51060719cdf19c3190a4e5c635a0ca3ae0bfd16a",
+    "version": "3.18.16",
+    "gitHead": "98aa4ea2914a476dfa3c8b23099a238134ca96e6",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/sync/dev.js

@@ -11,7 +11,7 @@ export async function syncDev(ctx) {
 
         const allApis = await ctx.mysql.getAll({
             table: "beflyApi",
-            fields: ["path"],
+            fields: ["path", "auth"],
             where: { state$gte: 0 },
             orderBy: ["id#ASC"]
         });
@@ -134,6 +134,60 @@ export async function syncDev(ctx) {
                 }
             });
 
+            const defaultApis = [];
+            for (const api of allApis.data.lists) {
+                const apiPath = api.path;
+                if (typeof apiPath !== "string" || apiPath.length === 0) {
+                    continue;
+                }
+
+                const auth = api.auth;
+                if (auth === "否" || auth === false) {
+                    defaultApis.push(apiPath);
+                    continue;
+                }
+
+                // 与 syncApi 的存储语义保持一致：
+                // - true -> "是"
+                // - false -> "否"
+                // - string[] -> "a,b,c"
+                if (typeof auth === "string" && auth !== "是") {
+                    const roleCodes = auth.split(",");
+                    for (const roleCode of roleCodes) {
+                        if (roleCode.trim() === roleConfig.code) {
+                            defaultApis.push(apiPath);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            const mergedApis = [];
+            const mergedApiSet = new Set();
+
+            if (Array.isArray(existingRole.data?.apis)) {
+                for (const apiPath of existingRole.data.apis) {
+                    if (typeof apiPath !== "string") {
+                        continue;
+                    }
+                    const value = apiPath.trim();
+                    if (value.length === 0 || mergedApiSet.has(value)) {
+                        continue;
+                    }
+                    mergedApiSet.add(value);
+                    mergedApis.push(value);
+                }
+            }
+
+            for (const apiPath of defaultApis) {
+                const value = apiPath.trim();
+                if (value.length === 0 || mergedApiSet.has(value)) {
+                    continue;
+                }
+                mergedApiSet.add(value);
+                mergedApis.push(value);
+            }
+
             if (existingRole.data?.id) {
                 // 角色存在则强制更新（不做差异判断）
                 await ctx.mysql.updData({
@@ -142,6 +196,7 @@ export async function syncDev(ctx) {
                     data: {
                         name: roleConfig.name,
                         description: roleConfig.description,
+                        apis: mergedApis,
                         sort: roleConfig.sort,
                         state: 1
                     }
@@ -154,7 +209,7 @@ export async function syncDev(ctx) {
                         name: roleConfig.name,
                         description: roleConfig.description,
                         menus: [],
-                        apis: [],
+                        apis: mergedApis,
                         sort: roleConfig.sort
                     }
                 });