@befly-addon/admin 1.1.30 → 1.1.31

package/apis/role/apiSave.ts

@@ -1,7 +1,7 @@
-import adminRoleTable from '../../tables/role.json';
+import adminRoleTable from "../../tables/role.json";
 
 export default {
-    name: '保存角色接口权限',
+    name: "保存角色接口权限",
     fields: {
         roleCode: adminRoleTable.code,
         apiIds: adminRoleTable.apis
@@ -9,29 +9,26 @@ export default {
     handler: async (befly, ctx) => {
         // 查询角色是否存在
         const role = await befly.db.getOne({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { code: ctx.body.roleCode }
         });
 
         if (!role?.id) {
-            return befly.tool.No('角色不存在');
+            return befly.tool.No("角色不存在");
         }
 
-        // 将数组转为逗号分隔的字符串存储
-        const apiIdsStr = Array.isArray(ctx.body.apiIds) ? ctx.body.apiIds.join(',') : '';
-
-        // 更新角色的接口权限
+        // 直接使用数组，数据库会自动处理存储
         await befly.db.updData({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { code: ctx.body.roleCode },
             data: {
-                apis: apiIdsStr
+                apis: ctx.body.apiIds
             }
         });
 
-        // 增量更新 Redis 缓存
-        await befly.cache.cacheRolePermissions(befly, role.code, apiIdsStr);
+        // 增量刷新 Redis 权限缓存
+        await befly.cache.refreshRoleApiPermissions(role.code, ctx.body.apiIds || []);
 
-        return befly.tool.Yes('操作成功');
+        return befly.tool.Yes("操作成功");
     }
 };

package/apis/role/apis.ts

@@ -1,29 +1,24 @@
-import adminRoleTable from '../../tables/role.json';
+import adminRoleTable from "../../tables/role.json";
 
 export default {
-    name: '获取角色接口权限',
+    name: "获取角色接口权限",
     fields: {
         roleCode: adminRoleTable.code
     },
     handler: async (befly, ctx) => {
         // 查询角色信息
         const role = await befly.db.getOne({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { code: ctx.body.roleCode }
         });
 
         if (!role?.id) {
-            return befly.tool.No('角色不存在');
+            return befly.tool.No("角色不存在");
         }
 
-        // 解析接口ID列表（逗号分隔的字符串转为数组）
-        const apiIds = role.apis
-            ? role.apis
-                  .split(',')
-                  .map((id: string) => parseInt(id.trim()))
-                  .filter((id: number) => !isNaN(id))
-            : [];
+        // 数据库自动将 array_number_string 转换为数组
+        const apiIds = role.apis || [];
 
-        return befly.tool.Yes('操作成功', { apiIds });
+        return befly.tool.Yes("操作成功", { apiIds });
     }
 };

package/apis/role/del.ts

@@ -1,49 +1,49 @@
-export default {
-    name: '删除角色',
+export default {
+    name: "删除角色",
     fields: {
-        id: '@id'
+        id: "@id"
     },
     handler: async (befly, ctx) => {
         try {
             // 检查是否有用户使用此角色（使用 getList 代替 getAll）
             const role = await befly.db.getOne({
-                table: 'addon_admin_role',
+                table: "addon_admin_role",
                 where: { id: ctx.body.id },
-                fields: ['code']
+                fields: ["code"]
             });
 
             if (!role?.code) {
-                return befly.tool.No('角色不存在');
+                return befly.tool.No("角色不存在");
             }
 
             // 禁止删除系统角色
-            const systemRoles = ['dev', 'user', 'admin', 'guest'];
+            const systemRoles = ["dev", "user", "admin", "guest"];
             if (systemRoles.includes(role.code)) {
                 return befly.tool.No(`系统角色 [${role.code}] 不允许删除`);
             }
 
             const adminList = await befly.db.getList({
-                table: 'addon_admin_admin',
+                table: "addon_admin_admin",
                 where: { roleCode: role.code }
             });
 
             if (adminList.total > 0) {
-                return befly.tool.No('该角色已分配给用户，无法删除');
+                return befly.tool.No("该角色已分配给用户，无法删除");
             }
 
             // 删除角色
             await befly.db.delData({
-                table: 'addon_admin_role',
+                table: "addon_admin_role",
                 where: { id: ctx.body.id }
             });
 
             // 删除角色权限缓存
-            await befly.cache.deleteRolePermissions(befly, role.code);
+            await befly.cache.deleteRolePermissions(role.code);
 
-            return befly.tool.Yes('操作成功');
+            return befly.tool.Yes("操作成功");
         } catch (error: any) {
-            befly.logger.error({ err: error }, '删除角色失败');
-            return befly.tool.No('操作失败');
+            befly.logger.error({ err: error }, "删除角色失败");
+            return befly.tool.No("操作失败");
         }
     }
 };

package/apis/role/detail.ts

@@ -1,18 +1,18 @@
-export default {
-    name: '获取用户角色',
+export default {
+    name: "获取用户角色",
     fields: {
-        id: '@id'
+        id: "@id"
     },
     handler: async (befly, ctx) => {
         let roleInfo = null;
-        if (ctx.body.id && ctx.user.roleType === 'admin') {
+        if (ctx.body.id && ctx.user.roleType === "admin") {
             roleInfo = await befly.db.getOne({
-                table: 'addon_admin_role',
+                table: "addon_admin_role",
                 where: { code: ctx.body.id }
             });
         }
 
-        return befly.tool.Yes('操作成功', {
+        return befly.tool.Yes("操作成功", {
             roleCode: ctx.body.id,
             role: roleInfo
         });

package/apis/role/ins.ts

@@ -1,35 +1,35 @@
-import adminRoleTable from '../../tables/role.json';
+import adminRoleTable from "../../tables/role.json";
 
 export default {
-    name: '创建角色',
+    name: "创建角色",
     fields: adminRoleTable,
     handler: async (befly, ctx) => {
         // 检查角色代码是否已存在
         const existing = await befly.db.getOne({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { code: ctx.body.code }
         });
 
         if (existing) {
-            return befly.tool.No('角色代码已存在');
+            return befly.tool.No("角色代码已存在");
         }
 
         const roleId = await befly.db.insData({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             data: {
                 name: ctx.body.name,
                 code: ctx.body.code,
                 description: ctx.body.description,
-                menus: ctx.body.menus || '',
-                apis: ctx.body.apis || '',
+                menus: ctx.body.menus || [],
+                apis: ctx.body.apis || [],
                 sort: ctx.body.sort
                 // state 由框架自动设置为 1
             }
         });
 
-        // 增量缓存角色权限到 Redis Set
-        await befly.cache.cacheRolePermissions(befly, ctx.body.code, ctx.body.apis || '');
+        // 增量刷新角色权限缓存
+        await befly.cache.refreshRoleApiPermissions(ctx.body.code, ctx.body.apis || []);
 
-        return befly.tool.Yes('操作成功', { id: roleId });
+        return befly.tool.Yes("操作成功", { id: roleId });
     }
 };

package/apis/role/list.ts

@@ -1,23 +1,23 @@
-export default {
-    name: '获取角色列表',
+export default {
+    name: "获取角色列表",
     fields: {
-        page: '@page',
-        limit: '@limit',
-        keyword: '@keyword',
-        state: '@state'
+        page: "@page",
+        limit: "@limit",
+        keyword: "@keyword",
+        state: "@state"
     },
-    handler: async (befly, ctx) => {
+    handler: async (befly) => {
         const roles = await befly.db.getList({
             limit: 30,
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: {
                 code: {
-                    $ne: 'dev'
+                    $ne: "dev"
                 }
             },
-            orderBy: ['sort#ASC', 'id#ASC']
+            orderBy: ["sort#ASC", "id#ASC"]
         });
 
-        return befly.tool.Yes('操作成功', roles);
+        return befly.tool.Yes("操作成功", roles);
     }
 };

package/apis/role/menuSave.ts

@@ -1,7 +1,7 @@
-import adminRoleTable from '../../tables/role.json';
+import adminRoleTable from "../../tables/role.json";
 
 export default {
-    name: '保存角色菜单权限',
+    name: "保存角色菜单权限",
     fields: {
         roleCode: adminRoleTable.code,
         menuIds: adminRoleTable.menus
@@ -9,26 +9,23 @@ export default {
     handler: async (befly, ctx) => {
         // 查询角色是否存在
         const role = await befly.db.getOne({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { code: ctx.body.roleCode }
         });
 
         if (!role?.id) {
-            return befly.tool.No('角色不存在');
+            return befly.tool.No("角色不存在");
         }
 
-        // 将数组转为逗号分隔的字符串存储
-        const menuIdsStr = Array.isArray(ctx.body.menuIds) ? ctx.body.menuIds.join(',') : '';
-
-        // 更新角色的菜单权限
+        // 直接使用数组，数据库会自动处理存储
         await befly.db.updData({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { code: ctx.body.roleCode },
             data: {
-                menus: menuIdsStr
+                menus: ctx.body.menuIds
             }
         });
 
-        return befly.tool.Yes('操作成功');
+        return befly.tool.Yes("操作成功");
     }
 };

package/apis/role/menus.ts

@@ -1,29 +1,24 @@
-import adminRoleTable from '../../tables/role.json';
+import adminRoleTable from "../../tables/role.json";
 
 export default {
-    name: '获取角色菜单权限',
+    name: "获取角色菜单权限",
     fields: {
         roleCode: adminRoleTable.code
     },
     handler: async (befly, ctx) => {
         // 查询角色信息
         const role = await befly.db.getOne({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { code: ctx.body.roleCode }
         });
 
         if (!role?.id) {
-            return befly.tool.No('角色不存在');
+            return befly.tool.No("角色不存在");
         }
 
-        // 解析菜单ID列表（逗号分隔的字符串转为数组）
-        const menuIds = role.menus
-            ? role.menus
-                  .split(',')
-                  .map((id: string) => parseInt(id.trim()))
-                  .filter((id: number) => !isNaN(id))
-            : [];
+        // 数据库自动将 array_number_string 转换为数组
+        const menuIds = role.menus || [];
 
-        return befly.tool.Yes('操作成功', menuIds);
+        return befly.tool.Yes("操作成功", menuIds);
     }
 };

package/apis/role/save.ts

@@ -1,32 +1,32 @@
-export default {
-    name: '角色保存',
+export default {
+    name: "角色保存",
     fields: {
         roleCode: {
-            name: '角色编码',
-            type: 'string',
+            name: "角色编码",
+            type: "string",
             min: 2,
             max: 50,
-            regexp: '^[a-zA-Z0-9_]+$'
+            regexp: "^[a-zA-Z0-9_]+$"
         }
     },
     handler: async (befly, ctx) => {
         try {
             // 查询角色是否存在（使用 roleCode 而非 roleId）
             const role = await befly.db.getOne({
-                table: 'addon_admin_role',
+                table: "addon_admin_role",
                 where: { code: ctx.body.roleCode }
             });
 
             if (!role?.id) {
-                return befly.tool.No('角色不存在');
+                return befly.tool.No("角色不存在");
             }
 
             // 根据角色编码判断角色类型（硬编码规则）
-            const roleType = role.code === 'dev' || role.code === 'admin' ? 'admin' : 'user';
+            const roleType = role.code === "dev" || role.code === "admin" ? "admin" : "user";
 
             // 更新管理员的角色编码和角色类型
             await befly.db.updData({
-                table: 'addon_admin_admin',
+                table: "addon_admin_admin",
                 where: { id: ctx.body.adminId },
                 data: {
                     roleCode: role.code,
@@ -34,10 +34,10 @@
                 }
             });
 
-            return befly.tool.Yes('操作成功');
+            return befly.tool.Yes("操作成功");
         } catch (error: any) {
-            befly.logger.error({ err: error }, '保存用户角色失败');
-            return befly.tool.No('操作失败');
+            befly.logger.error({ err: error }, "保存用户角色失败");
+            return befly.tool.No("操作失败");
         }
     }
 };

package/apis/role/upd.ts

@@ -1,12 +1,12 @@
-import adminRoleTable from '../../tables/role.json';
+import adminRoleTable from "../../tables/role.json";
 
 export default {
-    name: '更新角色',
+    name: "更新角色",
     fields: adminRoleTable,
     handler: async (befly, ctx) => {
         // 检查角色代码是否被其他角色占用
         const existing = await befly.db.getList({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: {
                 code: ctx.body.code,
                 id$ne: ctx.body.id
@@ -14,26 +14,26 @@ export default {
         });
 
         if (existing.total > 0) {
-            return befly.tool.No('角色代码已被其他角色使用');
+            return befly.tool.No("角色代码已被其他角色使用");
         }
 
         await befly.db.updData({
-            table: 'addon_admin_role',
+            table: "addon_admin_role",
             where: { id: ctx.body.id },
             data: {
                 name: ctx.body.name,
                 code: ctx.body.code,
                 description: ctx.body.description,
-                menus: ctx.body.menus || '',
-                apis: ctx.body.apis || '',
+                menus: ctx.body.menus || [],
+                apis: ctx.body.apis || [],
                 sort: ctx.body.sort
                 // state 字段不在此处更新，需要禁用/启用时单独处理
             }
         });
 
-        // 增量更新角色权限缓存（先删除再重建）
-        await befly.cache.cacheRolePermissions(befly, ctx.body.code, ctx.body.apis || '');
+        // 增量刷新角色权限缓存
+        await befly.cache.refreshRoleApiPermissions(ctx.body.code, ctx.body.apis || []);
 
-        return befly.tool.Yes('操作成功');
+        return befly.tool.Yes("操作成功");
     }
 };

package/apis/sysConfig/all.ts

@@ -1,11 +1,11 @@
 export default {
-    name: '获取所有系统配置',
-    handler: async (befly, ctx) => {
+    name: "获取所有系统配置",
+    handler: async (befly) => {
         const result = await befly.db.getAll({
-            table: 'addon_admin_sys_config',
-            orderBy: ['id#ASC']
+            table: "addon_admin_sys_config",
+            orderBy: ["id#ASC"]
         });
 
-        return befly.tool.Yes('操作成功', { lists: result.lists });
+        return befly.tool.Yes("操作成功", { lists: result.lists });
     }
 };

package/apis/sysConfig/del.ts

@@ -1,33 +1,33 @@
 export default {
-    name: '删除系统配置',
+    name: "删除系统配置",
     fields: {
-        id: '@id'
+        id: "@id"
     },
     handler: async (befly, ctx) => {
         try {
             // 检查是否为系统配置
             const config = await befly.db.getDetail({
-                table: 'addon_admin_sys_config',
+                table: "addon_admin_sys_config",
                 where: { id: ctx.body.id }
             });
 
             if (!config?.id) {
-                return befly.tool.No('配置不存在');
+                return befly.tool.No("配置不存在");
             }
 
             if (config.isSystem === 1) {
-                return befly.tool.No('系统配置不允许删除');
+                return befly.tool.No("系统配置不允许删除");
             }
 
             await befly.db.delData({
-                table: 'addon_admin_sys_config',
+                table: "addon_admin_sys_config",
                 where: { id: ctx.body.id }
             });
 
-            return befly.tool.Yes('操作成功');
+            return befly.tool.Yes("操作成功");
         } catch (error) {
-            befly.logger.error({ err: error }, '删除系统配置失败');
-            return befly.tool.No('操作失败');
+            befly.logger.error({ err: error }, "删除系统配置失败");
+            return befly.tool.No("操作失败");
         }
     }
 };

package/apis/sysConfig/get.ts

@@ -1,26 +1,26 @@
 export default {
-    name: '根据代码获取配置值',
+    name: "根据代码获取配置值",
     auth: false,
     fields: {
-        code: { name: '配置代码', type: 'string', min: 1, max: 50 }
+        code: { name: "配置代码", type: "string", min: 1, max: 50 }
     },
     handler: async (befly, ctx) => {
         const config = await befly.db.getDetail({
-            table: 'addon_admin_sys_config',
+            table: "addon_admin_sys_config",
             where: { code: ctx.body.code }
         });
 
         if (!config?.id) {
-            return befly.tool.No('配置不存在');
+            return befly.tool.No("配置不存在");
         }
 
         // 根据类型转换值
         let value = config.value;
-        if (config.valueType === 'number') {
+        if (config.valueType === "number") {
             value = Number(config.value);
-        } else if (config.valueType === 'boolean') {
-            value = config.value === 'true' || config.value === '1';
-        } else if (config.valueType === 'json') {
+        } else if (config.valueType === "boolean") {
+            value = config.value === "true" || config.value === "1";
+        } else if (config.valueType === "json") {
             try {
                 value = JSON.parse(config.value);
             } catch {
@@ -28,6 +28,6 @@ export default {
             }
         }
 
-        return befly.tool.Yes('操作成功', { code: config.code, value: value });
+        return befly.tool.Yes("操作成功", { code: config.code, value: value });
     }
 };

package/apis/sysConfig/ins.ts

@@ -1,38 +1,38 @@
-import sysConfigTable from '../../tables/sysConfig.json';
+import sysConfigTable from "../../tables/sysConfig.json";
 
 export default {
-    name: '添加系统配置',
+    name: "添加系统配置",
     fields: sysConfigTable,
     handler: async (befly, ctx) => {
         try {
             // 检查 code 是否已存在
             const existing = await befly.db.getDetail({
-                table: 'addon_admin_sys_config',
+                table: "addon_admin_sys_config",
                 where: { code: ctx.body.code }
             });
 
             if (existing) {
-                return befly.tool.No('配置代码已存在');
+                return befly.tool.No("配置代码已存在");
             }
 
             const configId = await befly.db.insData({
-                table: 'addon_admin_sys_config',
+                table: "addon_admin_sys_config",
                 data: {
                     name: ctx.body.name,
                     code: ctx.body.code,
                     value: ctx.body.value,
-                    valueType: ctx.body.valueType || 'string',
-                    group: ctx.body.group || '',
+                    valueType: ctx.body.valueType || "string",
+                    group: ctx.body.group || "",
                     sort: ctx.body.sort || 0,
                     isSystem: ctx.body.isSystem || 0,
-                    description: ctx.body.description || ''
+                    description: ctx.body.description || ""
                 }
             });
 
-            return befly.tool.Yes('操作成功', { id: configId });
+            return befly.tool.Yes("操作成功", { id: configId });
         } catch (error) {
-            befly.logger.error({ err: error }, '添加系统配置失败');
-            return befly.tool.No('操作失败');
+            befly.logger.error({ err: error }, "添加系统配置失败");
+            return befly.tool.No("操作失败");
         }
     }
 };

package/apis/sysConfig/list.ts

@@ -1,20 +1,20 @@
 export default {
-    name: '获取系统配置列表',
+    name: "获取系统配置列表",
     fields: {
-        page: '@page',
-        limit: '@limit',
-        keyword: '@keyword',
-        state: '@state'
+        page: "@page",
+        limit: "@limit",
+        keyword: "@keyword",
+        state: "@state"
     },
     handler: async (befly, ctx) => {
         const result = await befly.db.getList({
-            table: 'addon_admin_sys_config',
-            fields: ['id', 'name', 'code', 'value', 'valueType', 'group', 'sort', 'isSystem', 'description', 'state', 'createdAt', 'updatedAt'],
+            table: "addon_admin_sys_config",
+            fields: ["id", "name", "code", "value", "valueType", "group", "sort", "isSystem", "description", "state", "createdAt", "updatedAt"],
             page: ctx.body.page,
             limit: ctx.body.limit,
-            orderBy: ['group#ASC', 'sort#ASC', 'id#ASC']
+            orderBy: ["group#ASC", "sort#ASC", "id#ASC"]
         });
 
-        return befly.tool.Yes('操作成功', result);
+        return befly.tool.Yes("操作成功", result);
     }
 };