@befly-addon/admin 1.1.30 → 1.1.31

package/apis/dict/upd.ts

@@ -1,31 +1,31 @@
-import adminDictTable from '../../tables/dict.json';
+import adminDictTable from "../../tables/dict.json";
 
 export default {
-    name: '更新字典',
+    name: "更新字典",
     fields: {
         ...adminDictTable,
-        '@id': true
+        "@id": true
     },
-    required: ['id'],
+    required: ["id"],
     handler: async (befly, ctx) => {
         const { id, typeCode, key, label, sort, remark } = ctx.body;
 
         // 如果更新了 typeCode，验证其是否存在
         if (typeCode) {
             const dictType = await befly.db.getOne({
-                table: 'addon_admin_dict_type',
+                table: "addon_admin_dict_type",
                 where: { code: typeCode }
             });
 
             if (!dictType?.id) {
-                return befly.tool.No('字典类型不存在');
+                return befly.tool.No("字典类型不存在");
             }
         }
 
         // 如果更新了 typeCode 或 key，检查唯一性
         if (typeCode || key) {
             const current = await befly.db.getOne({
-                table: 'addon_admin_dict',
+                table: "addon_admin_dict",
                 where: { id: id }
             });
 
@@ -33,7 +33,7 @@ export default {
             const checkKey = key || current?.key;
 
             const existing = await befly.db.getOne({
-                table: 'addon_admin_dict',
+                table: "addon_admin_dict",
                 where: {
                     typeCode: checkTypeCode,
                     key: checkKey,
@@ -42,7 +42,7 @@ export default {
             });
 
             if (existing?.id) {
-                return befly.tool.No('该类型下已存在相同的键名');
+                return befly.tool.No("该类型下已存在相同的键名");
             }
         }
 
@@ -54,11 +54,11 @@ export default {
         if (remark !== undefined) updateData.remark = remark;
 
         await befly.db.updData({
-            table: 'addon_admin_dict',
+            table: "addon_admin_dict",
             data: updateData,
             where: { id: id }
         });
 
-        return befly.tool.Yes('更新成功');
+        return befly.tool.Yes("更新成功");
     }
 };

package/apis/dictType/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_dict_type',
-            orderBy: ['sort#ASC', 'id#ASC']
+            table: "addon_admin_dict_type",
+            orderBy: ["sort#ASC", "id#ASC"]
         });
 
-        return befly.tool.Yes('操作成功', { lists: result.lists });
+        return befly.tool.Yes("操作成功", { lists: result.lists });
     }
 };

package/apis/dictType/del.ts

