befly 3.24.18 → 3.24.20

package/apis/_apis.js

@@ -0,0 +1,20 @@
+export const queryFields = {
+    page: {
+        name: "页码",
+        input: "integer",
+        min: 1,
+        max: 10000
+    },
+    limit: {
+        name: "每页数量",
+        input: "integer",
+        min: 1,
+        max: 100
+    },
+    keyword: {
+        name: "关键字",
+        input: "string",
+        min: 0,
+        max: 100
+    }
+};

package/apis/admin/delete.js

@@ -1,10 +1,12 @@
+import adminTable from "#root/tables/admin.json";
+
 export default {
     name: "删除管理员",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null }
+        id: adminTable.id
     },
     required: ["id"],
     handler: async (befly, ctx) => {

package/apis/admin/detail.js

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

package/apis/admin/select.js

@@ -1,13 +1,14 @@
+import { queryFields } from "#root/apis/_apis.js";
+import adminTable from "#root/tables/admin.json";
+
 export default {
     name: "查询管理员列表",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        keyword: { name: "关键词", input: "string", min: 0, max: 50 },
-        state: { name: "状态", input: "integer", min: 0, max: 2 }
+        ...queryFields,
+        state: adminTable.state
     },
     required: [],
     handler: async (befly, ctx) => {
@@ -16,9 +17,10 @@ export default {
             page: ctx.body.page,
             limit: ctx.body.limit,
             where: {
-                roleCode: {
-                    $not: "dev"
-                }
+                username$like$or: ctx.body.keyword,
+                nickname$like$or: ctx.body.keyword,
+                state: ctx.body.state,
+                roleCode$not: "dev"
             },
             orderBy: ["createdAt#DESC"]
         });

package/apis/admin/update.js

@@ -34,7 +34,7 @@ export default {
                 table: "beflyAdmin",
                 where: {
                     username: ctx.body.username,
-                    id: { $not: ctx.body.id }
+                    id$not: ctx.body.id
                 }
             });
 
@@ -48,7 +48,7 @@ export default {
                 table: "beflyAdmin",
                 where: {
                     nickname: ctx.body.nickname,
-                    id: { $not: ctx.body.id }
+                    id$not: ctx.body.id
                 }
             });
 

package/apis/api/all.js

@@ -6,19 +6,14 @@ export default {
     fields: {},
     required: [],
     handler: async (befly) => {
-        try {
-            const allApis = await befly.cache.getApis();
+        const allApis = await befly.cache.getApis();
 
-            if (allApis.length === 0) {
-                return befly.tool.No("接口缓存不存在，请刷新缓存", { lists: [] });
-            }
+        if (allApis.length === 0) {
+            return befly.tool.No("接口缓存不存在，请刷新缓存", { lists: [] });
+        }
 
-            const lists = allApis.filter((api) => api && typeof api === "object");
+        const lists = allApis.filter((api) => api && typeof api === "object");
 
-            return befly.tool.Yes("操作成功", { lists: lists });
-        } catch (error) {
-            befly.logger.error("获取接口列表失败", error);
-            return befly.tool.No("获取接口列表失败");
-        }
+        return befly.tool.Yes("操作成功", { lists: lists });
     }
 };

package/apis/api/select.js

@@ -1,31 +1,30 @@
+import { queryFields } from "#root/apis/_apis.js";
+import apiTable from "#root/tables/api.json";
+
 export default {
     name: "获取接口列表",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        keyword: { name: "关键词", input: "string", min: 0, max: 50 },
-        state: { name: "状态", input: "integer", min: 0, max: 2 }
+        ...queryFields,
+        state: apiTable.state
     },
     required: [],
     handler: async (befly, ctx) => {
-        try {
-            const result = await befly.mysql.getList({
-                table: "beflyApi",
-                where: {
-                    $or: [{ name$like: ctx.body.keyword }, { path$like: ctx.body.keyword }]
-                },
-                orderBy: ["id#ASC"],
-                page: ctx.body.page,
-                limit: ctx.body.limit
-            });
+        const result = await befly.mysql.getList({
+            table: "beflyApi",
+            where: {
+                name$like$or: ctx.body.keyword,
+                path$like$or: ctx.body.keyword,
+                parentPath$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
+            orderBy: ["id#ASC"],
+            page: ctx.body.page,
+            limit: ctx.body.limit
+        });
 
-            return befly.tool.Yes("操作成功", result.data);
-        } catch (error) {
-            befly.logger.error("获取接口列表失败", error);
-            return befly.tool.No("获取接口列表失败");
-        }
+        return befly.tool.Yes("操作成功", result.data);
     }
 };

