befly 3.22.9 → 3.23.1

package/sync/api.js

@@ -1,3 +1,5 @@
+import { buildPathSyncLists } from "./syncUtil.js";
+
 const API_TABLE_NAME = "beflyApi";
 
 const getApiParentPath = (apiPath) => {
@@ -22,64 +24,45 @@ export async function syncApi(ctx, apis) {
         where: { state$gte: 0 }
     });
 
-    // 给接口根据接口路径进行映射
-    const dbLists = allDbApis.data.lists || [];
-    const existingApiMap = new Map();
-    for (const item of dbLists) {
-        if (!existingApiMap.has(item.path)) {
-            existingApiMap.set(item.path, item);
-        }
-    }
-
-    const insList = [];
-    const updList = [];
-    const scannedPathSet = new Set();
+    const apiDefs = [];
     for (const api of apis) {
-        scannedPathSet.add(api.apiPath);
-
-        const auth = api.auth === false ? "否" : Array.isArray(api.auth) ? api.auth.join(",") : "是";
-        const parentPath = getApiParentPath(api.apiPath);
-        const existing = existingApiMap.get(api.apiPath);
-
-        if (existing) {
-            updList.push({
-                id: existing.id,
-                data: {
-                    name: api.name,
-                    path: api.apiPath,
-                    method: api.method,
-                    parentPath: parentPath,
-                    auth: auth
-                }
-            });
-            continue;
-        }
-
-        insList.push({
+        apiDefs.push({
             name: api.name,
             path: api.apiPath,
             method: api.method,
-            parentPath: parentPath,
-            auth: auth
+            parentPath: getApiParentPath(api.apiPath),
+            auth: api.auth === false ? "否" : Array.isArray(api.auth) ? api.auth.join(",") : "是"
         });
     }
 
-    const delIdList = [];
-    for (const item of dbLists) {
-        if (!scannedPathSet.has(item.path)) {
-            delIdList.push(item.id);
-        }
-    }
+    const syncLists = buildPathSyncLists(
+        allDbApis.data.lists || [],
+        apiDefs,
+        (def) => ({
+            name: def.name,
+            path: def.path,
+            method: def.method,
+            parentPath: def.parentPath,
+            auth: def.auth
+        }),
+        (def) => ({
+            name: def.name,
+            path: def.path,
+            method: def.method,
+            parentPath: def.parentPath,
+            auth: def.auth
+        })
+    );
 
-    if (updList.length > 0) {
-        await ctx.mysql.updBatch(API_TABLE_NAME, updList);
+    if (syncLists.updList.length > 0) {
+        await ctx.mysql.updBatch(API_TABLE_NAME, syncLists.updList);
     }
 
-    if (insList.length > 0) {
-        await ctx.mysql.insBatch(API_TABLE_NAME, insList);
+    if (syncLists.insList.length > 0) {
+        await ctx.mysql.insBatch(API_TABLE_NAME, syncLists.insList);
     }
 
-    if (delIdList.length > 0) {
-        await ctx.mysql.delForceBatch(API_TABLE_NAME, delIdList);
+    if (syncLists.delIds.length > 0) {
+        await ctx.mysql.delForceBatch(API_TABLE_NAME, syncLists.delIds);
     }
 }

package/sync/menu.js

@@ -1,3 +1,5 @@
+import { buildPathSyncLists } from "./syncUtil.js";
+
 const MENU_TABLE_NAME = "beflyMenu";
 
 export function flattenMenusToDefMap(menus) {
@@ -47,55 +49,33 @@ export async function syncMenu(ctx, menus) {
         where: { state$gte: 0 }
     });
 
-    const existingList = allExistingMenus.data.lists || [];
-
-    const existingMenuMap = new Map();
-    const delIdSet = new Set();
-    for (const record of existingList) {
-        if (!existingMenuMap.has(record.path)) {
-            existingMenuMap.set(record.path, record);
-            delIdSet.add(record.id);
-        }
-    }
-
-    // 2) 一次性算出 insert/update（仅依赖 path diff，不使用 pid，不预生成 id）
-    const updList = [];
-    const insList = [];
-
-    for (const def of menuDefMap.values()) {
-        const existing = existingMenuMap.get(def.path);
-        if (existing) {
-            delIdSet.delete(existing.id);
-            updList.push({
-                id: existing.id,
-                data: {
-                    name: def.name,
-                    path: def.path,
-                    parentPath: def.parentPath,
-                    sort: def.sort
-                }
-            });
-        } else {
-            insList.push({
-                name: def.name,
-                path: def.path,
-                parentPath: def.parentPath,
-                sort: def.sort
-            });
-        }
-    }
+    const syncLists = buildPathSyncLists(
+        allExistingMenus.data.lists || [],
+        Array.from(menuDefMap.values()),
+        (def) => ({
+            name: def.name,
+            path: def.path,
+            parentPath: def.parentPath,
+            sort: def.sort
+        }),
+        (def) => ({
+            name: def.name,
+            path: def.path,
+            parentPath: def.parentPath,
+            sort: def.sort
+        })
+    );
 
-    if (updList.length > 0) {
-        await ctx.mysql.updBatch(MENU_TABLE_NAME, updList);
+    if (syncLists.updList.length > 0) {
+        await ctx.mysql.updBatch(MENU_TABLE_NAME, syncLists.updList);
     }
 
-    if (insList.length > 0) {
-        await ctx.mysql.insBatch(MENU_TABLE_NAME, insList);
+    if (syncLists.insList.length > 0) {
+        await ctx.mysql.insBatch(MENU_TABLE_NAME, syncLists.insList);
     }
 
     // 3) 删除差集（DB - 配置）
-    const delIds = Array.from(delIdSet);
-    if (delIds.length > 0) {
-        await ctx.mysql.delForceBatch(MENU_TABLE_NAME, delIds);
+    if (syncLists.delIds.length > 0) {
+        await ctx.mysql.delForceBatch(MENU_TABLE_NAME, syncLists.delIds);
     }
 }

package/sync/syncUtil.js

@@ -0,0 +1,35 @@
+export function buildPathSyncLists(existingList, defList, buildUpdateData, buildInsertData) {
+    const existingMap = new Map();
+    const delIdSet = new Set();
+
+    for (const record of existingList) {
+        if (!existingMap.has(record.path)) {
+            existingMap.set(record.path, record);
+            delIdSet.add(record.id);
+        }
+    }
+
+    const updList = [];
+    const insList = [];
+
+    for (const def of defList) {
+        const existing = existingMap.get(def.path);
+
+        if (existing) {
+            delIdSet.delete(existing.id);
+            updList.push({
+                id: existing.id,
+                data: buildUpdateData(def, existing)
+            });
+            continue;
+        }
+
+        insList.push(buildInsertData(def));
+    }
+
+    return {
+        updList: updList,
+        insList: insList,
+        delIds: Array.from(delIdSet)
+    };
+}

package/utils/util.js

@@ -170,6 +170,19 @@ export function camelCase(input) {
     return [first].concat(rest).join("");
 }
 
+/**
+ * 字段名专用小驼峰转换。
+ * - 只要原始值包含下划线，就直接保留原字段名。
+ * - 其余场景继续走普通小驼峰转换。
+ */
+export function camelCaseKeepUnderscore(input) {
+    if (input.includes("_")) {
+        return input;
+    }
+
+    return camelCase(input);
+}
+
 /**
  * 把字符串转为 snake_case。
  * - 主要用于表名/字段名（例如 userId -> user_id）。