@@ -1,17 +1,17 @@
 export default {
-    name: '删除字典类型',
-    fields: { '@id': true },
-    required: ['id'],
+    name: "删除字典类型",
+    fields: { "@id": true },
+    required: ["id"],
     handler: async (befly, ctx) => {
         const { id } = ctx.body;
 
         // 检查是否有字典项引用此类型
         const dictItems = await befly.db.getOne({
-            table: 'addon_admin_dict',
+            table: "addon_admin_dict",
             where: {
                 typeCode: (
                     await befly.db.getOne({
-                        table: 'addon_admin_dict_type',
+                        table: "addon_admin_dict_type",
                         where: { id: id }
                     })
                 )?.code
@@ -19,14 +19,14 @@ export default {
         });
 
         if (dictItems?.id) {
-            return befly.tool.No('该类型下存在字典项，无法删除');
+            return befly.tool.No("该类型下存在字典项，无法删除");
         }
 
         await befly.db.delData({
-            table: 'addon_admin_dict_type',
+            table: "addon_admin_dict_type",
             where: { id: id }
         });
 
-        return befly.tool.Yes('删除成功');
+        return befly.tool.Yes("删除成功");
     }
 };

package/apis/dictType/detail.ts

@@ -1,17 +1,17 @@
 export default {
-    name: '字典类型详情',
-    fields: { '@id': true },
-    required: ['id'],
+    name: "字典类型详情",
+    fields: { "@id": true },
+    required: ["id"],
     handler: async (befly, ctx) => {
         const detail = await befly.db.getDetail({
-            table: 'addon_admin_dict_type',
+            table: "addon_admin_dict_type",
             where: { id: ctx.body.id }
         });
 
         if (!detail?.id) {
-            return befly.tool.No('字典类型不存在');
+            return befly.tool.No("字典类型不存在");
         }
 
-        return befly.tool.Yes('获取成功', detail);
+        return befly.tool.Yes("获取成功", detail);
     }
 };

package/apis/dictType/ins.ts

@@ -1,22 +1,22 @@
-import dictTypeTable from '../../tables/dictType.json';
+import dictTypeTable from "../../tables/dictType.json";
 
 export default {
-    name: '添加字典类型',
+    name: "添加字典类型",
     fields: dictTypeTable,
-    required: ['code', 'name'],
+    required: ["code", "name"],
     handler: async (befly, ctx) => {
         // 检查代码是否已存在
         const existing = await befly.db.getOne({
-            table: 'addon_admin_dict_type',
+            table: "addon_admin_dict_type",
             where: { code: ctx.body.code }
         });
 
         if (existing?.id) {
-            return befly.tool.No('类型代码已存在');
+            return befly.tool.No("类型代码已存在");
         }
 
         const typeId = await befly.db.insData({
-            table: 'addon_admin_dict_type',
+            table: "addon_admin_dict_type",
             data: {
                 code: ctx.body.code,
                 name: ctx.body.name,
@@ -25,6 +25,6 @@ export default {
             }
         });
 
-        return befly.tool.Yes('添加成功', { id: typeId });
+        return befly.tool.Yes("添加成功", { id: typeId });
     }
 };

package/apis/dictType/list.ts

@@ -1,24 +1,22 @@
-import dictTypeTable from '../../tables/dictType.json';
-
 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_dict_type',
+            table: "addon_admin_dict_type",
             where: {
                 name$like: ctx.body.keyword ? `%${ctx.body.keyword}%` : undefined
             },
-            orderBy: ['sort#ASC', 'id#ASC'],
+            orderBy: ["sort#ASC", "id#ASC"],
             page: ctx.body.page,
             limit: ctx.body.limit
         });
 
-        return befly.tool.Yes('操作成功', result);
+        return befly.tool.Yes("操作成功", result);
     }
 };

package/apis/dictType/upd.ts

