befly 3.18.15 → 3.18.17

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.18.15",
-    "gitHead": "52de35bf463398d4be0988fc5aaa2e0dda9fe185",
+    "version": "3.18.17",
+    "gitHead": "6bb80da8ad441667bca408c328e11ad37d858754",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/sync/api.js

@@ -15,17 +15,6 @@ const getApiParentPath = (apiPath) => {
     return `/${parentSegments.join("/")}`;
 };
 
-const normalizeAuthForDb = (value) => {
-    if (value === false) {
-        return "否";
-    }
-
-    if (Array.isArray(value)) {
-        return value.join(",");
-    }
-    return "是";
-};
-
 export async function syncApi(ctx, apis) {
     const allDbApis = await ctx.mysql.getAll({
         table: API_TABLE_NAME,
@@ -48,7 +37,7 @@ export async function syncApi(ctx, apis) {
     for (const api of apis) {
         scannedPathSet.add(api.apiPath);
 
-        const auth = normalizeAuthForDb(api.auth);
+        const auth = api.auth === false ? "否" : Array.isArray(api.auth) ? api.auth.join(",") : "是";
         const parentPath = getApiParentPath(api.apiPath);
         const existing = existingApiMap.get(api.apiPath);
 

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
                     }
                 });