befly 3.76.0 → 3.76.1

package/apis/admin/insert.js

@@ -51,7 +51,8 @@ export default {
                 username: ctx.body.username,
                 password: hashedPassword,
                 nickname: ctx.body.nickname,
-                roleCode: ctx.body.roleCode
+                roleCode: ctx.body.roleCode,
+                roleType: "admin"
             }
         });
 

package/apis/admin/update.js

@@ -16,8 +16,7 @@ export default {
         lastLoginIp: adminTable.lastLoginIp,
         lastLoginTime: adminTable.lastLoginTime,
         password: adminTable.password,
-        phone: adminTable.phone,
-        roleType: adminTable.roleType
+        phone: adminTable.phone
     },
     required: ["id"],
     handler: async (befly, ctx) => {
@@ -79,7 +78,7 @@ export default {
             updateData.password = await hashPassword(ctx.body.password);
         }
         if (ctx.body.phone !== undefined) updateData.phone = ctx.body.phone;
-        if (ctx.body.roleType !== undefined) updateData.roleType = ctx.body.roleType;
+        // 管理员表类型固定为 admin，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;

package/hooks/permission.js

@@ -6,9 +6,11 @@ import { ErrorResponse } from "../utils/response.js";
 /**
  * 权限检查钩子
  * - 接口无需权限（auth=false）：直接通过
- * - auth 为 ctx.roleType 白名单（string[]）：登录后按 ctx.roleType 放行
+ * - auth 为角色类型白名单（string[]，如 ["admin"] / ["user"]）：按 ctx.roleType 校验。
+ *   类型与角色解耦：管理员表（beflyAdmin）roleType 固定 "admin"，用户表固定 "user"，
+ *   任意角色 code 的管理员共享 "admin" 类型门槛，细粒度授权由下方集合检查（roleCode）负责
  * - 用户未登录：返回 401
- * - 开发者角色（dev）：最高权限，直接通过
+ * - 开发者角色（dev）：最高权限，直接通过（唯一内置角色，不可创建）
  * - 其他角色：检查 Redis 中的角色权限集合
  */
 export default {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.76.0",
+    "version": "3.76.1",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/sync/syncUtil.js

@@ -1,23 +1,17 @@
 // 接口 auth 的存储协议（serializeAuth 与 authAllowsRole 配套使用）：
-// - true -> "是"
-// - false -> "否"
-// - string[] -> "a,b,c"
-export const AUTH_YES = "是";
-export const AUTH_NO = "否";
-
-/**
- * 序列化 api.auth 为存储字符串
- */
+// - true -> 1（需登录）
+// - false -> 0（免登录）
+// - string[] -> "a,b,c"（角色类型白名单，如 admin/user）
 export function serializeAuth(auth) {
-    return auth === false ? AUTH_NO : Array.isArray(auth) ? auth.join(",") : AUTH_YES;
+    return auth === false ? 0 : Array.isArray(auth) ? auth.join(",") : 1;
 }
 
 /**
- * 判断 auth 存储串是否授权给指定角色
+ * 判断 auth 存储值是否授权给指定角色
  */
 export function authAllowsRole(auth, roleCode) {
-    if (auth === AUTH_NO) return true;
-    if (typeof auth === "string" && auth !== AUTH_YES) {
+    if (Number(auth) === 0) return true;
+    if (typeof auth === "string" && Number(auth) !== 1) {
         return auth.split(",").some((code) => code.trim() === roleCode);
     }
     return false;

package/tables/api.json

@@ -1,4 +1,4 @@
-{
+{
     "id": {
         "name": "ID",
         "input": "integer",
@@ -12,7 +12,7 @@
         "max": 100
     },
     "auth": {
-        "name": "是否需要登录",
+        "name": "登录与权限（0=免登录，1=需登录，其他=角色类型白名单）",
         "input": "string",
         "min": 1,
         "max": 200

package/apis/role/delete.js

@@ -1,41 +0,0 @@
-import { getRoleById, systemRoleCodes } from "./_role.js";
-
-export default {
-    name: "删除角色",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null }
-    },
-    required: ["id"],
-    handler: async (befly, ctx) => {
-        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/insert.js

@@ -1,45 +0,0 @@
-import roleTable from "#befly/tables/role.json";
-
-export default {
-    name: "创建角色",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        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 }
-        });
-
-        if (existing.data?.id) {
-            return befly.tool.No("角色代码已存在");
-        }
-
-        const roleId = await befly.mysql.insData({
-            table: "beflyRole",
-            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("操作成功", { id: roleId.data });
-    }
-};

package/apis/role/save.js

@@ -1,36 +0,0 @@
-import adminTable from "#befly/tables/admin.json";
-import roleTable from "#befly/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: ["adminId", "roleCode"],
-    handler: async (befly, ctx) => {
-        const role = await getRoleByCode(befly, ctx.body.roleCode);
-
-        if (!role.data?.id) {
-            return befly.tool.No("角色不存在");
-        }
-
-        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
-            }
-        });
-
-        return befly.tool.Yes("操作成功");
-    }
-};

package/apis/role/update.js

@@ -1,66 +0,0 @@
-import roleTable from "#befly/tables/role.json";
-
-import { getRoleById } from "./_role.js";
-
-export default {
-    name: "更新角色",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        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 getRoleById(befly, 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 ? 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",
-            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("操作成功");
-    }
-};