befly 3.23.7 → 3.24.0

package/apis/admin/{del.js → delete.js}

@@ -8,22 +8,19 @@ export default {
     },
     required: ["id"],
     handler: async (befly, ctx) => {
-        // 检查管理员是否存在
-        const adminData = await befly.mysql.getOne({
+        const admin = await befly.mysql.getOne({
             table: "beflyAdmin",
             where: { id: ctx.body.id }
         });
 
-        if (!adminData.data?.id) {
+        if (!admin.data?.id) {
             return befly.tool.No("管理员不存在");
         }
 
-        // 不能删除 dev 角色的管理员
-        if (adminData.data.roleCode === "dev") {
+        if (admin.data.roleCode === "dev") {
             return befly.tool.No("不能删除开发管理员");
         }
 
-        // 删除管理员
         await befly.mysql.delData({
             table: "beflyAdmin",
             where: { id: ctx.body.id }

package/apis/admin/{ins.js → insert.js}

@@ -14,7 +14,6 @@ export default {
     },
     required: ["username", "password", "roleCode"],
     handler: async (befly, ctx) => {
-        // 检查用户名是否已存在
         const existingByUsername = await befly.mysql.getOne({
             table: "beflyAdmin",
             where: { username: ctx.body.username }
@@ -24,7 +23,6 @@ export default {
             return befly.tool.No("用户名已被使用");
         }
 
-        // 检查昵称是否已存在
         if (ctx.body.nickname) {
             const existingByNickname = await befly.mysql.getOne({
                 table: "beflyAdmin",
@@ -36,22 +34,19 @@ export default {
             }
         }
 
-        // 查询角色信息
-        const roleData = await befly.mysql.getOne({
+        const role = await befly.mysql.getOne({
             table: "beflyRole",
             where: { code: ctx.body.roleCode }
         });
 
-        if (!roleData.data?.id) {
+        if (!role.data?.id) {
             return befly.tool.No("角色不存在");
         }
 
-        // 加密密码
-        const incoming = isString(ctx.body.password) ? ctx.body.password.toLowerCase() : "";
-        const isSha256Hex = /^[a-f0-9]{64}$/.test(incoming);
-        const hashedPassword = isSha256Hex ? befly.tool.sha256(incoming) : befly.tool.sha256(befly.tool.sha256(ctx.body.password));
+        const passwordSource = isString(ctx.body.password) ? ctx.body.password.toLowerCase() : "";
+        const isSha256Hex = /^[a-f0-9]{64}$/.test(passwordSource);
+        const hashedPassword = isSha256Hex ? befly.tool.sha256(passwordSource) : befly.tool.sha256(befly.tool.sha256(ctx.body.password));
 
-        // 创建管理员
         const adminId = await befly.mysql.insData({
             table: "beflyAdmin",
             data: {
@@ -62,8 +57,6 @@ export default {
             }
         });
 
-        return befly.tool.Yes("添加成功", {
-            id: adminId.data
-        });
+        return befly.tool.Yes("添加成功", { id: adminId.data });
     }
 };

package/apis/admin/update.js

@@ -0,0 +1,92 @@
+import adminTable from "../../tables/admin.json";
+
+export default {
+    name: "更新管理员",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        id: { name: "ID", input: "integer", min: 1, max: null },
+        username: adminTable.username,
+        nickname: adminTable.nickname,
+        roleCode: adminTable.roleCode,
+        avatar: adminTable.avatar,
+        email: adminTable.email,
+        lastLoginIp: adminTable.lastLoginIp,
+        lastLoginTime: adminTable.lastLoginTime,
+        password: adminTable.password,
+        phone: adminTable.phone,
+        roleType: adminTable.roleType
+    },
+    required: ["id"],
+    handler: async (befly, ctx) => {
+        const admin = await befly.mysql.getOne({
+            table: "beflyAdmin",
+            where: { id: ctx.body.id }
+        });
+
+        if (!admin.data?.id) {
+            return befly.tool.No("管理员不存在");
+        }
+
+        if (ctx.body.username && ctx.body.username !== admin.data.username) {
+            const existingUsername = await befly.mysql.getOne({
+                table: "beflyAdmin",
+                where: {
+                    username: ctx.body.username,
+                    id: { $not: ctx.body.id }
+                }
+            });
+
+            if (existingUsername.data?.id) {
+                return befly.tool.No("用户名已被使用");
+            }
+        }
+
+        if (ctx.body.nickname && ctx.body.nickname !== admin.data.nickname) {
+            const existingNickname = await befly.mysql.getOne({
+                table: "beflyAdmin",
+                where: {
+                    nickname: ctx.body.nickname,
+                    id: { $not: ctx.body.id }
+                }
+            });
+
+            if (existingNickname.data?.id) {
+                return befly.tool.No("昵称已被使用");
+            }
+        }
+
+        if (ctx.body.roleCode && ctx.body.roleCode !== admin.data.roleCode) {
+            const role = await befly.mysql.getOne({
+                table: "beflyRole",
+                where: { code: ctx.body.roleCode }
+            });
+
+            if (!role.data?.id) {
+                return befly.tool.No("角色不存在");
+            }
+        }
+
+        const updateData = {};
+
+        if (ctx.body.avatar !== undefined) updateData.avatar = ctx.body.avatar;
+        if (ctx.body.email !== undefined) updateData.email = ctx.body.email;
+        if (ctx.body.lastLoginIp !== undefined) updateData.lastLoginIp = ctx.body.lastLoginIp;
+        if (ctx.body.lastLoginTime !== undefined) updateData.lastLoginTime = ctx.body.lastLoginTime;
+        if (ctx.body.password !== undefined) updateData.password = ctx.body.password;
+        if (ctx.body.phone !== undefined) updateData.phone = ctx.body.phone;
+        if (ctx.body.roleType !== undefined) updateData.roleType = ctx.body.roleType;
+        if (ctx.body.username !== undefined) updateData.username = ctx.body.username;
+        if (ctx.body.nickname !== undefined) updateData.nickname = ctx.body.nickname;
+        if (ctx.body.roleCode !== undefined) updateData.roleCode = ctx.body.roleCode;
+
+        await befly.mysql.updData({
+            table: "beflyAdmin",
+            data: updateData,
+            where: { id: ctx.body.id }
+        });
+
+        return befly.tool.Yes("更新成功");
+    }
+};

package/apis/dict/{del.js → delete.js}

@@ -3,7 +3,9 @@ export default {
     method: "POST",
     body: "none",
     auth: true,
-    fields: { id: { name: "ID", input: "integer", min: 1, max: null } },
+    fields: {
+        id: { name: "ID", input: "integer", min: 1, max: null }
+    },
     required: ["id"],
     handler: async (befly, ctx) => {
         await befly.mysql.delData({

package/apis/dict/{ins.js → insert.js}

@@ -19,7 +19,7 @@ export default {
             where: { code: ctx.body.typeCode }
         });
 
-        if (!dictType.data || !dictType.data.id) {
+        if (!dictType.data?.id) {
             return befly.tool.No("字典类型不存在");
         }
 
@@ -31,7 +31,7 @@ export default {
             }
         });
 
-        if (existing.data && existing.data.id) {
+        if (existing.data?.id) {
             return befly.tool.No("该类型下已存在相同的键名");
         }
 

package/apis/dict/{upd.js → update.js}

@@ -15,58 +15,49 @@ export default {
     },
     required: ["id"],
     handler: async (befly, ctx) => {
-        const id = ctx.body.id;
-        const typeCode = ctx.body.typeCode;
-        const key = ctx.body.key;
-        const label = ctx.body.label;
-        const sort = ctx.body.sort;
-        const remark = ctx.body.remark;
-
-        if (typeCode) {
+        if (ctx.body.typeCode !== undefined) {
             const dictType = await befly.mysql.getOne({
                 table: "beflyDictType",
-                where: { code: typeCode }
+                where: { code: ctx.body.typeCode }
             });
 
-            if (!dictType.data || !dictType.data.id) {
+            if (!dictType.data?.id) {
                 return befly.tool.No("字典类型不存在");
             }
         }
 
-        if (typeCode || key) {
+        if (ctx.body.typeCode !== undefined || ctx.body.key !== undefined) {
             const current = await befly.mysql.getOne({
                 table: "beflyDict",
-                where: { id: id }
+                where: { id: ctx.body.id }
             });
 
-            const checkTypeCode = typeCode || (current.data ? current.data.typeCode : undefined);
-            const checkKey = key || (current.data ? current.data.key : undefined);
-
             const existing = await befly.mysql.getOne({
                 table: "beflyDict",
                 where: {
-                    typeCode: checkTypeCode,
-                    key: checkKey,
-                    id$not: id
+                    typeCode: ctx.body.typeCode !== undefined ? ctx.body.typeCode : current.data?.typeCode,
+                    key: ctx.body.key !== undefined ? ctx.body.key : current.data?.key,
+                    id$not: ctx.body.id
                 }
             });
 
-            if (existing.data && existing.data.id) {
+            if (existing.data?.id) {
                 return befly.tool.No("该类型下已存在相同的键名");
             }
         }
 
         const updateData = {};
-        if (typeCode !== undefined) updateData["typeCode"] = typeCode;
-        if (key !== undefined) updateData["key"] = key;
-        if (label !== undefined) updateData["label"] = label;
-        if (sort !== undefined) updateData["sort"] = sort;
-        if (remark !== undefined) updateData["remark"] = remark;
+
+        if (ctx.body.typeCode !== undefined) updateData.typeCode = ctx.body.typeCode;
+        if (ctx.body.key !== undefined) updateData.key = ctx.body.key;
+        if (ctx.body.label !== undefined) updateData.label = ctx.body.label;
+        if (ctx.body.sort !== undefined) updateData.sort = ctx.body.sort;
+        if (ctx.body.remark !== undefined) updateData.remark = ctx.body.remark;
 
         await befly.mysql.updData({
             table: "beflyDict",
             data: updateData,
-            where: { id: id }
+            where: { id: ctx.body.id }
         });
 
         return befly.tool.Yes("更新成功");

package/apis/dictType/{del.js → delete.js}

@@ -3,34 +3,34 @@ export default {
     method: "POST",
     body: "none",
     auth: true,
-    fields: { id: { name: "ID", input: "integer", min: 1, max: null } },
+    fields: {
+        id: { name: "ID", input: "integer", min: 1, max: null }
+    },
     required: ["id"],
     handler: async (befly, ctx) => {
-        const id = ctx.body.id;
-
         const dictType = await befly.mysql.getOne({
             table: "beflyDictType",
-            where: { id: id }
+            where: { id: ctx.body.id }
         });
 
-        if (!dictType.data || !dictType.data.code) {
+        if (!dictType.data?.code) {
             return befly.tool.No("字典类型不存在");
         }
 
-        const dictItems = await befly.mysql.getOne({
+        const dictItem = await befly.mysql.getOne({
             table: "beflyDict",
             where: {
                 typeCode: dictType.data.code
             }
         });
 
-        if (dictItems.data && dictItems.data.id) {
+        if (dictItem.data?.id) {
             return befly.tool.No("该类型下存在字典项，无法删除");
         }
 
         await befly.mysql.delData({
             table: "beflyDictType",
-            where: { id: id }
+            where: { id: ctx.body.id }
         });
 
         return befly.tool.Yes("删除成功");

package/apis/dictType/{ins.js → insert.js}

@@ -19,7 +19,7 @@ export default {
             where: { code: ctx.body.code }
         });
 
-        if (existing.data && existing.data.id) {
+        if (existing.data?.id) {
             return befly.tool.No("类型代码已存在");
         }
 

package/apis/dictType/{upd.js → update.js}

@@ -15,16 +15,18 @@ export default {
     },
     required: ["id"],
     handler: async (befly, ctx) => {
-        const existing = await befly.mysql.getList({
-            table: "beflyDictType",
-            where: {
-                code: ctx.body.code,
-                id$not: ctx.body.id
-            }
-        });
+        if (ctx.body.code !== undefined) {
+            const existing = await befly.mysql.getOne({
+                table: "beflyDictType",
+                where: {
+                    code: ctx.body.code,
+                    id$not: ctx.body.id
+                }
+            });
 
-        if (existing.data.total > 0) {
-            return befly.tool.No("类型代码已被使用");
+            if (existing.data?.id) {
+                return befly.tool.No("类型代码已被使用");
+            }
         }
 
         await befly.mysql.updData({

package/apis/role/{del.js → delete.js}

@@ -15,12 +15,12 @@ export default {
                 fields: ["code"]
             });
 
-            if (!role.data || !role.data.code) {
+            if (!role.data?.code) {
                 return befly.tool.No("角色不存在");
             }
 
-            const systemRoles = ["dev", "user", "admin", "guest"];
-            if (systemRoles.includes(role.data.code)) {
+            const systemRoleCodes = ["dev", "user", "admin", "guest"];
+            if (systemRoleCodes.includes(role.data.code)) {
                 return befly.tool.No(`系统角色 [${role.data.code}] 不允许删除`);
             }
 

package/apis/role/{ins.js → insert.js}

@@ -15,15 +15,12 @@ export default {
     },
     required: [],
     handler: async (befly, ctx) => {
-        const apiPaths = ctx.body.apis || [];
-        const menuPaths = ctx.body.menus || [];
-
         const existing = await befly.mysql.getOne({
             table: "beflyRole",
             where: { code: ctx.body.code }
         });
 
-        if (existing.data && existing.data.id) {
+        if (existing.data?.id) {
             return befly.tool.No("角色代码已存在");
         }
 
@@ -33,13 +30,13 @@ export default {
                 name: ctx.body.name,
                 code: ctx.body.code,
                 description: ctx.body.description,
-                menus: menuPaths,
-                apis: apiPaths,
+                menus: ctx.body.menus || [],
+                apis: ctx.body.apis || [],
                 sort: ctx.body.sort
             }
         });
 
-        await befly.cache.refreshRoleApis(ctx.body.code, apiPaths);
+        await befly.cache.refreshRoleApis(ctx.body.code, ctx.body.apis || []);
 
         return befly.tool.Yes("操作成功", { id: roleId.data });
     }

package/apis/role/update.js

@@ -0,0 +1,67 @@
+import adminRoleTable from "../../tables/role.json";
+
+export default {
+    name: "更新角色",
+    method: "POST",
+    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
+    },
+    required: ["id"],
+    handler: async (befly, ctx) => {
+        const role = await befly.mysql.getOne({
+            table: "beflyRole",
+            where: { id: ctx.body.id }
+        });
+
+        if (!role.data?.id) {
+            return befly.tool.No("角色不存在");
+        }
+
+        if (ctx.body.code !== undefined) {
+            const existing = await befly.mysql.getOne({
+                table: "beflyRole",
+                where: {
+                    code: ctx.body.code,
+                    id$not: ctx.body.id
+                }
+            });
+
+            if (existing.data?.id) {
+                return befly.tool.No("角色代码已被其他角色使用");
+            }
+        }
+
+        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 || [];
+
+        await befly.mysql.updData({
+            table: "beflyRole",
+            where: { id: ctx.body.id },
+            data: {
+                name: ctx.body.name,
+                code: roleCode,
+                description: ctx.body.description,
+                menus: menuPaths,
+                apis: apiPaths,
+                sort: ctx.body.sort
+            }
+        });
+
+        if (role.data.code !== roleCode) {
+            await befly.cache.deleteRoleApis(role.data.code);
+        }
+
+        await befly.cache.refreshRoleApis(roleCode, apiPaths);
+
+        return befly.tool.Yes("操作成功");
+    }
+};

package/apis/sysConfig/{del.js → delete.js}

@@ -14,7 +14,7 @@ export default {
                 where: { id: ctx.body.id }
             });
 
-            if (!config.data || !config.data.id) {
+            if (!config.data?.id) {
                 return befly.tool.No("配置不存在");
             }
 

package/apis/sysConfig/{ins.js → insert.js}

@@ -23,7 +23,7 @@ export default {
                 where: { code: ctx.body.code }
             });
 
-            if (existing.data && existing.data.id) {
+            if (existing.data?.id) {
                 return befly.tool.No("配置代码已存在");
             }
 

package/apis/sysConfig/{upd.js → update.js}

@@ -24,7 +24,7 @@ export default {
                 where: { id: ctx.body.id }
             });
 
-            if (!config.data || !config.data.id) {
+            if (!config.data?.id) {
                 return befly.tool.No("配置不存在");
             }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.23.7",
-    "gitHead": "169c7fddf0cd2d21c6910454e0f116d6cdcbdbc5",
+    "version": "3.24.0",
+    "gitHead": "976e70ee1f6f959e9def8189bd43ad4c0d454b7f",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/apis/admin/upd.js

@@ -1,95 +0,0 @@
-import adminTable from "../../tables/admin.json";
-
-export default {
-    name: "更新管理员",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null },
-        username: adminTable.username,
-        nickname: adminTable.nickname,
-        roleCode: adminTable.roleCode,
-        avatar: adminTable.avatar,
-        email: adminTable.email,
-        lastLoginIp: adminTable.lastLoginIp,
-        lastLoginTime: adminTable.lastLoginTime,
-        password: adminTable.password,
-        phone: adminTable.phone,
-        roleType: adminTable.roleType
-    },
-    required: ["id"],
-    handler: async (befly, ctx) => {
-        const id = ctx.body.id;
-        const username = ctx.body.username;
-        const nickname = ctx.body.nickname;
-        const roleCode = ctx.body.roleCode;
-
-        // 检查管理员是否存在
-        const admin = await befly.mysql.getOne({
-            table: "beflyAdmin",
-            where: { id: id }
-        });
-
-        if (!admin.data?.id) {
-            return befly.tool.No("管理员不存在");
-        }
-
-        // 检查用户名是否已被其他管理员使用
-        if (username && username !== admin.data.username) {
-            const existingUsername = await befly.mysql.getOne({
-                table: "beflyAdmin",
-                where: { username: username, id: { $not: id } }
-            });
-            if (existingUsername.data?.id) {
-                return befly.tool.No("用户名已被使用");
-            }
-        }
-
-        // 检查昵称是否已被其他管理员使用
-        if (nickname && nickname !== admin.data.nickname) {
-            const existingNickname = await befly.mysql.getOne({
-                table: "beflyAdmin",
-                where: { nickname: nickname, id: { $not: id } }
-            });
-            if (existingNickname.data?.id) {
-                return befly.tool.No("昵称已被使用");
-            }
-        }
-
-        // 检查角色是否存在
-        if (roleCode && roleCode !== admin.data.roleCode) {
-            const role = await befly.mysql.getOne({
-                table: "beflyRole",
-                where: { code: roleCode }
-            });
-            if (!role.data?.id) {
-                return befly.tool.No("角色不存在");
-            }
-        }
-
-        // 构建更新数据
-        const dataToUpdate = {};
-
-        if (ctx.body.avatar !== undefined) dataToUpdate["avatar"] = ctx.body.avatar;
-        if (ctx.body.email !== undefined) dataToUpdate["email"] = ctx.body.email;
-        if (ctx.body.lastLoginIp !== undefined) dataToUpdate["lastLoginIp"] = ctx.body.lastLoginIp;
-        if (ctx.body.lastLoginTime !== undefined) dataToUpdate["lastLoginTime"] = ctx.body.lastLoginTime;
-        if (ctx.body.password !== undefined) dataToUpdate["password"] = ctx.body.password;
-        if (ctx.body.phone !== undefined) dataToUpdate["phone"] = ctx.body.phone;
-        if (ctx.body.roleType !== undefined) dataToUpdate["roleType"] = ctx.body.roleType;
-
-        if (username !== undefined) dataToUpdate["username"] = username;
-        if (nickname !== undefined) dataToUpdate["nickname"] = nickname;
-        if (roleCode !== undefined) dataToUpdate["roleCode"] = roleCode;
-
-        // 更新管理员信息
-        await befly.mysql.updData({
-            table: "beflyAdmin",
-            data: dataToUpdate,
-            where: { id: id }
-        });
-
-        return befly.tool.Yes("更新成功");
-    }
-};

package/apis/role/upd.js

@@ -1,50 +0,0 @@
-import adminRoleTable from "../../tables/role.json";
-
-export default {
-    name: "更新角色",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        name: adminRoleTable.name,
-        code: adminRoleTable.code,
-        description: adminRoleTable.description,
-        menus: adminRoleTable.menus,
-        apis: adminRoleTable.apis,
-        sort: adminRoleTable.sort
-    },
-    required: [],
-    handler: async (befly, ctx) => {
-        const apiPaths = ctx.body.apis || [];
-        const menuPaths = ctx.body.menus || [];
-
-        const existing = await befly.mysql.getList({
-            table: "beflyRole",
-            where: {
-                code: ctx.body.code,
-                id$not: ctx.body.id
-            }
-        });
-
-        if (existing.data.total > 0) {
-            return befly.tool.No("角色代码已被其他角色使用");
-        }
-
-        await befly.mysql.updData({
-            table: "beflyRole",
-            where: { id: ctx.body.id },
-            data: {
-                name: ctx.body.name,
-                code: ctx.body.code,
-                description: ctx.body.description,
-                menus: menuPaths,
-                apis: apiPaths,
-                sort: ctx.body.sort
-            }
-        });
-
-        await befly.cache.refreshRoleApis(ctx.body.code, apiPaths);
-
-        return befly.tool.Yes("操作成功");
-    }
-};