package/apis/dashboard/environmentInfo.js

@@ -10,6 +10,10 @@ export default {
     fields: {},
     required: [],
     handler: async (befly) => {
+        const isBunRuntime = typeof Bun !== "undefined";
+        const runtimeVersion = isBunRuntime ? `Bun ${Bun.version}` : `Node.js ${process.version}`;
+        const nodeCompatVersion = process.version;
+
         let databaseVersion = "Unknown";
         try {
             const versionResult = await befly.mysql.execute("SELECT VERSION() as version");
@@ -35,7 +39,8 @@ export default {
         return befly.tool.Yes("获取成功", {
             os: `${os.type()} ${os.arch()}`,
             server: `${os.platform()} ${os.release()}`,
-            nodeVersion: process.version,
+            runtimeVersion: runtimeVersion,
+            nodeVersion: nodeCompatVersion,
             database: `MySQL ${databaseVersion}`,
             cache: `Redis ${redisVersion}`,
             timezone: Intl.DateTimeFormat().resolvedOptions().timeZone

package/apis/dashboard/serviceStatus.js

@@ -1,3 +1,72 @@
+import cacheHealthApi from "#root/apis/tongJi/cacheHealth.js";
+
+function isEmailConfigured(emailConfig) {
+    if (!emailConfig || typeof emailConfig !== "object") {
+        return false;
+    }
+
+    return Boolean(String(emailConfig.host || "").trim() && String(emailConfig.user || "").trim() && String(emailConfig.pass || "").trim());
+}
+
+function buildServiceItem(name, status, responseTime) {
+    return {
+        name: name,
+        status: status,
+        responseTime: responseTime
+    };
+}
+
+async function probeMysqlService(befly) {
+    try {
+        const startTime = Date.now();
+        await befly.mysql.execute("SELECT 1");
+        const responseTime = Date.now() - startTime;
+        return buildServiceItem("数据库", "running", `${responseTime}ms`);
+    } catch (error) {
+        befly.logger.error("数据库状态检测失败", error);
+        return buildServiceItem("数据库", "stopped", "-");
+    }
+}
+
+async function probeRedisService(befly) {
+    if (!befly.redis) {
+        return buildServiceItem("Redis", "stopped", "-");
+    }
+
+    try {
+        const startTime = Date.now();
+        await befly.redis.ping();
+        const responseTime = Date.now() - startTime;
+        return buildServiceItem("Redis", "running", `${responseTime}ms`);
+    } catch (error) {
+        befly.logger.error("Redis状态检测失败", error);
+        return buildServiceItem("Redis", "stopped", "-");
+    }
+}
+
+function buildStaticServices(befly) {
+    return [buildServiceItem("文件系统", "running", "-"), buildServiceItem("邮件服务", isEmailConfigured(befly.config?.email) ? "running" : "unconfigured", "-"), buildServiceItem("OSS存储", "unconfigured", "-")];
+}
+
+function buildCacheHealthSummary(cacheHealthData) {
+    if (!cacheHealthData) {
+        return null;
+    }
+
+    return {
+        redisStatus: cacheHealthData.redis?.status || "unknown",
+        onlineReady: Boolean(cacheHealthData.online?.ready),
+        infoReady: Boolean(cacheHealthData.info?.ready),
+        errorReady: Boolean(cacheHealthData.error?.ready),
+        roleApisReady: Boolean(cacheHealthData.roleCache?.apis?.ready),
+        roleMenusReady: Boolean(cacheHealthData.roleCache?.menus?.ready),
+        infoFallbackCount: Number(cacheHealthData.fallback?.infoStats || 0),
+        errorFallbackCount: Number(cacheHealthData.fallback?.errorStats || 0),
+        infoFallbackTodayCount: Number(cacheHealthData.fallback?.today?.infoStats || 0),
+        errorFallbackTodayCount: Number(cacheHealthData.fallback?.today?.errorStats || 0)
+    };
+}
+
 export default {
     name: "获取服务状态",
     method: "POST",
@@ -6,70 +75,19 @@ export default {
     fields: {},
     required: [],
     handler: async (befly) => {
-        const services = [];
+        const services = [await probeMysqlService(befly), await probeRedisService(befly), ...buildStaticServices(befly)];
+
+        let cacheHealthSummary = null;
 
         try {
-            const startTime = Date.now();
-            await befly.mysql.execute("SELECT 1");
-            const responseTime = Date.now() - startTime;
-            services.push({
-                name: "数据库",
-                status: "running",
-                responseTime: `${responseTime}ms`
-            });
-        } catch (error) {
-            befly.logger.error("数据库状态检测失败", error);
-            services.push({
-                name: "数据库",
-                status: "stopped",
-                responseTime: "-"
-            });
-        }
+            const cacheHealthResult = await cacheHealthApi.handler(befly);
+            const cacheHealthData = cacheHealthResult?.data || null;
 
-        if (befly.redis) {
-            try {
-                const startTime = Date.now();
-                await befly.redis.ping();
-                const responseTime = Date.now() - startTime;
-                services.push({
-                    name: "Redis",
-                    status: "running",
-                    responseTime: `${responseTime}ms`
-                });
-            } catch (error) {
-                befly.logger.error("Redis状态检测失败", error);
-                services.push({
-                    name: "Redis",
-                    status: "stopped",
-                    responseTime: "-"
-                });
-            }
-        } else {
-            services.push({
-                name: "Redis",
-                status: "stopped",
-                responseTime: "-"
-            });
+            cacheHealthSummary = buildCacheHealthSummary(cacheHealthData);
+        } catch (error) {
+            befly.logger.error("缓存健康状态聚合失败", error);
         }
 
-        services.push({
-            name: "文件系统",
-            status: "running",
-            responseTime: "-"
-        });
-
-        services.push({
-            name: "邮件服务",
-            status: "unconfigured",
-            responseTime: "-"
-        });
-
-        services.push({
-            name: "OSS存储",
-            status: "unconfigured",
-            responseTime: "-"
-        });
-
-        return befly.tool.Yes("获取成功", { services: services });
+        return befly.tool.Yes("获取成功", { services: services, cacheHealth: cacheHealthSummary });
     }
 };

package/apis/dict/_dict.js

@@ -0,0 +1,24 @@
+export const dictReadTable = ["beflyDict", "beflyDictType"];
+export const dictReadLeftJoin = ["beflyDict.typeCode beflyDictType.code"];
+export const dictReadFields = ["beflyDict.id", "beflyDict.typeCode", "beflyDict.key", "beflyDict.label", "beflyDict.sort", "beflyDict.remark", "beflyDict.createdAt", "beflyDict.updatedAt", "beflyDictType.name typeName"];
+export const dictReadOrderBy = ["beflyDict.sort#ASC", "beflyDict.id#ASC"];
+
+export async function getDictTypeByCode(befly, typeCode) {
+    return await befly.mysql.getOne({
+        table: "beflyDictType",
+        where: {
+            code: typeCode
+        }
+    });
+}
+
+export async function getDictByTypeCodeAndKey(befly, typeCode, key, dictId = undefined) {
+    return await befly.mysql.getOne({
+        table: "beflyDict",
+        where: {
+            typeCode: typeCode,
+            key: key,
+            id$not: dictId
+        }
+    });
+}

package/apis/dict/all.js

@@ -1,4 +1,6 @@
 import dictTable from "#root/tables/dict.json";
+
+import { dictReadFields, dictReadLeftJoin, dictReadOrderBy, dictReadTable } from "./_dict.js";
 export default {
     name: "获取所有字典",
     method: "POST",
@@ -10,10 +12,10 @@ export default {
     required: [],
     handler: async (befly) => {
         const result = await befly.mysql.getAll({
-            table: ["beflyDict", "beflyDictType"],
-            leftJoin: ["beflyDict.typeCode beflyDictType.code"],
-            fields: ["beflyDict.id", "beflyDict.typeCode", "beflyDict.key", "beflyDict.label", "beflyDict.sort", "beflyDict.remark", "beflyDict.createdAt", "beflyDict.updatedAt", "beflyDictType.name typeName"],
-            orderBy: ["beflyDict.sort#ASC", "beflyDict.id#ASC"]
+            table: dictReadTable,
+            leftJoin: dictReadLeftJoin,
+            fields: dictReadFields,
+            orderBy: dictReadOrderBy
         });
 
         return befly.tool.Yes("获取成功", result.data);

package/apis/dict/detail.js

@@ -1,21 +1,25 @@
+import dictTable from "#root/tables/dict.json";
+
+import { dictReadFields, dictReadLeftJoin, dictReadTable } from "./_dict.js";
+
 export default {
     name: "获取字典详情",
     method: "POST",
     body: "none",
     auth: false,
     fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null }
+        id: dictTable.id
     },
     required: ["id"],
     handler: async (befly, ctx) => {
         const dict = await befly.mysql.getOne({
-            table: ["beflyDict", "beflyDictType"],
-            leftJoin: ["beflyDict.typeCode beflyDictType.code"],
-            fields: ["beflyDict.id", "beflyDict.typeCode", "beflyDict.key", "beflyDict.label", "beflyDict.sort", "beflyDict.remark", "beflyDict.createdAt", "beflyDict.updatedAt", "beflyDictType.name typeName"],
+            table: dictReadTable,
+            leftJoin: dictReadLeftJoin,
+            fields: dictReadFields,
             where: { "beflyDict.id": ctx.body.id }
         });
 
-        if (!dict.data || !dict.data.id) {
+        if (!dict.data?.id) {
             return befly.tool.No("字典项不存在");
         }
 

package/apis/dict/insert.js

@@ -1,5 +1,7 @@
 import dictTable from "#root/tables/dict.json";
 
+import { getDictByTypeCodeAndKey, getDictTypeByCode } from "./_dict.js";
+
 export default {
     name: "添加字典",
     method: "POST",
@@ -14,22 +16,13 @@ export default {
     },
     required: ["typeCode", "key", "label"],
     handler: async (befly, ctx) => {
-        const dictType = await befly.mysql.getOne({
-            table: "beflyDictType",
-            where: { code: ctx.body.typeCode }
-        });
+        const dictType = await getDictTypeByCode(befly, ctx.body.typeCode);
 
         if (!dictType.data?.id) {
             return befly.tool.No("字典类型不存在");
         }
 
-        const existing = await befly.mysql.getOne({
-            table: "beflyDict",
-            where: {
-                typeCode: ctx.body.typeCode,
-                key: ctx.body.key
-            }
-        });
+        const existing = await getDictByTypeCodeAndKey(befly, ctx.body.typeCode, ctx.body.key);
 
         if (existing.data?.id) {
             return befly.tool.No("该类型下已存在相同的键名");

package/apis/dict/items.js

@@ -1,5 +1,7 @@
 import dictTable from "#root/tables/dict.json";
 
+import { dictReadOrderBy, getDictTypeByCode } from "./_dict.js";
+
 export default {
     name: "获取字典项列表",
     method: "POST",
@@ -10,19 +12,16 @@ export default {
     },
     required: ["typeCode"],
     handler: async (befly, ctx) => {
-        const dictType = await befly.mysql.getOne({
-            table: "beflyDictType",
-            where: { code: ctx.body.typeCode }
-        });
+        const dictType = await getDictTypeByCode(befly, ctx.body.typeCode);
 
-        if (!dictType.data || !dictType.data.id) {
+        if (!dictType.data?.id) {
             return befly.tool.No("字典类型不存在");
         }
 
         const items = await befly.mysql.getAll({
             table: "beflyDict",
             where: { typeCode: ctx.body.typeCode },
-            orderBy: ["sort#ASC", "id#ASC"]
+            orderBy: dictReadOrderBy
         });
 
         return befly.tool.Yes("获取成功", items.data);

package/apis/dict/select.js

@@ -1,28 +1,32 @@
+import { queryFields } from "#root/apis/_apis.js";
 import dictTable from "#root/tables/dict.json";
 
+import { dictReadFields, dictReadLeftJoin, dictReadOrderBy, dictReadTable } from "./_dict.js";
+
 export default {
     name: "获取字典列表",
     method: "POST",
     body: "none",
     auth: false,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        typeCode: dictTable.typeCode,
-        keyword: { name: "关键词", input: "string", min: 0, max: 50 }
+        ...queryFields,
+        typeCode: dictTable.typeCode
     },
     required: [],
     handler: async (befly, ctx) => {
         const result = await befly.mysql.getList({
-            table: ["beflyDict", "beflyDictType"],
-            leftJoin: ["beflyDict.typeCode beflyDictType.code"],
-            fields: ["beflyDict.id", "beflyDict.typeCode", "beflyDict.key", "beflyDict.label", "beflyDict.sort", "beflyDict.remark", "beflyDict.createdAt", "beflyDict.updatedAt", "beflyDictType.name typeName"],
+            table: dictReadTable,
+            leftJoin: dictReadLeftJoin,
+            fields: dictReadFields,
             where: {
-                "beflyDict.typeCode": ctx.body.typeCode
+                "beflyDict.typeCode": ctx.body.typeCode,
+                "beflyDict.key$like$or": ctx.body.keyword,
+                "beflyDict.label$like$or": ctx.body.keyword,
+                "beflyDict.remark$like$or": ctx.body.keyword
             },
             page: ctx.body.page,
             limit: ctx.body.limit,
-            orderBy: ["beflyDict.sort#ASC", "beflyDict.id#ASC"]
+            orderBy: dictReadOrderBy
         });
 
         return befly.tool.Yes("获取成功", result.data);

package/apis/dict/update.js

@@ -1,12 +1,14 @@
 import dictTable from "#root/tables/dict.json";
 
+import { getDictByTypeCodeAndKey, getDictTypeByCode } from "./_dict.js";
+
 export default {
     name: "更新字典",
     method: "POST",
     body: "none",
     auth: true,
     fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null },
+        id: dictTable.id,
         typeCode: dictTable.typeCode,
         key: dictTable.key,
         label: dictTable.label,
@@ -16,10 +18,7 @@ export default {
     required: ["id"],
     handler: async (befly, ctx) => {
         if (ctx.body.typeCode !== undefined) {
-            const dictType = await befly.mysql.getOne({
-                table: "beflyDictType",
-                where: { code: ctx.body.typeCode }
-            });
+            const dictType = await getDictTypeByCode(befly, ctx.body.typeCode);
 
             if (!dictType.data?.id) {
                 return befly.tool.No("字典类型不存在");
@@ -32,14 +31,11 @@ export default {
                 where: { id: ctx.body.id }
             });
 
-            const existing = await befly.mysql.getOne({
-                table: "beflyDict",
-                where: {
-                    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 (!current.data?.id) {
+                return befly.tool.No("字典项不存在");
+            }
+
+            const existing = await getDictByTypeCodeAndKey(befly, ctx.body.typeCode !== undefined ? ctx.body.typeCode : current.data.typeCode, ctx.body.key !== undefined ? ctx.body.key : current.data.key, ctx.body.id);
 
             if (existing.data?.id) {
                 return befly.tool.No("该类型下已存在相同的键名");

package/apis/dictType/select.js

@@ -1,3 +1,4 @@
+import { queryFields } from "#root/apis/_apis.js";
 import dictTypeTable from "#root/tables/dictType.json";
 
 export default {
@@ -6,9 +7,7 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        page: { name: "页码", input: "integer", min: 1, max: 9999 },
-        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
-        keyword: { name: "关键词", input: "string", min: 0, max: 50 },
+        ...queryFields,
         state: dictTypeTable.state
     },
     required: [],
@@ -16,7 +15,8 @@ export default {
         const result = await befly.mysql.getList({
             table: "beflyDictType",
             where: {
-                $or: [{ name$like: ctx.body.keyword }, { code$like: ctx.body.keyword }],
+                name$like$or: ctx.body.keyword,
+                code$like$or: ctx.body.keyword,
                 state: ctx.body.state
             },
             orderBy: ["sort#ASC", "id#ASC"],

package/apis/email/config.js

@@ -1,3 +1,5 @@
+import { hasEmailConfig } from "#root/utils/email.js";
+
 export default {
     name: "获取邮件配置",
     method: "POST",
@@ -6,20 +8,16 @@ export default {
     fields: {},
     required: [],
     handler: async (befly) => {
-        if (!befly.email) {
-            return befly.tool.No("邮件插件未加载，请检查配置");
-        }
-
-        const config = befly.email.getConfig();
+        const config = befly?.config?.email || {};
 
         return befly.tool.Yes("获取成功", {
-            host: config.host,
-            port: config.port,
+            host: config.host || "",
+            port: config.port || 0,
             secure: config.secure,
-            user: config.user,
-            pass: config.pass,
-            fromName: config.fromName,
-            configured: Boolean(config.user)
+            user: config.user || "",
+            pass: config.pass || "",
+            label: config.label || "",
+            configured: hasEmailConfig(config)
         });
     }
 };