@befly-addon/admin 1.0.54 → 1.0.56

package/apis/admin/cacheRefresh.ts

@@ -4,7 +4,7 @@
  * 功能：
  * 1. 刷新接口缓存（apis:all）
  * 2. 刷新菜单缓存（menus:all）
- * 3. 刷新角色权限缓存（role:{code}）
+ * 3. 刷新角色权限缓存（role:info:{code}）
  *
  * 使用场景：
  * - 执行数据库同步后
@@ -12,6 +12,8 @@
  * - 缓存出现异常需要重建
  */
 
+import { RedisKeys } from 'befly-shared/redisKeys';
+
 export default {
     name: '刷新全部缓存',
     handler: async (befly, ctx) => {
@@ -30,10 +32,10 @@ export default {
                     orderBy: ['addonName#ASC', 'path#ASC']
                 });
 
-                await befly.redis.setObject('apis:all', apis);
+                await befly.redis.setObject(RedisKeys.apisAll(), apis);
                 results.apis = { success: true, count: apis.length };
             } catch (error: any) {
-                befly.logger.error('刷新接口缓存失败:', error);
+                befly.logger.error({ err: error }, '刷新接口缓存失败');
                 results.apis = { success: false, error: error.message };
             }
 
@@ -45,7 +47,7 @@ export default {
                     orderBy: ['sort#ASC', 'id#ASC']
                 });
 
-                await befly.redis.setObject('menus:all', menus);
+                await befly.redis.setObject(RedisKeys.menusAll(), menus);
 
                 const parentCount = menus.filter((m: any) => m.pid === 0).length;
                 const childCount = menus.filter((m: any) => m.pid !== 0).length;
@@ -57,7 +59,7 @@ export default {
                     childCount: childCount
                 };
             } catch (error: any) {
-                befly.logger.error('刷新菜单缓存失败:', error);
+                befly.logger.error({ err: error }, '刷新菜单缓存失败');
                 results.menus = { success: false, error: error.message };
             }
 
@@ -69,16 +71,17 @@ export default {
                     orderBy: ['id#ASC']
                 });
 
-                // 为每个角色单独缓存
-                let cachedCount = 0;
-                for (const role of roles) {
-                    await befly.redis.setObject(`role:${role.code}`, role);
-                    cachedCount++;
-                }
+                // 使用 setBatch 批量缓存所有角色（利用 Bun Redis auto-pipeline）
+                await befly.redis.setBatch(
+                    roles.map((role: any) => ({
+                        key: RedisKeys.roleInfo(role.code),
+                        value: role
+                    }))
+                );
 
-                results.roles = { success: true, count: cachedCount };
+                results.roles = { success: true, count: roles.length };
             } catch (error: any) {
-                befly.logger.error('刷新角色缓存失败:', error);
+                befly.logger.error({ err: error }, '刷新角色缓存失败');
                 results.roles = { success: false, error: error.message };
             }
 
@@ -91,7 +94,7 @@ export default {
                 return befly.tool.No('部分缓存刷新失败', results);
             }
         } catch (error: any) {
-            befly.logger.error('刷新全部缓存失败:', error);
+            befly.logger.error({ err: error }, '刷新全部缓存失败');
             return befly.tool.No('刷新全部缓存失败', { error: error.message });
         }
     }

package/apis/admin/ins.ts