@@ -1,19 +1,19 @@
-import dictTypeTable from '../../tables/dictType.json';
+import dictTypeTable from "../../tables/dictType.json";
 
 export default {
-    name: '更新字典类型',
+    name: "更新字典类型",
     fields: {
         ...dictTypeTable,
-        '@id': true
+        "@id": true
     },
-    required: ['id'],
+    required: ["id"],
     handler: async (befly, ctx) => {
         const { id, code, name, description, sort } = ctx.body;
 
         // 如果更新了 code，需要检查是否已被使用
         if (code) {
             const existing = await befly.db.getOne({
-                table: 'addon_admin_dict_type',
+                table: "addon_admin_dict_type",
                 where: {
                     code: code,
                     id$ne: id
@@ -21,7 +21,7 @@ export default {
             });
 
             if (existing?.id) {
-                return befly.tool.No('类型代码已被使用');
+                return befly.tool.No("类型代码已被使用");
             }
         }
 
@@ -32,11 +32,11 @@ export default {
         if (sort !== undefined) updateData.sort = sort;
 
         await befly.db.updData({
-            table: 'addon_admin_dict_type',
+            table: "addon_admin_dict_type",
             data: updateData,
             where: { id: id }
         });
 
-        return befly.tool.Yes('更新成功');
+        return befly.tool.Yes("更新成功");
     }
 };

package/apis/email/config.ts

@@ -1,13 +1,13 @@
 export default {
-    name: '获取邮件配置',
-    handler: async (befly, ctx) => {
+    name: "获取邮件配置",
+    handler: async (befly) => {
         if (!(befly as any).addon_admin_email) {
-            return befly.tool.No('邮件插件未加载，请检查配置');
+            return befly.tool.No("邮件插件未加载，请检查配置");
         }
 
         const config = (befly as any).addon_admin_email.getConfig();
 
-        return befly.tool.Yes('获取成功', {
+        return befly.tool.Yes("获取成功", {
             host: config.host,
             port: config.port,
             secure: config.secure,

package/apis/email/logList.ts

@@ -1,19 +1,19 @@
 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_email_log',
+            table: "addon_admin_email_log",
             page: ctx.body.page,
             limit: ctx.body.limit,
-            orderBy: ['sendTime#DESC']
+            orderBy: ["sendTime#DESC"]
         });
 
-        return befly.tool.Yes('获取成功', result);
+        return befly.tool.Yes("获取成功", result);
     }
 };

package/apis/email/send.ts

@@ -1,28 +1,28 @@
-import emailLogTable from '../../tables/emailLog.json';
+import emailLogTable from "../../tables/emailLog.json";
 
 export default {
-    name: '发送邮件',
+    name: "发送邮件",
     fields: {
         to: emailLogTable.toEmail,
         subject: emailLogTable.subject,
         content: {
-            name: '邮件内容',
-            type: 'string',
+            name: "邮件内容",
+            type: "string",
             min: 1,
             max: 50000
         },
         cc: emailLogTable.ccEmail,
         bcc: emailLogTable.bccEmail,
         isHtml: {
-            name: '是否HTML',
-            type: 'boolean',
+            name: "是否HTML",
+            type: "boolean",
             default: true
         }
     },
-    required: ['to', 'subject', 'content'],
+    required: ["to", "subject", "content"],
     handler: async (befly, ctx) => {
         if (!(befly as any).addon_admin_email) {
-            return befly.tool.No('邮件插件未加载，请检查配置');
+            return befly.tool.No("邮件插件未加载，请检查配置");
         }
 
         const startTime = Date.now();
@@ -40,30 +40,30 @@ export default {
         // 记录邮件发送日志
         try {
             await befly.db.insData({
-                table: 'addon_admin_email_log',
+                table: "addon_admin_email_log",
                 data: {
                     adminId: ctx.user?.id || 0,
-                    username: ctx.user?.username || '',
-                    nickname: ctx.user?.nickname || '',
+                    username: ctx.user?.username || "",
+                    nickname: ctx.user?.nickname || "",
                     toEmail: ctx.body.to,
                     subject: ctx.body.subject,
                     content: ctx.body.content,
-                    ccEmail: ctx.body.cc || '',
-                    bccEmail: ctx.body.bcc || '',
+                    ccEmail: ctx.body.cc || "",
+                    bccEmail: ctx.body.bcc || "",
                     sendTime: startTime,
                     sendResult: result.success ? 1 : 0,
-                    messageId: result.messageId || '',
-                    failReason: result.error || ''
+                    messageId: result.messageId || "",
+                    failReason: result.error || ""
                 }
             });
         } catch (logError: any) {
-            befly.logger.error({ err: logError }, '记录邮件日志失败');
+            befly.logger.error({ err: logError }, "记录邮件日志失败");
         }
 
         if (result.success) {
-            return befly.tool.Yes('发送成功', { messageId: result.messageId });
+            return befly.tool.Yes("发送成功", { messageId: result.messageId });
         }
 
-        return befly.tool.No(result.error || '发送失败');
+        return befly.tool.No(result.error || "发送失败");
     }
 };

package/apis/email/verify.ts

@@ -1,16 +1,16 @@
 export default {
-    name: '验证邮件配置',
-    handler: async (befly, ctx) => {
+    name: "验证邮件配置",
+    handler: async (befly) => {
         if (!(befly as any).addon_admin_email) {
-            return befly.tool.No('邮件插件未加载，请检查配置');
+            return befly.tool.No("邮件插件未加载，请检查配置");
         }
 
         const isValid = await (befly as any).addon_admin_email.verify();
 
         if (isValid) {
-            return befly.tool.Yes('邮件服务配置正常');
+            return befly.tool.Yes("邮件服务配置正常");
         }
 
-        return befly.tool.No('邮件服务配置异常，请检查 SMTP 设置');
+        return befly.tool.No("邮件服务配置异常，请检查 SMTP 设置");
     }
 };

package/apis/loginLog/list.ts

@@ -1,19 +1,19 @@
 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_login_log',
+            table: "addon_admin_login_log",
             page: ctx.body.page,
             limit: ctx.body.limit,
-            orderBy: ['loginTime#DESC']
+            orderBy: ["loginTime#DESC"]
         });
 
-        return befly.tool.Yes('获取成功', result);
+        return befly.tool.Yes("获取成功", result);
     }
 };

package/apis/menu/all.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * 获取当前用户的菜单权限
  * 说明：
  * 1. 从 Redis 缓存读取所有菜单（如果缓存不存在则从数据库查询并缓存）
@@ -8,27 +8,25 @@
  */
 
 export default {
-    name: '获取用户菜单',
+    name: "获取用户菜单",
     handler: async (befly, ctx) => {
         try {
             // 2. 查询角色信息获取菜单权限（使用 roleCode 而非 roleId）
             const role = await befly.db.getOne({
-                table: 'addon_admin_role',
+                table: "addon_admin_role",
                 where: { code: ctx.user.roleCode }
             });
 
             if (!role?.id) {
-                return befly.tool.No('角色不存在', { lists: [] });
+                return befly.tool.No("角色不存在", { lists: [] });
             }
 
-            // 3. 解析菜单ID列表（逗号分隔的字符串）
-            const menuIds = role.menus
-                .split(',')
-                .map((id: string) => parseInt(id.trim()))
-                .filter((id: number) => !isNaN(id));
+            // 3. 解析菜单ID列表（数组，数据库字段已改为 array 存储）
+            const rawMenuIds = Array.isArray(role.menus) ? role.menus : [];
+            const menuIds = rawMenuIds.map((id: any) => Number(id)).filter((id: number) => Number.isFinite(id));
 
             if (menuIds.length === 0) {
-                return befly.tool.Yes('菜单为空', { lists: [] });
+                return befly.tool.Yes("菜单为空", { lists: [] });
             }
 
             // 4. 从缓存获取所有菜单
@@ -37,25 +35,25 @@ export default {
             // 如果缓存不存在，从数据库查询
             if (allMenus.length === 0) {
                 const result = await befly.db.getAll({
-                    table: 'addon_admin_menu',
-                    orderBy: ['sort#ASC', 'id#ASC']
+                    table: "addon_admin_menu",
+                    orderBy: ["sort#ASC", "id#ASC"]
                 });
                 allMenus = result.lists;
             }
 
             if (allMenus.length === 0) {
-                return befly.tool.Yes('菜单为空', { lists: [] });
+                return befly.tool.Yes("菜单为空", { lists: [] });
             }
 
             // 5. 根据角色权限过滤菜单
-            const menuIdSet = new Set(menuIds.map(String)); // 转为字符串 Set 方便比较
-            const authorizedMenus = allMenus.filter((menu: any) => menuIdSet.has(String(menu.id)));
+            const menuIdSet = new Set<number>(menuIds);
+            const authorizedMenus = allMenus.filter((menu: any) => menuIdSet.has(Number(menu.id)));
 
             // 6. 返回一维数组（由前端构建树形结构）
-            return befly.tool.Yes('获取菜单成功', { lists: authorizedMenus });
+            return befly.tool.Yes("获取菜单成功", { lists: authorizedMenus });
         } catch (error: any) {
-            befly.logger.error({ err: error }, '获取用户菜单失败');
-            return befly.tool.No('获取菜单失败');
+            befly.logger.error({ err: error }, "获取用户菜单失败");
+            return befly.tool.No("获取菜单失败");
         }
     }
 };

package/apis/menu/list.ts

@@ -1,22 +1,22 @@
-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) => {
         try {
             const menus = await befly.db.getAll({
-                table: 'addon_admin_menu',
-                orderBy: ['sort#ASC', 'id#ASC']
+                table: "addon_admin_menu",
+                orderBy: ["sort#ASC", "id#ASC"]
             });
 
-            return befly.tool.Yes('操作成功', { lists: menus.lists });
+            return befly.tool.Yes("操作成功", { lists: menus.lists });
         } catch (error) {
-            befly.logger.error({ err: error }, '获取菜单列表失败');
-            return befly.tool.No('操作失败');
+            befly.logger.error({ err: error }, "获取菜单列表失败");
+            return befly.tool.No("操作失败");
         }
     }
 };

package/apis/operateLog/list.ts

@@ -1,19 +1,19 @@
 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_operate_log',
+            table: "addon_admin_operate_log",
             page: ctx.body.page,
             limit: ctx.body.limit,
-            orderBy: ['operateTime#DESC']
+            orderBy: ["operateTime#DESC"]
         });
 
-        return befly.tool.Yes('获取成功', result);
+        return befly.tool.Yes("获取成功", result);
     }
 };

package/apis/role/all.ts

@@ -1,16 +1,16 @@
-export default {
-    name: '获取所有角色',
-    handler: async (befly, ctx) => {
+export default {
+    name: "获取所有角色",
+    handler: async (befly) => {
         const roles = await befly.db.getAll({
-            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('操作成功', { lists: roles.lists, total: roles.total });
+        return befly.tool.Yes("操作成功", { lists: roles.lists, total: roles.total });
     }
 };