befly 3.24.19 → 3.24.20

package/apis/menu/select.js

@@ -1,25 +1,30 @@
+import { queryFields } from "#root/apis/_apis.js";
+import menuTable from "#root/tables/menu.json";
+
 export default {
     name: "获取菜单列表",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        keyword: { name: "关键词", input: "string", min: 0, max: 50 },
-        state: { name: "状态", input: "integer", min: 0, max: 2 }
+        ...queryFields,
+        state: menuTable.state
     },
     required: [],
-    handler: async (befly) => {
-        try {
-            const menus = await befly.mysql.getAll({
-                table: "beflyMenu"
-            });
+    handler: async (befly, ctx) => {
+        const menus = await befly.mysql.getList({
+            table: "beflyMenu",
+            page: ctx.body.page,
+            limit: ctx.body.limit,
+            where: {
+                name$like$or: ctx.body.keyword,
+                path$like$or: ctx.body.keyword,
+                parentPath$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
+            orderBy: ["sort#ASC", "id#ASC"]
+        });
 
-            return befly.tool.Yes("操作成功", { lists: menus.data.lists });
-        } catch (error) {
-            befly.logger.error("获取菜单列表失败", error);
-            return befly.tool.No("操作失败");
-        }
+        return befly.tool.Yes("操作成功", menus.data);
     }
 };

package/apis/operateLog/select.js

@@ -1,13 +1,14 @@
+import { queryFields } from "#root/apis/_apis.js";
+import operateLogTable from "#root/tables/operateLog.json";
+
 export default {
     name: "获取操作日志列表",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        keyword: { name: "关键词", input: "string", min: 0, max: 50 },
-        state: { name: "状态", input: "integer", min: 0, max: 2 }
+        ...queryFields,
+        state: operateLogTable.state
     },
     required: [],
     handler: async (befly, ctx) => {
@@ -15,6 +16,14 @@ export default {
             table: "beflyOperateLog",
             page: ctx.body.page,
             limit: ctx.body.limit,
+            where: {
+                username$like$or: ctx.body.keyword,
+                nickname$like$or: ctx.body.keyword,
+                module$like$or: ctx.body.keyword,
+                action$like$or: ctx.body.keyword,
+                path$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
             orderBy: ["operateTime#DESC"]
         });
 

package/apis/role/_role.js

@@ -0,0 +1,21 @@
+export const systemRoleCodes = ["dev", "user", "admin", "guest"];
+
+export async function getRoleByCode(befly, roleCode, fields = undefined) {
+    return await befly.mysql.getOne({
+        table: "beflyRole",
+        fields: fields,
+        where: {
+            code: roleCode
+        }
+    });
+}
+
+export async function getRoleById(befly, id, fields = undefined) {
+    return await befly.mysql.getOne({
+        table: "beflyRole",
+        fields: fields,
+        where: {
+            id: id
+        }
+    });
+}

package/apis/role/all.js

@@ -9,9 +9,7 @@ export default {
         const roles = await befly.mysql.getAll({
             table: "beflyRole",
             where: {
-                code: {
-                    $not: "dev"
-                }
+                code$not: "dev"
             },
             orderBy: ["sort#ASC", "id#ASC"]
         });

package/apis/role/apiSave.js

@@ -1,5 +1,6 @@
-import adminRoleTable from "#root/tables/role.json";
-import { isNonEmptyString } from "#root/utils/is.js";
+import roleTable from "#root/tables/role.json";
+
+import { getRoleByCode } from "./_role.js";
 
 export default {
     name: "保存角色接口权限",
@@ -7,27 +8,19 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        roleCode: adminRoleTable.code,
-        apiPaths: adminRoleTable.apis
+        roleCode: roleTable.code,
+        apiPaths: roleTable.apis
     },
-    required: [],
+    required: ["roleCode"],
     handler: async (befly, ctx) => {
         const apiPaths = ctx.body.apiPaths || [];
 
-        const role = await befly.mysql.getOne({
-            table: "beflyRole",
-            where: { code: ctx.body.roleCode }
-        });
+        const role = await getRoleByCode(befly, ctx.body.roleCode);
 
         if (!role.data || !role.data.id) {
             return befly.tool.No("角色不存在");
         }
 
-        const roleCode = role.data.code;
-        if (!isNonEmptyString(roleCode)) {
-            return befly.tool.No("角色不存在");
-        }
-
         await befly.mysql.updData({
             table: "beflyRole",
             where: { code: ctx.body.roleCode },
@@ -36,7 +29,7 @@ export default {
             }
         });
 
-        await befly.cache.refreshRoleApis(roleCode, apiPaths);
+        await befly.cache.refreshRoleApis(role.data.code, apiPaths);
 
         return befly.tool.Yes("操作成功");
     }

package/apis/role/apis.js

@@ -1,5 +1,4 @@
-import adminRoleTable from "#root/tables/role.json";
-import { isNonEmptyString } from "#root/utils/is.js";
+import roleTable from "#root/tables/role.json";
 
 export default {
     name: "获取角色接口权限",
@@ -7,16 +6,11 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        roleCode: adminRoleTable.code
+        roleCode: roleTable.code
     },
-    required: [],
+    required: ["roleCode"],
     handler: async (befly, ctx) => {
-        const roleCode = isNonEmptyString(ctx.body.roleCode) ? ctx.body.roleCode : "";
-        if (!isNonEmptyString(roleCode)) {
-            return befly.tool.No("参数不合法");
-        }
-
-        const apiPaths = await befly.cache.getRoleApis(roleCode);
+        const apiPaths = await befly.cache.getRoleApis(ctx.body.roleCode);
         return befly.tool.Yes("操作成功", { apiPaths: apiPaths });
     }
 };

package/apis/role/delete.js

@@ -1,3 +1,5 @@
+import { getRoleById, systemRoleCodes } from "./_role.js";
+
 export default {
     name: "删除角色",
     method: "POST",
@@ -8,42 +10,32 @@ export default {
     },
     required: ["id"],
     handler: async (befly, ctx) => {
-        try {
-            const role = await befly.mysql.getOne({
-                table: "beflyRole",
-                where: { id: ctx.body.id },
-                fields: ["code"]
-            });
-
-            if (!role.data?.code) {
-                return befly.tool.No("角色不存在");
-            }
-
-            const systemRoleCodes = ["dev", "user", "admin", "guest"];
-            if (systemRoleCodes.includes(role.data.code)) {
-                return befly.tool.No(`系统角色 [${role.data.code}] 不允许删除`);
-            }
-
-            const adminList = await befly.mysql.getList({
-                table: "beflyAdmin",
-                where: { roleCode: role.data.code }
-            });
-
-            if (adminList.data.total > 0) {
-                return befly.tool.No("该角色已分配给用户，无法删除");
-            }
-
-            await befly.mysql.delData({
-                table: "beflyRole",
-                where: { id: ctx.body.id }
-            });
-
-            await befly.cache.deleteRoleApis(role.data.code);
-
-            return befly.tool.Yes("操作成功");
-        } catch (error) {
-            befly.logger.error("删除角色失败", error);
-            return befly.tool.No("操作失败");
+        const role = await getRoleById(befly, ctx.body.id, ["code"]);
+
+        if (!role.data?.code) {
+            return befly.tool.No("角色不存在");
+        }
+
+        if (systemRoleCodes.includes(role.data.code)) {
+            return befly.tool.No(`系统角色 [${role.data.code}] 不允许删除`);
+        }
+
+        const adminList = await befly.mysql.getList({
+            table: "beflyAdmin",
+            where: { roleCode: role.data.code }
+        });
+
+        if (adminList.data.total > 0) {
+            return befly.tool.No("该角色已分配给用户，无法删除");
         }
+
+        await befly.mysql.delData({
+            table: "beflyRole",
+            where: { id: ctx.body.id }
+        });
+
+        await befly.cache.deleteRoleApis(role.data.code);
+
+        return befly.tool.Yes("操作成功");
     }
 };

package/apis/role/detail.js

@@ -1,5 +1,6 @@
 import roleTable from "#root/tables/role.json";
-import { isNumber } from "#root/utils/is.js";
+
+import { getRoleByCode } from "./_role.js";
 
 export default {
     name: "获取用户角色",
@@ -13,15 +14,8 @@ export default {
     handler: async (befly, ctx) => {
         let roleInfo = null;
         if (ctx.body.id && ctx.roleType === "admin") {
-            const roleInfoResult = await befly.mysql.getOne({
-                table: "beflyRole",
-                where: { code: ctx.body.id }
-            });
-
-            const roleId = roleInfoResult.data ? roleInfoResult.data.id : undefined;
-            if (isNumber(roleId)) {
-                roleInfo = roleInfoResult.data;
-            }
+            const roleInfoResult = await getRoleByCode(befly, ctx.body.id);
+            roleInfo = roleInfoResult.data || null;
         }
 
         return befly.tool.Yes("操作成功", {

package/apis/role/insert.js

@@ -1,4 +1,4 @@
-import adminRoleTable from "#root/tables/role.json";
+import roleTable from "#root/tables/role.json";
 
 export default {
     name: "创建角色",
@@ -6,15 +6,17 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        name: adminRoleTable.name,
-        code: adminRoleTable.code,
-        description: adminRoleTable.description,
-        menus: adminRoleTable.menus,
-        apis: adminRoleTable.apis,
-        sort: adminRoleTable.sort
+        name: roleTable.name,
+        code: roleTable.code,
+        description: roleTable.description,
+        menus: roleTable.menus,
+        apis: roleTable.apis,
+        sort: roleTable.sort
     },
     required: [],
     handler: async (befly, ctx) => {
+        const menuPaths = ctx.body.menus || [];
+        const apiPaths = ctx.body.apis || [];
         const existing = await befly.mysql.getOne({
             table: "beflyRole",
             where: { code: ctx.body.code }
@@ -30,13 +32,13 @@ export default {
                 name: ctx.body.name,
                 code: ctx.body.code,
                 description: ctx.body.description,
-                menus: ctx.body.menus || [],
-                apis: ctx.body.apis || [],
+                menus: menuPaths,
+                apis: apiPaths,
                 sort: ctx.body.sort
             }
         });
 
-        await befly.cache.refreshRoleApis(ctx.body.code, ctx.body.apis || []);
+        await befly.cache.refreshRoleApis(ctx.body.code, apiPaths);
 
         return befly.tool.Yes("操作成功", { id: roleId.data });
     }

package/apis/role/menuSave.js

@@ -1,5 +1,6 @@
-import adminRoleTable from "#root/tables/role.json";
-import { isNonEmptyString } from "#root/utils/is.js";
+import roleTable from "#root/tables/role.json";
+
+import { getRoleByCode } from "./_role.js";
 
 export default {
     name: "保存角色菜单权限",
@@ -7,21 +8,14 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        roleCode: adminRoleTable.code,
-        menuPaths: adminRoleTable.menus
+        roleCode: roleTable.code,
+        menuPaths: roleTable.menus
     },
-    required: [],
+    required: ["roleCode"],
     handler: async (befly, ctx) => {
-        const roleCode = isNonEmptyString(ctx.body.roleCode) ? ctx.body.roleCode : "";
-        if (!isNonEmptyString(roleCode)) {
-            return befly.tool.No("参数不合法");
-        }
         const menuPaths = ctx.body.menuPaths || [];
 
-        const role = await befly.mysql.getOne({
-            table: "beflyRole",
-            where: { code: roleCode }
-        });
+        const role = await getRoleByCode(befly, ctx.body.roleCode);
 
         if (!role.data || !role.data.id) {
             return befly.tool.No("角色不存在");
@@ -29,13 +23,13 @@ export default {
 
         await befly.mysql.updData({
             table: "beflyRole",
-            where: { code: roleCode },
+            where: { code: ctx.body.roleCode },
             data: {
                 menus: menuPaths
             }
         });
 
-        await befly.cache.refreshRoleMenus(roleCode, menuPaths);
+        await befly.cache.refreshRoleMenus(role.data.code, menuPaths);
 
         return befly.tool.Yes("操作成功");
     }

package/apis/role/menus.js

@@ -1,5 +1,4 @@
-import adminRoleTable from "#root/tables/role.json";
-import { isNonEmptyString } from "#root/utils/is.js";
+import roleTable from "#root/tables/role.json";
 
 export default {
     name: "获取角色菜单权限",
@@ -7,16 +6,11 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        roleCode: adminRoleTable.code
+        roleCode: roleTable.code
     },
-    required: [],
+    required: ["roleCode"],
     handler: async (befly, ctx) => {
-        const roleCode = isNonEmptyString(ctx.body.roleCode) ? ctx.body.roleCode : "";
-        if (!isNonEmptyString(roleCode)) {
-            return befly.tool.No("参数不合法");
-        }
-
-        const menuPaths = await befly.cache.getRoleMenus(roleCode);
+        const menuPaths = await befly.cache.getRoleMenus(ctx.body.roleCode);
         return befly.tool.Yes("操作成功", menuPaths);
     }
 };

package/apis/role/save.js

@@ -1,40 +1,36 @@
+import adminTable from "#root/tables/admin.json";
 import roleTable from "#root/tables/role.json";
 
+import { getRoleByCode } from "./_role.js";
+
 export default {
     name: "角色保存",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
+        adminId: adminTable.id,
         roleCode: roleTable.code
     },
-    required: [],
+    required: ["adminId", "roleCode"],
     handler: async (befly, ctx) => {
-        try {
-            const role = await befly.mysql.getOne({
-                table: "beflyRole",
-                where: { code: ctx.body.roleCode }
-            });
+        const role = await getRoleByCode(befly, ctx.body.roleCode);
 
-            if (!role.data || !role.data.id) {
-                return befly.tool.No("角色不存在");
-            }
+        if (!role.data?.id) {
+            return befly.tool.No("角色不存在");
+        }
 
-            const roleType = role.data.code === "dev" || role.data.code === "admin" ? "admin" : "user";
+        const roleType = role.data.code === "dev" || role.data.code === "admin" ? "admin" : "user";
 
-            await befly.mysql.updData({
-                table: "beflyAdmin",
-                where: { id: ctx.body.adminId },
-                data: {
-                    roleCode: role.data.code,
-                    roleType: roleType
-                }
-            });
+        await befly.mysql.updData({
+            table: "beflyAdmin",
+            where: { id: ctx.body.adminId },
+            data: {
+                roleCode: role.data.code,
+                roleType: roleType
+            }
+        });
 
-            return befly.tool.Yes("操作成功");
-        } catch (error) {
-            befly.logger.error("保存用户角色失败", error);
-            return befly.tool.No("操作失败");
-        }
+        return befly.tool.Yes("操作成功");
     }
 };

package/apis/role/select.js

@@ -1,23 +1,26 @@
+import { queryFields } from "#root/apis/_apis.js";
+import roleTable from "#root/tables/role.json";
+
 export default {
     name: "获取角色列表",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        keyword: { name: "关键词", input: "string", min: 0, max: 50 },
-        state: { name: "状态", input: "integer", min: 0, max: 2 }
+        ...queryFields,
+        state: roleTable.state
     },
     required: [],
-    handler: async (befly) => {
+    handler: async (befly, ctx) => {
         const roles = await befly.mysql.getList({
-            limit: 30,
             table: "beflyRole",
+            page: ctx.body.page,
+            limit: ctx.body.limit,
             where: {
-                code: {
-                    $not: "dev"
-                }
+                name$like$or: ctx.body.keyword,
+                code$like$or: ctx.body.keyword,
+                state: ctx.body.state,
+                code$not: "dev"
             },
             orderBy: ["sort#ASC", "id#ASC"]
         });

package/apis/role/update.js

@@ -1,4 +1,6 @@
-import adminRoleTable from "#root/tables/role.json";
+import roleTable from "#root/tables/role.json";
+
+import { getRoleById } from "./_role.js";
 
 export default {
     name: "更新角色",
@@ -6,20 +8,17 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null },
-        name: adminRoleTable.name,
-        code: adminRoleTable.code,
-        description: adminRoleTable.description,
-        menus: adminRoleTable.menus,
-        apis: adminRoleTable.apis,
-        sort: adminRoleTable.sort
+        id: roleTable.id,
+        name: roleTable.name,
+        code: roleTable.code,
+        description: roleTable.description,
+        menus: roleTable.menus,
+        apis: roleTable.apis,
+        sort: roleTable.sort
     },
     required: ["id"],
     handler: async (befly, ctx) => {
-        const role = await befly.mysql.getOne({
-            table: "beflyRole",
-            where: { id: ctx.body.id }
-        });
+        const role = await getRoleById(befly, ctx.body.id);
 
         if (!role.data?.id) {
             return befly.tool.No("角色不存在");
@@ -39,9 +38,9 @@ export default {
             }
         }
 
-        const roleCode = ctx.body.code !== undefined ? ctx.body.code : role.data.code;
-        const apiPaths = ctx.body.apis !== undefined ? ctx.body.apis : role.data.apis || [];
-        const menuPaths = ctx.body.menus !== undefined ? ctx.body.menus : role.data.menus || [];
+        const roleCode = ctx.body.code === undefined ? role.data.code : ctx.body.code;
+        const apiPaths = ctx.body.apis === undefined ? role.data.apis || [] : ctx.body.apis;
+        const menuPaths = ctx.body.menus === undefined ? role.data.menus || [] : ctx.body.menus;
 
         await befly.mysql.updData({
             table: "beflyRole",

package/apis/source/imageList.js

@@ -1,12 +1,12 @@
+import { queryFields } from "#root/apis/_apis.js";
+
 export default {
     name: "获取图库列表",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        keyword: { name: "关键词", input: "string", min: 0, max: 100 }
+        ...queryFields
     },
     required: [],
     handler: async (befly, ctx) => {

package/apis/sysConfig/get.js

@@ -1,5 +1,4 @@
 import sysConfigTable from "#root/tables/sysConfig.json";
-import { isString } from "#root/utils/is.js";
 
 export default {
     name: "根据代码获取配置值",
@@ -9,41 +8,30 @@ export default {
     fields: {
         code: sysConfigTable.code
     },
-    required: [],
+    required: ["code"],
     handler: async (befly, ctx) => {
         const config = await befly.mysql.getOne({
             table: "beflySysConfig",
             where: { code: ctx.body.code }
         });
 
-        if (!config.data || !config.data.id) {
+        if (!config.data?.id) {
             return befly.tool.No("配置不存在");
         }
 
-        const valueType = config.data.valueType;
-        const rawValue = config.data.value;
-        if (!isString(valueType) || !isString(rawValue)) {
-            return befly.tool.No("配置数据不完整");
-        }
-
-        const code = config.data.code;
-        if (!isString(code)) {
-            return befly.tool.No("配置数据不完整");
-        }
-
-        let value = rawValue;
-        if (valueType === "number") {
-            value = Number(rawValue);
-        } else if (valueType === "boolean") {
-            value = rawValue === "true" || rawValue === "1";
-        } else if (valueType === "json") {
+        let value = config.data.value;
+        if (config.data.valueType === "number") {
+            value = Number(config.data.value);
+        } else if (config.data.valueType === "boolean") {
+            value = config.data.value === "true" || config.data.value === "1";
+        } else if (config.data.valueType === "json") {
             try {
-                value = JSON.parse(rawValue);
+                value = JSON.parse(config.data.value);
             } catch {
-                value = rawValue;
+                value = config.data.value;
             }
         }
 
-        return befly.tool.Yes("操作成功", { code: code, value: value });
+        return befly.tool.Yes("操作成功", { code: config.data.code, value: value });
     }
 };