befly 3.24.18 → 3.24.20

package/apis/role/select.js

@@ -1,23 +1,26 @@
+import { queryFields } from "#root/apis/_apis.js";
+import roleTable from "#root/tables/role.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: roleTable.state
     },
     required: [],
-    handler: async (befly) => {
+    handler: async (befly, ctx) => {
         const roles = await befly.mysql.getList({
-            limit: 30,
             table: "beflyRole",
+            page: ctx.body.page,
+            limit: ctx.body.limit,
             where: {
-                code: {
-                    $not: "dev"
-                }
+                name$like$or: ctx.body.keyword,
+                code$like$or: ctx.body.keyword,
+                state: ctx.body.state,
+                code$not: "dev"
             },
             orderBy: ["sort#ASC", "id#ASC"]
         });

package/apis/role/update.js

@@ -1,4 +1,6 @@
-import adminRoleTable from "#root/tables/role.json";
+import roleTable from "#root/tables/role.json";
+
+import { getRoleById } from "./_role.js";
 
 export default {
     name: "更新角色",
@@ -6,20 +8,17 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null },
-        name: adminRoleTable.name,
-        code: adminRoleTable.code,
-        description: adminRoleTable.description,
-        menus: adminRoleTable.menus,
-        apis: adminRoleTable.apis,
-        sort: adminRoleTable.sort
+        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 befly.mysql.getOne({
-            table: "beflyRole",
-            where: { id: ctx.body.id }
-        });
+        const role = await getRoleById(befly, ctx.body.id);
 
         if (!role.data?.id) {
             return befly.tool.No("角色不存在");
@@ -39,9 +38,9 @@ export default {
             }
         }
 
-        const roleCode = ctx.body.code !== undefined ? ctx.body.code : role.data.code;
-        const apiPaths = ctx.body.apis !== undefined ? ctx.body.apis : role.data.apis || [];
-        const menuPaths = ctx.body.menus !== undefined ? ctx.body.menus : role.data.menus || [];
+        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",

package/apis/source/imageList.js

@@ -1,12 +1,12 @@
+import { queryFields } from "#root/apis/_apis.js";
+
 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: 100 }
+        ...queryFields
     },
     required: [],
     handler: async (befly, ctx) => {

package/apis/sysConfig/get.js

@@ -1,5 +1,4 @@
 import sysConfigTable from "#root/tables/sysConfig.json";
-import { isString } from "#root/utils/is.js";
 
 export default {
     name: "根据代码获取配置值",
@@ -9,41 +8,30 @@ export default {
     fields: {
         code: sysConfigTable.code
     },
-    required: [],
+    required: ["code"],
     handler: async (befly, ctx) => {
         const config = await befly.mysql.getOne({
             table: "beflySysConfig",
             where: { code: ctx.body.code }
         });
 
-        if (!config.data || !config.data.id) {
+        if (!config.data?.id) {
             return befly.tool.No("配置不存在");
         }
 
-        const valueType = config.data.valueType;
-        const rawValue = config.data.value;
-        if (!isString(valueType) || !isString(rawValue)) {
-            return befly.tool.No("配置数据不完整");
-        }
-
-        const code = config.data.code;
-        if (!isString(code)) {
-            return befly.tool.No("配置数据不完整");
-        }
-
-        let value = rawValue;
-        if (valueType === "number") {
-            value = Number(rawValue);
-        } else if (valueType === "boolean") {
-            value = rawValue === "true" || rawValue === "1";
-        } else if (valueType === "json") {
+        let value = config.data.value;
+        if (config.data.valueType === "number") {
+            value = Number(config.data.value);
+        } else if (config.data.valueType === "boolean") {
+            value = config.data.value === "true" || config.data.value === "1";
+        } else if (config.data.valueType === "json") {
             try {
-                value = JSON.parse(rawValue);
+                value = JSON.parse(config.data.value);
             } catch {
-                value = rawValue;
+                value = config.data.value;
             }
         }
 
-        return befly.tool.Yes("操作成功", { code: code, value: value });
+        return befly.tool.Yes("操作成功", { code: config.data.code, value: value });
     }
 };

package/apis/sysConfig/insert.js

@@ -15,36 +15,31 @@ export default {
         isSystem: sysConfigTable.isSystem,
         description: sysConfigTable.description
     },
-    required: [],
+    required: ["name", "code", "value"],
     handler: async (befly, ctx) => {
-        try {
-            const existing = await befly.mysql.getOne({
-                table: "beflySysConfig",
-                where: { code: ctx.body.code }
-            });
+        const existing = await befly.mysql.getOne({
+            table: "beflySysConfig",
+            where: { code: ctx.body.code }
+        });
 
-            if (existing.data?.id) {
-                return befly.tool.No("配置代码已存在");
-            }
+        if (existing.data?.id) {
+            return befly.tool.No("配置代码已存在");
+        }
 
-            const configId = await befly.mysql.insData({
-                table: "beflySysConfig",
-                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 || ""
-                }
-            });
+        const configId = await befly.mysql.insData({
+            table: "beflySysConfig",
+            data: {
+                name: ctx.body.name,
+                code: ctx.body.code,
+                value: ctx.body.value,
+                valueType: ctx.body.valueType === undefined ? "string" : ctx.body.valueType,
+                group: ctx.body.group === undefined ? "" : ctx.body.group,
+                sort: ctx.body.sort === undefined ? 0 : ctx.body.sort,
+                isSystem: ctx.body.isSystem === undefined ? 0 : ctx.body.isSystem,
+                description: ctx.body.description === undefined ? "" : ctx.body.description
+            }
+        });
 
-            return befly.tool.Yes("操作成功", { id: configId.data });
-        } catch (error) {
-            befly.logger.error("添加系统配置失败", error);
-            return befly.tool.No("操作失败");
-        }
+        return befly.tool.Yes("操作成功", { id: configId.data });
     }
 };

package/apis/sysConfig/select.js

@@ -1,19 +1,25 @@
+import { queryFields } from "#root/apis/_apis.js";
+import sysConfigTable from "#root/tables/sysConfig.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: sysConfigTable.state
     },
     required: [],
     handler: async (befly, ctx) => {
         const result = await befly.mysql.getList({
             table: "beflySysConfig",
-            fields: ["id", "name", "code", "value", "valueType", "group", "sort", "isSystem", "description", "state", "createdAt", "updatedAt"],
+            where: {
+                name$like$or: ctx.body.keyword,
+                code$like$or: ctx.body.keyword,
+                group$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
             page: ctx.body.page,
             limit: ctx.body.limit,
             orderBy: ["group#ASC", "sort#ASC", "id#ASC"]

package/apis/sysConfig/update.js

@@ -6,7 +6,7 @@ export default {
     body: "none",
     auth: true,
     fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null },
+        id: sysConfigTable.id,
         name: sysConfigTable.name,
         code: sysConfigTable.code,
         value: sysConfigTable.value,
@@ -14,49 +14,44 @@ export default {
         group: sysConfigTable.group,
         sort: sysConfigTable.sort,
         description: sysConfigTable.description,
-        state: { name: "状态", input: "integer", min: 0, max: 2 }
+        state: sysConfigTable.state
     },
     required: ["id"],
     handler: async (befly, ctx) => {
-        try {
-            const config = await befly.mysql.getOne({
+        const config = await befly.mysql.getOne({
+            table: "beflySysConfig",
+            where: { id: ctx.body.id }
+        });
+
+        if (!config.data?.id) {
+            return befly.tool.No("配置不存在");
+        }
+
+        if (config.data.isSystem === 1) {
+            await befly.mysql.updData({
                 table: "beflySysConfig",
+                data: {
+                    value: ctx.body.value
+                },
+                where: { id: ctx.body.id }
+            });
+        } else {
+            await befly.mysql.updData({
+                table: "beflySysConfig",
+                data: {
+                    name: ctx.body.name,
+                    code: ctx.body.code,
+                    value: ctx.body.value,
+                    valueType: ctx.body.valueType,
+                    group: ctx.body.group,
+                    sort: ctx.body.sort,
+                    description: ctx.body.description,
+                    state: ctx.body.state
+                },
                 where: { id: ctx.body.id }
             });
-
-            if (!config.data?.id) {
-                return befly.tool.No("配置不存在");
-            }
-
-            if (config.data.isSystem === 1) {
-                await befly.mysql.updData({
-                    table: "beflySysConfig",
-                    data: {
-                        value: ctx.body.value
-                    },
-                    where: { id: ctx.body.id }
-                });
-            } else {
-                await befly.mysql.updData({
-                    table: "beflySysConfig",
-                    data: {
-                        name: ctx.body.name,
-                        code: ctx.body.code,
-                        value: ctx.body.value,
-                        valueType: ctx.body.valueType,
-                        group: ctx.body.group,
-                        sort: ctx.body.sort,
-                        description: ctx.body.description,
-                        state: ctx.body.state
-                    },
-                    where: { id: ctx.body.id }
-                });
-            }
-
-            return befly.tool.Yes("操作成功");
-        } catch (error) {
-            befly.logger.error("更新系统配置失败", error);
-            return befly.tool.No("操作失败");
         }
+
+        return befly.tool.Yes("操作成功");
     }
 };

package/apis/tongJi/_tongJi.js

@@ -0,0 +1,41 @@
+import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+
+export function getTongJiNumber(value) {
+    const num = Number(value);
+
+    if (!Number.isFinite(num)) {
+        return 0;
+    }
+
+    return num;
+}
+
+export function getTongJiWeekStartDate(timestamp = Date.now()) {
+    const date = Reflect.construct(Date, [timestamp]);
+    const day = date.getDay();
+    const offset = day === 0 ? -6 : 1 - day;
+
+    return getDateYmdNumber(addDays(timestamp, offset));
+}
+
+export function getTongJiMonthStartDate(timestamp = Date.now()) {
+    const date = Reflect.construct(Date, [timestamp]);
+
+    return getDateYmdNumber(Reflect.construct(Date, [date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0]).getTime());
+}
+
+export function getTongJiRecentDateList(now = Date.now(), limit = 30) {
+    const list = [];
+
+    for (let i = limit - 1; i >= 0; i -= 1) {
+        list.push(getDateYmdNumber(addDays(now, -i)));
+    }
+
+    return list;
+}
+
+export async function expireTongJiRedisKeys(befly, keys, ttl) {
+    for (const key of keys) {
+        await befly.redis.expire(key, ttl);
+    }
+}

package/apis/tongJi/cacheHealth.js

@@ -0,0 +1,192 @@
+import { getDateYmdNumber } from "#root/utils/datetime.js";
+
+import { getTongJiMonthStartDate, getTongJiNumber, getTongJiWeekStartDate } from "./_tongJi.js";
+
+const ONLINE_ACTIVE_KEY = "online:active";
+const INFO_STATS_FALLBACK_COUNT_KEY = "stats:fallback:infoStats:count";
+const ERROR_STATS_FALLBACK_COUNT_KEY = "stats:fallback:errorStats:count";
+
+function getInfoStatsFallbackDailyCountKey(reportDate) {
+    return `stats:fallback:infoStats:count:day:${reportDate}`;
+}
+
+function getErrorStatsFallbackDailyCountKey(reportDate) {
+    return `stats:fallback:errorStats:count:day:${reportDate}`;
+}
+
+function getOnlineReportTimeKey(periodType, periodValue) {
+    return `online:${periodType}:${periodValue}:reportTime`;
+}
+
+function getInfoReportTimeKey(periodType, periodValue) {
+    return `info:${periodType}:${periodValue}:reportTime`;
+}
+
+function getErrorCountKey(periodType, periodValue) {
+    return `error:${periodType}:${periodValue}:count`;
+}
+
+async function getRedisStringNumber(redis, key) {
+    return getTongJiNumber(await redis.getString(key));
+}
+
+async function getRedisSetCount(redis, key) {
+    if (typeof redis.scard !== "function") {
+        return 0;
+    }
+
+    return getTongJiNumber(await redis.scard(key));
+}
+
+async function getRedisSortedSetCount(redis, key) {
+    if (typeof redis.zcard !== "function") {
+        return 0;
+    }
+
+    return getTongJiNumber(await redis.zcard(key));
+}
+
+async function getRedisConnectivity(redis) {
+    if (!redis || typeof redis.ping !== "function") {
+        return {
+            status: "unavailable",
+            responseTime: -1
+        };
+    }
+
+    try {
+        const start = Date.now();
+        await redis.ping();
+
+        return {
+            status: "running",
+            responseTime: Date.now() - start
+        };
+    } catch {
+        return {
+            status: "stopped",
+            responseTime: -1
+        };
+    }
+}
+
+export default {
+    name: "获取统计缓存健康状态",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {},
+    required: [],
+    handler: async (befly) => {
+        const now = Date.now();
+        const reportDate = getDateYmdNumber(now);
+        const weekStartDate = getTongJiWeekStartDate(now);
+        const monthStartDate = getTongJiMonthStartDate(now);
+        const redisConnectivity = await getRedisConnectivity(befly.redis);
+
+        if (!befly.redis) {
+            return befly.tool.Yes("获取成功", {
+                queryTime: now,
+                redis: redisConnectivity,
+                online: null,
+                info: null,
+                error: null,
+                roleCache: null,
+                hints: ["Redis 不可用，统计接口将回退到 MySQL 聚合"]
+            });
+        }
+
+        const onlineTodayReportTime = await getRedisStringNumber(befly.redis, getOnlineReportTimeKey("day", reportDate));
+        const onlineWeekReportTime = await getRedisStringNumber(befly.redis, getOnlineReportTimeKey("week", weekStartDate));
+        const onlineMonthReportTime = await getRedisStringNumber(befly.redis, getOnlineReportTimeKey("month", monthStartDate));
+
+        const infoTodayReportTime = await getRedisStringNumber(befly.redis, getInfoReportTimeKey("day", reportDate));
+        const infoWeekReportTime = await getRedisStringNumber(befly.redis, getInfoReportTimeKey("week", weekStartDate));
+        const infoMonthReportTime = await getRedisStringNumber(befly.redis, getInfoReportTimeKey("month", monthStartDate));
+
+        const errorDayCount = await getRedisStringNumber(befly.redis, getErrorCountKey("day", reportDate));
+        const errorWeekCount = await getRedisStringNumber(befly.redis, getErrorCountKey("week", weekStartDate));
+        const errorMonthCount = await getRedisStringNumber(befly.redis, getErrorCountKey("month", monthStartDate));
+
+        const roleApisVersion = String((await befly.redis.getString("role:apis:activeVersion")) || "");
+        const roleMenusVersion = String((await befly.redis.getString("role:menus:activeVersion")) || "");
+
+        const online = {
+            activeMembers: await getRedisSortedSetCount(befly.redis, ONLINE_ACTIVE_KEY),
+            reportTime: {
+                today: onlineTodayReportTime,
+                week: onlineWeekReportTime,
+                month: onlineMonthReportTime
+            },
+            ready: onlineTodayReportTime > 0 || onlineWeekReportTime > 0 || onlineMonthReportTime > 0
+        };
+
+        const info = {
+            reportTime: {
+                today: infoTodayReportTime,
+                week: infoWeekReportTime,
+                month: infoMonthReportTime
+            },
+            daySourcesCount: await getRedisSetCount(befly.redis, `info:day:${reportDate}:sources:names`),
+            ready: infoTodayReportTime > 0 || infoWeekReportTime > 0 || infoMonthReportTime > 0
+        };
+
+        const error = {
+            count: {
+                today: errorDayCount,
+                week: errorWeekCount,
+                month: errorMonthCount
+            },
+            ready: errorDayCount > 0 || errorWeekCount > 0 || errorMonthCount > 0
+        };
+
+        const roleCache = {
+            apis: {
+                activeVersion: roleApisVersion,
+                ready: roleApisVersion.length > 0
+            },
+            menus: {
+                activeVersion: roleMenusVersion,
+                ready: roleMenusVersion.length > 0
+            }
+        };
+
+        const fallback = {
+            infoStats: await getRedisStringNumber(befly.redis, INFO_STATS_FALLBACK_COUNT_KEY),
+            errorStats: await getRedisStringNumber(befly.redis, ERROR_STATS_FALLBACK_COUNT_KEY),
+            today: {
+                infoStats: await getRedisStringNumber(befly.redis, getInfoStatsFallbackDailyCountKey(reportDate)),
+                errorStats: await getRedisStringNumber(befly.redis, getErrorStatsFallbackDailyCountKey(reportDate))
+            }
+        };
+
+        const hints = [];
+
+        if (!online.ready) {
+            hints.push("online 统计预聚合尚未建立，onlineStats 将返回空或低命中结果");
+        }
+        if (!info.ready) {
+            hints.push("info 统计预聚合尚未建立，infoStats 将回退到 MySQL 聚合");
+        }
+        if (!error.ready) {
+            hints.push("error 统计预聚合尚未建立，errorStats 将回退到 MySQL 聚合");
+        }
+        if (!roleCache.apis.ready || !roleCache.menus.ready) {
+            hints.push("角色权限版本缓存未就绪，建议执行一次 cacheRefresh");
+        }
+        if (fallback.infoStats > 0 || fallback.errorStats > 0) {
+            hints.push("检测到统计查询回退到 MySQL，可关注预聚合写入是否稳定，必要时可执行 tongJi/fallbackReset 重置观测计数");
+        }
+
+        return befly.tool.Yes("获取成功", {
+            queryTime: now,
+            redis: redisConnectivity,
+            online: online,
+            info: info,
+            error: error,
+            roleCache: roleCache,
+            fallback: fallback,
+            hints: hints
+        });
+    }
+};

package/apis/tongJi/errorList.js

@@ -1,26 +1,27 @@
+import { queryFields } from "#root/apis/_apis.js";
+import errorReportTable from "#root/tables/errorReport.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: 100 },
-        errorType: { name: "错误类型", input: "string", min: 0, max: 50 },
-        source: { name: "来源", input: "string", min: 0, max: 50 },
-        productName: { name: "产品名称", input: "string", min: 0, max: 100 },
-        productCode: { name: "产品代号", input: "string", min: 0, max: 100 },
-        productVersion: { name: "产品版本", input: "string", min: 0, max: 100 },
-        deviceType: { name: "设备类型", input: "string", min: 0, max: 50 },
-        browserName: { name: "浏览器", input: "string", min: 0, max: 100 },
-        osName: { name: "操作系统", input: "string", min: 0, max: 100 }
+        ...queryFields,
+        errorType: errorReportTable.errorType,
+        source: errorReportTable.source,
+        productName: errorReportTable.productName,
+        productCode: errorReportTable.productCode,
+        productVersion: errorReportTable.productVersion,
+        deviceType: errorReportTable.deviceType,
+        browserName: errorReportTable.browserName,
+        osName: errorReportTable.osName
     },
     required: [],
     handler: async (befly, ctx) => {
         const tableExistsResult = await befly.mysql.tableExists("beflyErrorReport");
-        const page = Number(ctx.body.page || 1);
-        const limit = Number(ctx.body.limit || 20);
+        const page = ctx.body.page === undefined ? 1 : ctx.body.page;
+        const limit = ctx.body.limit === undefined ? 20 : ctx.body.limit;
 
         if (tableExistsResult.data !== true) {
             return befly.tool.Yes("获取成功", {
@@ -43,20 +44,18 @@ export default {
         const where = {};
 
         if (keyword) {
-            where["$or"] = [
-                { pagePath$like: keyword },
-                { pageName$like: keyword },
-                { message$like: keyword },
-                { errorType$like: keyword },
-                { productName$like: keyword },
-                { productCode$like: keyword },
-                { productVersion$like: keyword },
-                { browserName$like: keyword },
-                { osName$like: keyword },
-                { deviceType$like: keyword },
-                { deviceVendor$like: keyword },
-                { deviceModel$like: keyword }
-            ];
+            where.pagePath$like$or = keyword;
+            where.pageName$like$or = keyword;
+            where.message$like$or = keyword;
+            where.errorType$like$or = keyword;
+            where.productName$like$or = keyword;
+            where.productCode$like$or = keyword;
+            where.productVersion$like$or = keyword;
+            where.browserName$like$or = keyword;
+            where.osName$like$or = keyword;
+            where.deviceType$like$or = keyword;
+            where.deviceVendor$like$or = keyword;
+            where.deviceModel$like$or = keyword;
         }
 
         if (errorType) {