befly 3.19.5 → 3.19.6

package/configs/beflyMenus.json

@@ -65,30 +65,25 @@
         "path": "/log",
         "sort": 9003,
         "children": [
-            {
-                "name": "访问统计",
-                "path": "/visit",
-                "sort": 1
-            },
             {
                 "name": "登录日志",
                 "path": "/login",
-                "sort": 2
+                "sort": 1
             },
             {
                 "name": "邮件日志",
                 "path": "/email",
-                "sort": 3
+                "sort": 2
             },
             {
                 "name": "操作日志",
                 "path": "/operate",
-                "sort": 4
+                "sort": 3
             },
             {
                 "name": "错误报告",
                 "path": "/error",
-                "sort": 5
+                "sort": 4
             }
         ]
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.19.5",
-    "gitHead": "ba7fa7cc0534c48de2df4970d69a14853cf6b2a6",
+    "version": "3.19.6",
+    "gitHead": "84b6e4e0adde7f566cfc890887b024ccf10b0516",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [
@@ -52,7 +52,7 @@
         "test": "bun test"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.5.4",
+        "fast-xml-parser": "^5.5.5",
         "nodemailer": "^8.0.2",
         "pathe": "^2.0.3",
         "ua-parser-js": "^2.0.9",

package/sql/befly.sql

@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `befly_admin` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_api` (
     `id` BIGINT NOT NULL,
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `befly_api` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_dict` (
     `id` BIGINT NOT NULL,
@@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS `befly_dict` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_dict_type` (
     `id` BIGINT NOT NULL,
@@ -56,7 +56,7 @@ CREATE TABLE IF NOT EXISTS `befly_dict_type` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_email_log` (
     `id` BIGINT NOT NULL,
@@ -77,7 +77,7 @@ CREATE TABLE IF NOT EXISTS `befly_email_log` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_login_log` (
     `id` BIGINT NOT NULL,
@@ -103,7 +103,7 @@ CREATE TABLE IF NOT EXISTS `befly_login_log` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_menu` (
     `id` BIGINT NOT NULL,
@@ -116,7 +116,7 @@ CREATE TABLE IF NOT EXISTS `befly_menu` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_operate_log` (
     `id` BIGINT NOT NULL,
@@ -139,7 +139,7 @@ CREATE TABLE IF NOT EXISTS `befly_operate_log` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_role` (
     `id` BIGINT NOT NULL,
@@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `befly_role` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_sys_config` (
     `id` BIGINT NOT NULL,
@@ -171,26 +171,7 @@ CREATE TABLE IF NOT EXISTS `befly_sys_config` (
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE IF NOT EXISTS `befly_visit_stats` (
-    `id` BIGINT NOT NULL,
-    `bucket_time` BIGINT NOT NULL DEFAULT 0,
-    `bucket_date` INT NOT NULL DEFAULT 0,
-    `pv` BIGINT NOT NULL DEFAULT 0,
-    `uv` BIGINT NOT NULL DEFAULT 0,
-    `error_count` BIGINT NOT NULL DEFAULT 0,
-    `duration_sum` BIGINT NOT NULL DEFAULT 0,
-    `duration_count` BIGINT NOT NULL DEFAULT 0,
-    `avg_duration` BIGINT NOT NULL DEFAULT 0,
-    `state` TINYINT NOT NULL DEFAULT 1,
-    `created_at` BIGINT NOT NULL DEFAULT 0,
-    `updated_at` BIGINT NOT NULL DEFAULT 0,
-    `deleted_at` BIGINT NULL DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_befly_visit_stats_bucket_time` (`bucket_time`),
-    KEY `idx_befly_visit_stats_bucket_date` (`bucket_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_error_report` (
     `id` BIGINT NOT NULL,
@@ -225,4 +206,36 @@ CREATE TABLE IF NOT EXISTS `befly_error_report` (
     PRIMARY KEY (`id`),
     KEY `idx_befly_error_report_time` (`report_time`),
     KEY `idx_befly_error_report_bucket_date` (`bucket_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+CREATE TABLE IF NOT EXISTS `befly_info_report` (
+    `id` BIGINT NOT NULL,
+    `report_time` BIGINT NOT NULL DEFAULT 0,
+    `report_date` INT NOT NULL DEFAULT 0,
+    `member_key` VARCHAR(100) NOT NULL DEFAULT '',
+    `source` VARCHAR(50) NOT NULL DEFAULT '',
+    `product_name` VARCHAR(100) NOT NULL DEFAULT '',
+    `product_code` VARCHAR(100) NOT NULL DEFAULT '',
+    `product_version` VARCHAR(100) NOT NULL DEFAULT '',
+    `page_path` VARCHAR(200) NOT NULL DEFAULT '',
+    `page_name` VARCHAR(100) NOT NULL DEFAULT '',
+    `detail` TEXT NULL,
+    `user_agent` VARCHAR(500) NOT NULL DEFAULT '',
+    `browser_name` VARCHAR(100) NOT NULL DEFAULT '',
+    `browser_version` VARCHAR(100) NOT NULL DEFAULT '',
+    `os_name` VARCHAR(100) NOT NULL DEFAULT '',
+    `os_version` VARCHAR(100) NOT NULL DEFAULT '',
+    `device_type` VARCHAR(50) NOT NULL DEFAULT '',
+    `device_vendor` VARCHAR(100) NOT NULL DEFAULT '',
+    `device_model` VARCHAR(100) NOT NULL DEFAULT '',
+    `engine_name` VARCHAR(100) NOT NULL DEFAULT '',
+    `cpu_architecture` VARCHAR(100) NOT NULL DEFAULT '',
+    `state` TINYINT NOT NULL DEFAULT 1,
+    `created_at` BIGINT NOT NULL DEFAULT 0,
+    `updated_at` BIGINT NOT NULL DEFAULT 0,
+    `deleted_at` BIGINT NULL DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_befly_info_report_date_member` (`report_date`, `member_key`),
+    KEY `idx_befly_info_report_time` (`report_time`),
+    KEY `idx_befly_info_report_date` (`report_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/apis/tongJi/visitReport.js

@@ -1,241 +0,0 @@
-import { UAParser } from "ua-parser-js";
-
-import { isValidPositiveInt } from "../../utils/is.js";
-import { getDateYmdNumber, getTimeBucketStart } from "../../utils/datetime.js";
-import { VISIT_STATS_BUCKET_MS, VISIT_STATS_ONLINE_TTL_SECONDS, VISIT_STATS_PRODUCT_FIELDS, VISIT_STATS_REDIS_TTL_SECONDS, VISIT_STATS_UA_FIELDS, getVisitStatsBucketKey, getVisitStatsBucketProductPvKey, getVisitStatsBucketProductUvKey, getVisitStatsDayKey, getVisitStatsDayProductCountKey, getVisitStatsDayProductKeysKey, getVisitStatsDayProductPvKey, getVisitStatsDayProductUvKey, getVisitStatsDayProductValuesKey, getVisitStatsDayUaCountKey, getVisitStatsDayUaValuesKey, getVisitStatsProductKey, getVisitStatsProductMeta, getVisitStatsProductMetaKey, normalizeVisitStatsProductValue, normalizeVisitStatsUaValue, toVisitStatsNumber } from "../../utils/visitStats.js";
-
-function getVisitStatsMember(ctx) {
-    if (isValidPositiveInt(ctx.userId)) {
-        return `user:${ctx.userId}`;
-    }
-
-    return `ip:${ctx.ip || "unknown"}`;
-}
-
-function getVisitStatsUaData(ctx) {
-    let userAgent = "";
-
-    if (typeof ctx.req?.headers?.get === "function") {
-        userAgent = String(ctx.req.headers.get("user-agent") || "");
-    } else if (typeof ctx.headers?.get === "function") {
-        userAgent = String(ctx.headers.get("user-agent") || "");
-    }
-
-    const uaResult = UAParser(userAgent);
-
-    return {
-        deviceType: normalizeVisitStatsUaValue(uaResult.device.type, "desktop"),
-        browserName: normalizeVisitStatsUaValue(uaResult.browser.name),
-        browserVersion: normalizeVisitStatsUaValue(uaResult.browser.version),
-        osName: normalizeVisitStatsUaValue(uaResult.os.name),
-        osVersion: normalizeVisitStatsUaValue(uaResult.os.version),
-        deviceVendor: normalizeVisitStatsUaValue(uaResult.device.vendor),
-        deviceModel: normalizeVisitStatsUaValue(uaResult.device.model),
-        engineName: normalizeVisitStatsUaValue(uaResult.engine.name),
-        cpuArchitecture: normalizeVisitStatsUaValue(uaResult.cpu.architecture)
-    };
-}
-
-function getVisitStatsProductData(ctx) {
-    return getVisitStatsProductMeta({
-        productName: ctx.body?.productName,
-        productCode: ctx.body?.productCode,
-        productVersion: ctx.body?.productVersion
-    });
-}
-
-async function saveVisitStatsUaData(befly, bucketDate, uaData) {
-    const saddItems = [];
-    const expireItems = [];
-    const countTasks = [];
-
-    for (const item of VISIT_STATS_UA_FIELDS) {
-        const field = item.field;
-        const defaultValue = item.defaultValue;
-        const value = normalizeVisitStatsUaValue(uaData[field], defaultValue);
-        const valuesKey = getVisitStatsDayUaValuesKey(bucketDate, field);
-        const countKey = getVisitStatsDayUaCountKey(bucketDate, field, value);
-
-        saddItems.push({ key: valuesKey, members: [value] });
-        expireItems.push({ key: valuesKey, seconds: VISIT_STATS_REDIS_TTL_SECONDS });
-        countTasks.push(befly.redis.incrWithExpire(countKey, VISIT_STATS_REDIS_TTL_SECONDS));
-    }
-
-    await befly.redis.saddBatch(saddItems);
-    await befly.redis.expireBatch(expireItems);
-    await Promise.all(countTasks);
-}
-
-async function saveVisitStatsProductData(befly, bucketDate, productData) {
-    const saddItems = [];
-    const expireItems = [];
-    const countTasks = [];
-
-    for (const item of VISIT_STATS_PRODUCT_FIELDS) {
-        const field = item.field;
-        const defaultValue = item.defaultValue;
-        const value = normalizeVisitStatsProductValue(productData[field], defaultValue);
-        const valuesKey = getVisitStatsDayProductValuesKey(bucketDate, field);
-        const countKey = getVisitStatsDayProductCountKey(bucketDate, field, value);
-
-        saddItems.push({ key: valuesKey, members: [value] });
-        expireItems.push({ key: valuesKey, seconds: VISIT_STATS_REDIS_TTL_SECONDS });
-        countTasks.push(befly.redis.incrWithExpire(countKey, VISIT_STATS_REDIS_TTL_SECONDS));
-    }
-
-    await befly.redis.saddBatch(saddItems);
-    await befly.redis.expireBatch(expireItems);
-    await Promise.all(countTasks);
-}
-
-async function saveVisitStatsProductSummary(befly, bucketTime, bucketDate, member, productData) {
-    const productKey = getVisitStatsProductKey(productData);
-    const metaKey = getVisitStatsProductMetaKey(productKey);
-    const dayKeysKey = getVisitStatsDayProductKeysKey(bucketDate);
-    const bucketPvKey = getVisitStatsBucketProductPvKey(bucketTime, productKey);
-    const bucketUvKey = getVisitStatsBucketProductUvKey(bucketTime, productKey);
-    const dayPvKey = getVisitStatsDayProductPvKey(bucketDate, productKey);
-    const dayUvKey = getVisitStatsDayProductUvKey(bucketDate, productKey);
-
-    await befly.redis.setString(metaKey, JSON.stringify(productData), VISIT_STATS_REDIS_TTL_SECONDS);
-    await befly.redis.sadd(dayKeysKey, [productKey]);
-    await befly.redis.expire(dayKeysKey, VISIT_STATS_REDIS_TTL_SECONDS);
-    await befly.redis.incrWithExpire(bucketPvKey, VISIT_STATS_REDIS_TTL_SECONDS);
-    await befly.redis.sadd(bucketUvKey, [member]);
-    await befly.redis.expire(bucketUvKey, VISIT_STATS_REDIS_TTL_SECONDS);
-    await befly.redis.incrWithExpire(dayPvKey, VISIT_STATS_REDIS_TTL_SECONDS);
-    await befly.redis.sadd(dayUvKey, [member]);
-    await befly.redis.expire(dayUvKey, VISIT_STATS_REDIS_TTL_SECONDS);
-}
-
-async function ensureVisitStatsTableReady(befly) {
-    if (befly.visitStatsTableReady !== undefined) {
-        return befly.visitStatsTableReady;
-    }
-
-    const tableExistsResult = await befly.mysql.tableExists("beflyVisitStats");
-    befly.visitStatsTableReady = tableExistsResult.data === true;
-    return befly.visitStatsTableReady;
-}
-
-async function flushVisitStatsBucket(befly, bucketTime) {
-    if (bucketTime <= 0) {
-        return;
-    }
-
-    const currentBucketTime = getTimeBucketStart(Date.now(), VISIT_STATS_BUCKET_MS);
-    if (bucketTime >= currentBucketTime) {
-        return;
-    }
-
-    const tableReady = await ensureVisitStatsTableReady(befly);
-    if (!tableReady) {
-        return;
-    }
-
-    const flushedKey = `visitStats:flushed:${bucketTime}`;
-    const flushed = await befly.redis.exists(flushedKey);
-    if (flushed) {
-        return;
-    }
-
-    const bucketDate = getDateYmdNumber(bucketTime);
-    const bucketKey = getVisitStatsBucketKey(bucketTime);
-    const pv = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:pv`));
-    const uv = await befly.redis.scard(`${bucketKey}:uv`);
-    const errorCount = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:errorCount`));
-    const durationSum = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:durationSum`));
-    const durationCount = toVisitStatsNumber(await befly.redis.getString(`${bucketKey}:durationCount`));
-    const avgDuration = durationCount > 0 ? Math.round(durationSum / durationCount) : 0;
-
-    if (pv <= 0 && uv <= 0 && errorCount <= 0 && durationCount <= 0) {
-        await befly.redis.setString(flushedKey, "1", VISIT_STATS_REDIS_TTL_SECONDS);
-        return;
-    }
-
-    const data = {
-        bucketTime: bucketTime,
-        bucketDate: bucketDate,
-        pv: pv,
-        uv: uv,
-        errorCount: errorCount,
-        durationSum: durationSum,
-        durationCount: durationCount,
-        avgDuration: avgDuration
-    };
-
-    const detail = await befly.mysql.getOne({
-        table: "beflyVisitStats",
-        where: { bucketTime: bucketTime }
-    });
-
-    if (detail.data?.id) {
-        await befly.mysql.updData({
-            table: "beflyVisitStats",
-            data: data,
-            where: { bucketTime: bucketTime }
-        });
-    } else {
-        await befly.mysql.insData({
-            table: "beflyVisitStats",
-            data: data
-        });
-    }
-
-    await befly.redis.setString(flushedKey, "1", VISIT_STATS_REDIS_TTL_SECONDS);
-}
-
-async function flushVisitStatsPreviousBucket(befly, now = Date.now()) {
-    const currentBucketTime = getTimeBucketStart(now, VISIT_STATS_BUCKET_MS);
-    await flushVisitStatsBucket(befly, currentBucketTime - 30 * 60 * 1000);
-}
-
-export default {
-    name: "上报访问统计",
-    method: "POST",
-    body: "none",
-    auth: false,
-    fields: {
-        pagePath: { name: "页面路径", input: "string", min: 0, max: 200 },
-        pageName: { name: "页面名称", input: "string", min: 0, max: 100 },
-        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 }
-    },
-    required: [],
-    handler: async (befly, ctx) => {
-        const now = Date.now();
-        const bucketTime = getTimeBucketStart(now, VISIT_STATS_BUCKET_MS);
-        const bucketDate = getDateYmdNumber(now);
-        const bucketKey = getVisitStatsBucketKey(bucketTime);
-        const dayKey = getVisitStatsDayKey(bucketDate);
-        const member = getVisitStatsMember(ctx);
-        const uaData = getVisitStatsUaData(ctx);
-        const productData = getVisitStatsProductData(ctx);
-
-        await flushVisitStatsPreviousBucket(befly, now);
-
-        await befly.redis.incrWithExpire(`${bucketKey}:pv`, VISIT_STATS_REDIS_TTL_SECONDS);
-        await befly.redis.incrWithExpire(`${dayKey}:pv`, VISIT_STATS_REDIS_TTL_SECONDS);
-
-        await befly.redis.sadd(`${bucketKey}:uv`, [member]);
-        await befly.redis.expire(`${bucketKey}:uv`, VISIT_STATS_REDIS_TTL_SECONDS);
-        await befly.redis.sadd(`${dayKey}:uv`, [member]);
-        await befly.redis.expire(`${dayKey}:uv`, VISIT_STATS_REDIS_TTL_SECONDS);
-
-        await befly.redis.setString(`visitStats:online:visitor:${member}`, "1", VISIT_STATS_ONLINE_TTL_SECONDS);
-        await befly.redis.sadd("visitStats:online:visitors", [member]);
-        await befly.redis.expire("visitStats:online:visitors", VISIT_STATS_REDIS_TTL_SECONDS);
-        await saveVisitStatsUaData(befly, bucketDate, uaData);
-        await saveVisitStatsProductData(befly, bucketDate, productData);
-        await saveVisitStatsProductSummary(befly, bucketTime, bucketDate, member, productData);
-
-        const result = {
-            bucketTime: bucketTime,
-            bucketDate: bucketDate
-        };
-
-        return befly.tool.Yes("上报成功", result);
-    }
-};