@@ -3,7 +3,7 @@
 export default {
     name: '添加管理员',
     fields: adminTable,
-    required: ['username', 'email', 'password', 'roleId'],
+    required: ['username', 'password', 'roleId'],
     handler: async (befly, ctx) => {
         // 检查用户名是否已存在
         if (ctx.body.username) {
@@ -17,14 +17,15 @@ export default {
             }
         }
 
-        // 检查邮箱是否已存在
-        const existingByEmail = await befly.db.getOne({
-            table: 'addon_admin_admin',
-            where: { email: ctx.body.email }
+        // 查询角色信息
+        const role = await befly.db.getOne({
+            table: 'addon_admin_role',
+            where: { id: ctx.body.roleId },
+            columns: ['code']
         });
 
-        if (existingByEmail) {
-            return befly.tool.No('邮箱已被使用');
+        if (!role?.code) {
+            return befly.tool.No('角色不存在');
         }
 
         // 加密密码
@@ -35,21 +36,16 @@ export default {
             table: 'addon_admin_admin',
             data: {
                 username: ctx.body.username,
-                email: ctx.body.email,
                 password: hashedPassword,
-                name: ctx.body.name,
                 nickname: ctx.body.nickname,
-                phone: ctx.body.phone,
-                roleId: ctx.body.roleId || 0,
-                roleCode: ctx.body.roleCode || '',
-                roleType: ctx.body.roleType || 'user'
+                roleId: ctx.body.roleId,
+                roleCode: role.code
             }
         });
 
         return befly.tool.Yes('添加成功', {
             id: adminId,
-            username: ctx.body.username,
-            email: ctx.body.email
+            username: ctx.body.username
         });
     }
 };

package/apis/admin/upd.ts

@@ -17,22 +17,10 @@ export default {
             where: { id }
         });
 
-        if (!admin) {
+        if (!admin?.id) {
             return befly.tool.No('管理员不存在');
         }
 
-        // 如果更新邮箱，检查是否重复
-        if (updateData.email && updateData.email !== admin.email) {
-            const existingAdmin = await befly.db.getOne({
-                table: 'addon_admin_admin',
-                where: { email: updateData.email }
-            });
-
-            if (existingAdmin) {
-                return befly.tool.No('邮箱已被使用');
-            }
-        }
-
         // 更新管理员信息
         await befly.db.updData({
             table: 'addon_admin_admin',

package/apis/api/all.ts

@@ -16,7 +16,7 @@
 
             return befly.tool.Yes('操作成功', { lists: allApis });
         } catch (error: any) {
-            befly.logger.error('获取接口列表失败:', error);
+            befly.logger.error({ err: error }, '获取接口列表失败');
             return befly.tool.No('获取接口列表失败');
         }
     }

package/apis/api/list.ts

@@ -0,0 +1,30 @@
+import type { ApiRoute } from 'befly';
+
+export default {
+    name: '获取接口列表（分页）',
+    handler: async (befly, ctx) => {
+        try {
+            const { page = 1, limit = 30, keyword = '' } = ctx.body;
+
+            // 构建查询条件
+            const where: Record<string, any> = {};
+            if (keyword) {
+                where.$or = [{ name: { $like: `%${keyword}%` } }, { path: { $like: `%${keyword}%` } }];
+            }
+
+            const result = await befly.db.getList({
+                table: 'addon_admin_api',
+                fields: ['id', 'name', 'path', 'method', 'description', 'addon_name', 'addon_title'],
+                where: where,
+                orderBy: ['addon_name#ASC', 'path#ASC'],
+                page: page,
+                limit: limit
+            });
+
+            return befly.tool.Yes('操作成功', result);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '获取接口列表失败');
+            return befly.tool.No('获取接口列表失败');
+        }
+    }
+} as ApiRoute;

package/apis/auth/login.ts

@@ -1,4 +1,6 @@
-import adminTable from '../../tables/admin.json';
+import { UAParser } from 'ua-parser-js';
+
+import adminTable from '../../tables/admin.json';
 
 export default {
     name: '管理员登录',
@@ -14,6 +16,31 @@ export default {
     },
     required: ['account', 'password'],
     handler: async (befly, ctx) => {
+        // 解析 User-Agent
+        const userAgent = ctx.req.headers.get('user-agent') || '';
+        const uaResult = UAParser(userAgent);
+
+        // 日志数据（公共部分）
+        const logData = {
+            adminId: 0,
+            username: ctx.body.account,
+            nickname: '',
+            ip: ctx.ip || 'unknown',
+            userAgent: userAgent.substring(0, 500),
+            browserName: uaResult.browser.name || '',
+            browserVersion: uaResult.browser.version || '',
+            osName: uaResult.os.name || '',
+            osVersion: uaResult.os.version || '',
+            deviceType: uaResult.device.type || 'desktop',
+            deviceVendor: uaResult.device.vendor || '',
+            deviceModel: uaResult.device.model || '',
+            engineName: uaResult.engine.name || '',
+            cpuArchitecture: uaResult.cpu.architecture || '',
+            loginTime: Date.now(),
+            loginResult: 0,
+            failReason: ''
+        };
+
         // 查询管理员（account 匹配 username 或 email）
         const admin = await befly.db.getOne({
             table: 'addon_admin_admin',
@@ -22,26 +49,43 @@ export default {
             }
         });
 
-        if (!admin) {
-            return befly.tool.No('账号或密码错误1');
+        if (!admin?.id) {
+            logData.failReason = '账号不存在';
+            await befly.db.insData({ table: 'addon_admin_login_log', data: logData });
+            return befly.tool.No('账号或密码错误');
         }
 
+        // 更新日志数据（已找到用户）
+        logData.adminId = admin.id;
+        logData.username = admin.username;
+        logData.nickname = admin.nickname || '';
+
         // 验证密码
         try {
             const isValid = await befly.cipher.verifyPassword(ctx.body.password, admin.password);
             if (!isValid) {
-                return befly.tool.No('账号或密码错误2');
+                logData.failReason = '密码错误';
+                await befly.db.insData({ table: 'addon_admin_login_log', data: logData });
+                return befly.tool.No('账号或密码错误');
             }
-        } catch (error) {
-            befly.logger.error('密码验证失败', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '密码验证失败');
+            logData.failReason = '密码格式错误';
+            await befly.db.insData({ table: 'addon_admin_login_log', data: logData });
             return befly.tool.No('密码格式错误，请重新设置密码');
         }
 
         // 检查账号状态（state=1 表示正常，state=2 表示禁用）
         if (admin.state === 2) {
+            logData.failReason = '账号已被禁用';
+            await befly.db.insData({ table: 'addon_admin_login_log', data: logData });
             return befly.tool.No('账号已被禁用');
         }
 
+        // 登录成功，记录日志
+        logData.loginResult = 1;
+        await befly.db.insData({ table: 'addon_admin_login_log', data: logData });
+
         // 更新最后登录信息
         await befly.db.updData({
             table: 'addon_admin_admin',
@@ -69,7 +113,7 @@ export default {
         const { password: _, ...userWithoutPassword } = admin;
 
         return befly.tool.Yes('登录成功', {
-            token,
+            token: token,
             userInfo: userWithoutPassword
         });
     }

package/apis/dashboard/serviceStatus.ts

@@ -14,7 +14,7 @@
                 responseTime: `${responseTime}ms`
             });
         } catch (error) {
-            befly.logger.error('数据库状态检测失败:', error);
+            befly.logger.error({ err: error }, '数据库状态检测失败');
             services.push({
                 name: '数据库',
                 status: 'stopped',
@@ -34,7 +34,7 @@
                     responseTime: `${responseTime}ms`
                 });
             } catch (error) {
-                befly.logger.error('Redis状态检测失败:', error);
+                befly.logger.error({ err: error }, 'Redis状态检测失败');
                 services.push({
                     name: 'Redis',
                     status: 'stopped',

package/apis/dashboard/systemResources.ts

@@ -87,7 +87,7 @@ export default {
                 befly.logger.warn('fs.statfs 不可用，无法获取磁盘信息');
             }
         } catch (error) {
-            befly.logger.warn('获取磁盘信息失败', error);
+            befly.logger.warn({ err: error }, '获取磁盘信息失败');
             // 获取失败时返回 0
             diskPercentage = 0;
             diskUsed = 0;

package/apis/dict/all.ts

@@ -13,7 +13,7 @@
 
             return befly.tool.Yes('操作成功', dicts);
         } catch (error) {
-            befly.logger.error('获取所有字典失败:', error);
+            befly.logger.error({ err: error }, '获取所有字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/del.ts

@@ -11,7 +11,7 @@
 
             return befly.tool.Yes('操作成功');
         } catch (error) {
-            befly.logger.error('删除字典失败:', error);
+            befly.logger.error({ err: error }, '删除字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/detail.ts

@@ -11,8 +11,8 @@
             });
 
             return befly.tool.Yes('操作成功', dict);
-        } catch (error) {
-            befly.logger.error('获取字典详情失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '获取字典详情失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/ins.ts

@@ -19,7 +19,7 @@ export default {
 
             return befly.tool.Yes('操作成功', { id: dictId });
         } catch (error) {
-            befly.logger.error('添加字典失败:', error);
+            befly.logger.error({ err: error }, '添加字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/upd.ts

@@ -23,7 +23,7 @@ export default {
 
             return befly.tool.Yes('操作成功');
         } catch (error) {
-            befly.logger.error('更新字典失败:', error);
+            befly.logger.error({ err: error }, '更新字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/email/config.ts

@@ -0,0 +1,16 @@
+export default {
+    name: '获取邮件配置',
+    handler: async (befly, ctx) => {
+        const config = befly.email.getConfig();
+
+        return befly.tool.Yes('获取成功', {
+            host: config.host,
+            port: config.port,
+            secure: config.secure,
+            user: config.user,
+            pass: config.pass,
+            fromName: config.fromName,
+            configured: !!config.user
+        });
+    }
+};

package/apis/email/logList.ts

@@ -0,0 +1,13 @@
+export default {
+    name: '邮件发送日志列表',
+    handler: async (befly, ctx) => {
+        const result = await befly.db.getList({
+            table: 'addon_admin_email_log',
+            page: ctx.body.page || 1,
+            limit: ctx.body.limit || 30,
+            orderBy: ['sendTime#DESC']
+        });
+
+        return befly.tool.Yes('获取成功', result);
+    }
+};

package/apis/email/send.ts

@@ -0,0 +1,42 @@
+import emailLogTable from '../../tables/emailLog.json';
+
+export default {
+    name: '发送邮件',
+    fields: {
+        to: emailLogTable.toEmail,
+        subject: emailLogTable.subject,
+        content: {
+            name: '邮件内容',
+            type: 'string',
+            min: 1,
+            max: 50000
+        },
+        cc: emailLogTable.ccEmail,
+        bcc: emailLogTable.bccEmail,
+        isHtml: {
+            name: '是否HTML',
+            type: 'boolean',
+            default: true
+        }
+    },
+    required: ['to', 'subject', 'content'],
+    handler: async (befly, ctx) => {
+        const result = await befly.email.sendAndLog({
+            adminId: ctx.user?.id || 0,
+            username: ctx.user?.username || '',
+            nickname: ctx.user?.nickname || '',
+            to: ctx.body.to,
+            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
+        });
+
+        if (result.success) {
+            return befly.tool.Yes('发送成功', { messageId: result.messageId });
+        }
+
+        return befly.tool.No(result.error || '发送失败');
+    }
+};

package/apis/email/verify.ts

@@ -0,0 +1,12 @@
+export default {
+    name: '验证邮件配置',
+    handler: async (befly, ctx) => {
+        const isValid = await befly.email.verify();
+
+        if (isValid) {
+            return befly.tool.Yes('邮件服务配置正常');
+        }
+
+        return befly.tool.No('邮件服务配置异常，请检查 SMTP 设置');
+    }
+};

package/apis/loginLog/list.ts

@@ -0,0 +1,13 @@
+export default {
+    name: '获取登录日志列表',
+    handler: async (befly, ctx) => {
+        const result = await befly.db.getList({
+            table: 'addon_admin_login_log',
+            page: ctx.body.page || 1,
+            limit: ctx.body.limit || 30,
+            orderBy: ['loginTime#DESC']
+        });
+
+        return befly.tool.Yes('获取成功', result);
+    }
+};

package/apis/menu/all.ts

@@ -53,8 +53,8 @@ export default {
 
             // 6. 返回一维数组（由前端构建树形结构）
             return befly.tool.Yes('获取菜单成功', authorizedMenus);
-        } catch (error) {
-            befly.logger.error('获取用户菜单失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '获取用户菜单失败');
             return befly.tool.No('获取菜单失败');
         }
     }

package/apis/menu/list.ts

@@ -10,7 +10,7 @@
 
             return befly.tool.Yes('操作成功', menus);
         } catch (error) {
-            befly.logger.error('获取菜单列表失败:', error);
+            befly.logger.error({ err: error }, '获取菜单列表失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/operateLog/list.ts

@@ -0,0 +1,13 @@
+export default {
+    name: '获取操作日志列表',
+    handler: async (befly, ctx) => {
+        const result = await befly.db.getList({
+            table: 'addon_admin_operate_log',
+            page: ctx.body.page || 1,
+            limit: ctx.body.limit || 30,
+            orderBy: ['operateTime#DESC']
+        });
+
+        return befly.tool.Yes('获取成功', result);
+    }
+};

package/apis/role/del.ts

@@ -30,8 +30,8 @@
             }
 
             return befly.tool.Yes('操作成功');
-        } catch (error) {
-            befly.logger.error('删除角色失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '删除角色失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/role/save.ts

@@ -36,8 +36,8 @@
             });
 
             return befly.tool.Yes('操作成功');
-        } catch (error) {
-            befly.logger.error('保存用户角色失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '保存用户角色失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/sysConfig/all.ts

@@ -0,0 +1,12 @@
+export default {
+    name: '获取全部系统配置',
+    handler: async (befly, ctx) => {
+        const result = await befly.db.getAll({
+            table: 'addon_admin_sys_config',
+            fields: ['id', 'name', 'code', 'value', 'valueType', 'group', 'sort', 'isSystem', 'description'],
+            orderBy: ['group#ASC', 'sort#ASC', 'id#ASC']
+        });
+
+        return befly.tool.Yes('操作成功', result);
+    }
+};

package/apis/sysConfig/del.ts

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

package/apis/sysConfig/get.ts

@@ -0,0 +1,31 @@
+export default {
+    name: '根据代码获取配置值',
+    auth: false,
+    handler: async (befly, ctx) => {
+        const config = await befly.db.getDetail({
+            table: 'addon_admin_sys_config',
+            fields: ['code', 'value', 'valueType'],
+            where: { code: ctx.body.code }
+        });
+
+        if (!config) {
+            return befly.tool.No('配置不存在');
+        }
+
+        // 根据类型转换值
+        let value = config.value;
+        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') {
+            try {
+                value = JSON.parse(config.value);
+            } catch {
+                value = config.value;
+            }
+        }
+
+        return befly.tool.Yes('操作成功', { code: config.code, value: value });
+    }
+};

package/apis/sysConfig/ins.ts

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