befly 3.24.18 → 3.24.20

package/apis/email/logList.js

@@ -1,13 +1,14 @@
+import { queryFields } from "#root/apis/_apis.js";
+import emailLogTable from "#root/tables/emailLog.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: emailLogTable.state
     },
     required: [],
     handler: async (befly, ctx) => {
@@ -15,6 +16,15 @@ export default {
             table: "beflyEmailLog",
             page: ctx.body.page,
             limit: ctx.body.limit,
+            where: {
+                username$like$or: ctx.body.keyword,
+                nickname$like$or: ctx.body.keyword,
+                toEmail$like$or: ctx.body.keyword,
+                subject$like$or: ctx.body.keyword,
+                failReason$like$or: ctx.body.keyword,
+                messageId$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
             orderBy: ["sendTime#DESC"]
         });
 

package/apis/email/send.js

@@ -1,4 +1,5 @@
 import emailLogTable from "#root/tables/emailLog.json";
+import { hasEmailConfig } from "#root/utils/email.js";
 
 export default {
     name: "发送邮件",
@@ -20,6 +21,12 @@ export default {
     },
     required: ["to", "subject", "content"],
     handler: async (befly, ctx) => {
+        const emailConfig = befly.config.email || {};
+
+        if (!hasEmailConfig(emailConfig)) {
+            return befly.tool.No("邮件未配置，请检查 SMTP 配置");
+        }
+
         if (!befly.email) {
             return befly.tool.No("邮件插件未加载，请检查配置");
         }
@@ -31,15 +38,15 @@ export default {
             subject: ctx.body.subject,
             html: ctx.body.isHtml ? ctx.body.content : undefined,
             text: ctx.body.isHtml ? undefined : ctx.body.content,
-            cc: ctx.body.cc || undefined,
-            bcc: ctx.body.bcc || undefined
+            cc: ctx.body.cc,
+            bcc: ctx.body.bcc
         });
 
         try {
             await befly.mysql.insData({
                 table: "beflyEmailLog",
                 data: {
-                    adminId: ctx.userId || 0,
+                    adminId: ctx.userId,
                     username: "",
                     nickname: ctx.nickname || "",
                     toEmail: ctx.body.to,

package/apis/email/verify.js

@@ -1,3 +1,5 @@
+import { hasEmailConfig } from "#root/utils/email.js";
+
 export default {
     name: "验证邮件配置",
     method: "POST",
@@ -6,16 +8,16 @@ export default {
     fields: {},
     required: [],
     handler: async (befly) => {
-        if (!befly.email) {
-            return befly.tool.No("邮件插件未加载，请检查配置");
-        }
+        const emailConfig = befly?.config?.email || {};
 
-        const isValid = await befly.email.verify();
+        if (!hasEmailConfig(emailConfig)) {
+            return befly.tool.No("邮件未配置，请检查 SMTP 配置");
+        }
 
-        if (isValid) {
-            return befly.tool.Yes("邮件服务配置正常");
+        if (!befly.email) {
+            return befly.tool.No("邮件插件未加载，请检查配置");
         }
 
-        return befly.tool.No("邮件服务配置异常，请检查 SMTP 设置");
+        return befly.tool.Yes("邮件配置已启用");
     }
 };

package/apis/loginLog/select.js

@@ -1,13 +1,14 @@
+import { queryFields } from "#root/apis/_apis.js";
+import loginLogTable from "#root/tables/loginLog.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: loginLogTable.state
     },
     required: [],
     handler: async (befly, ctx) => {
@@ -15,6 +16,12 @@ export default {
             table: "beflyLoginLog",
             page: ctx.body.page,
             limit: ctx.body.limit,
+            where: {
+                username$like$or: ctx.body.keyword,
+                nickname$like$or: ctx.body.keyword,
+                ip$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
             orderBy: ["loginTime#DESC"]
         });
 

package/apis/menu/all.js

@@ -6,29 +6,23 @@ export default {
     fields: {},
     required: [],
     handler: async (befly, ctx) => {
-        try {
-            const menuPaths = await befly.cache.getRoleMenus(ctx.roleCode);
+        const menuPaths = await befly.cache.getRoleMenus(ctx.roleCode);
 
-            if (menuPaths.length === 0) {
-                return befly.tool.Yes("菜单为空", { lists: [] });
-            }
+        if (menuPaths.length === 0) {
+            return befly.tool.Yes("菜单为空", { lists: [] });
+        }
 
-            const allMenus = await befly.cache.getMenus();
+        const allMenus = await befly.cache.getMenus();
 
-            if (allMenus.length === 0) {
-                return befly.tool.No("菜单缓存不存在，请刷新缓存", { lists: [] });
-            }
+        if (allMenus.length === 0) {
+            return befly.tool.No("菜单缓存不存在，请刷新缓存", { lists: [] });
+        }
 
-            const menuPathSet = new Set(menuPaths);
-            const authorizedMenus = allMenus.filter((menu) => {
-                const path = menu["path"];
-                return menuPathSet.has(path);
-            });
+        const menuPathSet = new Set(menuPaths);
+        const authorizedMenus = allMenus.filter((menu) => {
+            return menuPathSet.has(menu.path);
+        });
 
-            return befly.tool.Yes("获取菜单成功", { lists: authorizedMenus });
-        } catch (error) {
-            befly.logger.error("获取用户菜单失败", error);
-            return befly.tool.No("获取菜单失败");
-        }
+        return befly.tool.Yes("获取菜单成功", { lists: authorizedMenus });
     }
 };

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("操作成功");
     }
 };