befly 3.57.0 → 3.58.0

package/apis/tongJi/_daily.js

@@ -0,0 +1,159 @@
+import { DAY_MS } from "#befly/utils/datetime.js";
+
+const DEFAULT_TIME_ZONE = "Asia/Shanghai";
+
+function getTimeZoneDateParts(timestamp, timeZone) {
+    const formatter = new Intl.DateTimeFormat("en-CA", {
+        timeZone: timeZone,
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit"
+    });
+    const parts = formatter.formatToParts(timestamp);
+    const result = {};
+
+    for (const part of parts) {
+        if (part.type !== "literal") {
+            result[part.type] = Number(part.value);
+        }
+    }
+
+    return result;
+}
+
+function buildYmdNumber(year, month, day) {
+    return year * 10000 + month * 100 + day;
+}
+
+function normalizeTimeZone(timeZone) {
+    return typeof timeZone === "string" && timeZone.trim().length > 0 ? timeZone.trim() : DEFAULT_TIME_ZONE;
+}
+
+function findTimestampInDay(targetYmd, timeZone) {
+    const year = Math.floor(targetYmd / 10000);
+    const month = Math.floor((targetYmd % 10000) / 100);
+    const day = targetYmd % 100;
+    // 取当天正午作为锚点，再向前/后逐小时修正，确保落在目标日期内
+    let utc = Date.UTC(year, month - 1, day, 12, 0, 0, 0);
+    const ymdAtUtc = getDailyDateYmdNumber(utc, timeZone);
+
+    if (ymdAtUtc === targetYmd) {
+        return utc;
+    }
+
+    const step = ymdAtUtc < targetYmd ? 3600000 : -3600000;
+
+    do {
+        utc += step;
+    } while (getDailyDateYmdNumber(utc, timeZone) !== targetYmd);
+
+    return utc;
+}
+
+function getWeekdayIndex(timestamp, timeZone) {
+    const formatter = new Intl.DateTimeFormat("en-US", {
+        timeZone: timeZone,
+        weekday: "short"
+    });
+    const parts = formatter.formatToParts(timestamp);
+    const shortWeekday = parts.find((item) => item.type === "weekday").value;
+    const map = {
+        Sun: 0,
+        Mon: 1,
+        Tue: 2,
+        Wed: 3,
+        Thu: 4,
+        Fri: 5,
+        Sat: 6
+    };
+
+    return map[shortWeekday] ?? 0;
+}
+
+export function getDailyDateYmdNumber(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
+    const parts = getTimeZoneDateParts(timestamp, normalizeTimeZone(timeZone));
+
+    return buildYmdNumber(parts.year, parts.month, parts.day);
+}
+
+export function getDailyDayStartTime(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
+    const zone = normalizeTimeZone(timeZone);
+    const targetYmd = getDailyDateYmdNumber(timestamp, zone);
+    const timestampInDay = findTimestampInDay(targetYmd, zone);
+    let low = timestampInDay - DAY_MS;
+    let high = timestampInDay + DAY_MS;
+
+    while (getDailyDateYmdNumber(low, zone) >= targetYmd) {
+        low -= DAY_MS;
+    }
+
+    while (getDailyDateYmdNumber(high, zone) <= targetYmd) {
+        high += DAY_MS;
+    }
+
+    while (low + 1 < high) {
+        const mid = Math.floor((low + high) / 2);
+
+        if (getDailyDateYmdNumber(mid, zone) < targetYmd) {
+            low = mid;
+        } else {
+            high = mid;
+        }
+    }
+
+    return high;
+}
+
+export function getDailyMonthStartDate(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
+    const parts = getTimeZoneDateParts(timestamp, normalizeTimeZone(timeZone));
+
+    return buildYmdNumber(parts.year, parts.month, 1);
+}
+
+export function getDailyWeekStartDate(timestamp = Date.now(), timeZone = DEFAULT_TIME_ZONE) {
+    const zone = normalizeTimeZone(timeZone);
+    let dayStart = getDailyDayStartTime(timestamp, zone);
+
+    while (getWeekdayIndex(dayStart, zone) !== 1) {
+        dayStart = getDailyDayStartTime(dayStart - DAY_MS, zone);
+    }
+
+    return getDailyDateYmdNumber(dayStart, zone);
+}
+
+export function getDailyRecentDateList(timestamp = Date.now(), limit = 30, timeZone = DEFAULT_TIME_ZONE) {
+    const zone = normalizeTimeZone(timeZone);
+    const dayStart = getDailyDayStartTime(timestamp, zone);
+    const list = [];
+
+    for (let i = limit - 1; i >= 0; i -= 1) {
+        list.push(getDailyDateYmdNumber(dayStart - i * DAY_MS, zone));
+    }
+
+    return list;
+}
+
+export function getDailyDayStartTimeForYmd(reportDate, timeZone = DEFAULT_TIME_ZONE) {
+    return getDailyDayStartTime(findTimestampInDay(reportDate, normalizeTimeZone(timeZone)), timeZone);
+}
+
+export function getDailyDateRangeList(startDateYmd, endDateYmd, timeZone = DEFAULT_TIME_ZONE) {
+    const zone = normalizeTimeZone(timeZone);
+    const startDayStart = getDailyDayStartTimeForYmd(startDateYmd, zone);
+    const endDayStart = getDailyDayStartTimeForYmd(endDateYmd, zone);
+    const list = [];
+
+    for (let t = startDayStart; t <= endDayStart; t += DAY_MS) {
+        list.push(getDailyDateYmdNumber(t, zone));
+    }
+
+    return list;
+}
+
+export function getDailyStatsDayMembersKey(reportDate) {
+    return `daily:day:${reportDate}:members`;
+}
+
+export function getDailyStatsDayProductMembersKey(reportDate, productCode) {
+    return `daily:day:${reportDate}:product:${encodeURIComponent(productCode)}:members`;
+}

package/apis/tongJi/_tongJi.js

@@ -3,11 +3,7 @@ import { addDays, getDateYmdNumber } from "#befly/utils/datetime.js";
 export function getTongJiNumber(value) {
     const num = Number(value);
 
-    if (!Number.isFinite(num)) {
-        return 0;
-    }
-
-    return num;
+    return Number.isFinite(num) ? num : 0;
 }
 
 export function getTongJiWeekStartDate(timestamp = Date.now()) {
@@ -34,38 +30,22 @@ export function getTongJiRecentDateList(now = Date.now(), limit = 30) {
     return list;
 }
 
-export async function expireTongJiRedisKeys(befly, keys, ttl) {
-    for (const key of keys) {
-        await befly.redis.expire(key, ttl);
-    }
-}
-
-export function getVisitStatsDayMembersKey(reportDate) {
-    return `visit:day:${reportDate}:members`;
-}
-
-export function getVisitStatsDayProductMembersKey(reportDate, productCode) {
-    return `visit:day:${reportDate}:product:${encodeURIComponent(productCode)}:members`;
-}
-
-export function getVisitStatsMonthMembersKey(monthStartDate) {
-    return `visit:month:${monthStartDate}:members`;
-}
-
-export function getVisitStatsMonthProductMembersKey(monthStartDate, productCode) {
-    return `visit:month:${monthStartDate}:product:${encodeURIComponent(productCode)}:members`;
-}
+export function getTongJiDateRangeList(startDate, endDate) {
+    const list = [];
+    const start = new Date(Math.floor(startDate / 10000), Math.floor((startDate % 10000) / 100) - 1, startDate % 100);
+    const end = new Date(Math.floor(endDate / 10000), Math.floor((endDate % 10000) / 100) - 1, endDate % 100);
+    const current = new Date(start);
 
-export function getVisitStatsRecentMembersKey() {
-    return "visit:recent30:members";
-}
+    while (current.getTime() <= end.getTime()) {
+        list.push(getDateYmdNumber(current.getTime()));
+        current.setDate(current.getDate() + 1);
+    }
 
-export function getVisitStatsRecentProductMembersKey(productCode) {
-    return `visit:recent30:product:${encodeURIComponent(productCode)}:members`;
+    return list;
 }
 
-export function getOnlineStatsActiveProductKey(productCode) {
-    return `online:active:product:${encodeURIComponent(productCode)}`;
+export async function expireRedisKeys(befly, keys, ttl) {
+    await Promise.all(keys.map((key) => befly.redis.expire(key, ttl)));
 }
 
 export function getErrorStatsPeriodCountKey(periodType, periodValue) {

package/apis/tongJi/dailyReport.js

@@ -0,0 +1,76 @@
+import { isValidPositiveInt } from "#befly/utils/is.js";
+
+import { getDailyDateYmdNumber, getDailyStatsDayMembersKey, getDailyStatsDayProductMembersKey } from "./_daily.js";
+import { expireRedisKeys } from "./_tongJi.js";
+
+const DAILY_STATS_REDIS_TTL_SECONDS = 90 * 24 * 60 * 60;
+
+function getDailyStatsMember(ctx) {
+    if (isValidPositiveInt(ctx?.userId)) {
+        return `user:${ctx.userId}`;
+    }
+
+    const clientId = ctx?.body?.clientId ?? "";
+
+    if (clientId) {
+        return `client:${clientId}`;
+    }
+
+    return `ip:${ctx?.ip || "unknown"}`;
+}
+
+async function updateDailyStatsRedis(befly, reportDate, member, productCode) {
+    const dayKey = getDailyStatsDayMembersKey(reportDate);
+    const keys = [dayKey];
+
+    if (productCode) {
+        keys.push(getDailyStatsDayProductMembersKey(reportDate, productCode));
+    }
+
+    const results = await Promise.all(keys.map((key) => befly.redis.sadd(key, [member])));
+
+    await expireRedisKeys(befly, keys, DAILY_STATS_REDIS_TTL_SECONDS);
+
+    return results[0] > 0;
+}
+
+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 },
+        clientId: { name: "客户端标识", input: "string", min: 0, max: 120 },
+        productName: { name: "产品名称", input: "string", min: 0, max: 100 },
+        productCode: { name: "产品代号", input: "string", min: 0, max: 100 },
+        productVersion: { name: "产品版本", input: "string", min: 0, max: 50 }
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const now = Date.now();
+        const timeZone = befly.config?.tz;
+        const reportDate = getDailyDateYmdNumber(now, timeZone);
+        const productCode = ctx?.body?.productCode ?? "";
+
+        if (!befly.redis) {
+            return befly.tool.Yes("上报成功", {
+                reportTime: now,
+                reportDate: reportDate,
+                counted: false,
+                stored: false
+            });
+        }
+
+        const counted = await updateDailyStatsRedis(befly, reportDate, getDailyStatsMember(ctx), productCode);
+
+        return befly.tool.Yes("上报成功", {
+            reportTime: now,
+            reportDate: reportDate,
+            counted: counted,
+            stored: true
+        });
+    }
+};

package/apis/tongJi/dailyStats.js

@@ -0,0 +1,182 @@
+import { getDailyDateRangeList, getDailyDateYmdNumber, getDailyMonthStartDate, getDailyRecentDateList, getDailyStatsDayMembersKey, getDailyStatsDayProductMembersKey, getDailyWeekStartDate } from "./_daily.js";
+
+const DAILY_STATS_DAY_LIMIT = 30;
+
+async function getRedisSetCount(befly, key) {
+    const count = await befly.redis.scard(key);
+
+    return Number.isFinite(Number(count)) ? Number(count) : 0;
+}
+
+function getDayMembersKey(reportDate, productCode) {
+    return productCode ? getDailyStatsDayProductMembersKey(reportDate, productCode) : getDailyStatsDayMembersKey(reportDate);
+}
+
+async function getDayCount(befly, reportDate, productCode) {
+    return {
+        reportDate: reportDate,
+        count: await getRedisSetCount(befly, getDayMembersKey(reportDate, productCode))
+    };
+}
+
+async function sumDayCounts(befly, dateList, productCode) {
+    const counts = await Promise.all(dateList.map((date) => getRedisSetCount(befly, getDayMembersKey(date, productCode))));
+
+    return counts.reduce((sum, count) => sum + count, 0);
+}
+
+async function getDayCounts(befly, dateList, productCode) {
+    return Promise.all(dateList.map((date) => getDayCount(befly, date, productCode)));
+}
+
+function buildDateRangeSummary(startDate, endDate, count) {
+    return {
+        startDate: startDate,
+        endDate: endDate,
+        count: count
+    };
+}
+
+function buildDaySummary(reportDate, count) {
+    return {
+        reportDate: reportDate,
+        count: count
+    };
+}
+
+async function getDailyStatsSummary(befly, params) {
+    const { reportDate, monthStartDate, weekStartDate, recentDateList, recent7DateList, productCode } = params;
+    const timeZone = befly.config?.tz;
+    const weekDateList = getDailyDateRangeList(weekStartDate, reportDate, timeZone);
+    const monthDateList = recentDateList.filter((date) => date >= monthStartDate);
+
+    const [today, yesterday, dayBeforeYesterday, week, month, recent7, recent30, days] = await Promise.all([
+        getDayCount(befly, reportDate, productCode),
+        getDayCount(befly, recentDateList[recentDateList.length - 2] || reportDate, productCode),
+        getDayCount(befly, recentDateList[recentDateList.length - 3] || recentDateList[recentDateList.length - 2] || reportDate, productCode),
+        sumDayCounts(befly, weekDateList, productCode).then((count) => buildDateRangeSummary(weekStartDate, reportDate, count)),
+        sumDayCounts(befly, monthDateList, productCode).then((count) => buildDateRangeSummary(monthStartDate, reportDate, count)),
+        sumDayCounts(befly, recent7DateList, productCode).then((count) => buildDateRangeSummary(recent7DateList[0], reportDate, count)),
+        sumDayCounts(befly, recentDateList, productCode).then((count) => buildDateRangeSummary(recentDateList[0], reportDate, count)),
+        getDayCounts(befly, recentDateList, productCode)
+    ]);
+
+    return {
+        today: today,
+        yesterday: yesterday,
+        dayBeforeYesterday: dayBeforeYesterday,
+        week: week,
+        month: month,
+        recent7: recent7,
+        recent30: recent30,
+        days: days
+    };
+}
+
+function buildEmptyDays(recentDateList) {
+    return recentDateList.map((reportDate) => {
+        return {
+            reportDate: reportDate,
+            count: 0
+        };
+    });
+}
+
+function buildEmptySummary(reportDate, monthStartDate, weekStartDate, recentDateList, recent7DateList) {
+    const days = buildEmptyDays(recentDateList);
+    const yesterdayDate = recentDateList[recentDateList.length - 2] || reportDate;
+    const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
+
+    return {
+        today: buildDaySummary(reportDate, 0),
+        yesterday: buildDaySummary(yesterdayDate, 0),
+        dayBeforeYesterday: buildDaySummary(dayBeforeYesterdayDate, 0),
+        week: buildDateRangeSummary(weekStartDate, reportDate, 0),
+        month: buildDateRangeSummary(monthStartDate, reportDate, 0),
+        recent7: buildDateRangeSummary(recent7DateList[0], reportDate, 0),
+        recent30: buildDateRangeSummary(recentDateList[0], reportDate, 0),
+        days: days
+    };
+}
+
+function buildProductSummary(item, summary) {
+    return {
+        key: item.code,
+        productName: item.name,
+        productCode: item.code,
+        today: summary.today.count,
+        yesterday: summary.yesterday.count,
+        dayBeforeYesterday: summary.dayBeforeYesterday.count,
+        week: summary.week.count,
+        month: summary.month.count,
+        recent7: summary.recent7.count,
+        recent30: summary.recent30.count,
+        days: summary.days
+    };
+}
+
+async function buildDailyStatsProducts(befly, params, projectLists) {
+    const summaries = await Promise.all(
+        projectLists.map((item) => {
+            return getDailyStatsSummary(befly, { ...params, productCode: item.code }).then((summary) => buildProductSummary(item, summary));
+        })
+    );
+
+    return summaries.toSorted((a, b) => {
+        if (b.recent30 !== a.recent30) {
+            return b.recent30 - a.recent30;
+        }
+
+        return String(a.productName).localeCompare(String(b.productName), "zh-CN");
+    });
+}
+
+export default {
+    name: "获取日在线统计",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        productCode: { name: "产品代号", input: "string", min: 0, max: 100 }
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const now = Date.now();
+        const timeZone = befly.config?.tz;
+        const reportDate = getDailyDateYmdNumber(now, timeZone);
+        const monthStartDate = getDailyMonthStartDate(now, timeZone);
+        const weekStartDate = getDailyWeekStartDate(now, timeZone);
+        const recentDateList = getDailyRecentDateList(now, DAILY_STATS_DAY_LIMIT, timeZone);
+        const recent7DateList = getDailyRecentDateList(now, 7, timeZone);
+        const productCode = ctx?.body?.productCode ?? "";
+        const projectLists = productCode ? [] : befly.config?.projectLists || [];
+        const params = {
+            reportDate: reportDate,
+            monthStartDate: monthStartDate,
+            weekStartDate: weekStartDate,
+            recentDateList: recentDateList,
+            recent7DateList: recent7DateList,
+            productCode: productCode
+        };
+
+        if (!befly.redis) {
+            const summary = buildEmptySummary(reportDate, monthStartDate, weekStartDate, recentDateList, recent7DateList);
+            const products = projectLists.map((item) => buildProductSummary(item, summary));
+
+            return befly.tool.Yes("获取成功", {
+                queryTime: now,
+                ...summary,
+                products: products
+            });
+        }
+
+        const summary = await getDailyStatsSummary(befly, params);
+        const products = await buildDailyStatsProducts(befly, params, projectLists);
+
+        return befly.tool.Yes("获取成功", {
+            queryTime: now,
+            ...summary,
+            products: products
+        });
+    }
+};

package/apis/tongJi/errorList.js

@@ -1,6 +1,10 @@
 import { queryFields } from "#befly/apis/_apis.js";
 import errorReportTable from "#befly/tables/errorReport.json";
 
+const NUMBER_FIELDS = ["reportTime", "firstReportTime", "bucketTime", "bucketDate", "hitCount"];
+const FILTER_FIELDS = ["errorType", "source", "productName", "productCode", "productVersion", "deviceType", "browserName", "osName"];
+const KEYWORD_FIELDS = ["pagePath", "pageName", "message", "errorType", "productName", "productCode", "productVersion", "browserName", "osName", "deviceType", "deviceVendor", "deviceModel"];
+
 export default {
     name: "获取错误报告列表",
     method: "POST",
@@ -33,61 +37,20 @@ export default {
         }
 
         const keyword = ctx.body.keyword ?? "";
-        const errorType = ctx.body.errorType ?? "";
-        const source = ctx.body.source ?? "";
-        const productName = ctx.body.productName ?? "";
-        const productCode = ctx.body.productCode ?? "";
-        const productVersion = ctx.body.productVersion ?? "";
-        const deviceType = ctx.body.deviceType ?? "";
-        const browserName = ctx.body.browserName ?? "";
-        const osName = ctx.body.osName ?? "";
         const where = {};
 
         if (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) {
-            where.errorType = errorType;
-        }
-
-        if (source) {
-            where.source = source;
-        }
-
-        if (productName) {
-            where.productName = productName;
-        }
-
-        if (productCode) {
-            where.productCode = productCode;
+            for (const field of KEYWORD_FIELDS) {
+                where[`${field}$like$or`] = keyword;
+            }
         }
 
-        if (productVersion) {
-            where.productVersion = productVersion;
-        }
-
-        if (deviceType) {
-            where.deviceType = deviceType;
-        }
-
-        if (browserName) {
-            where.browserName = browserName;
-        }
+        for (const field of FILTER_FIELDS) {
+            const value = ctx.body[field] ?? "";
 
-        if (osName) {
-            where.osName = osName;
+            if (value) {
+                where[field] = value;
+            }
         }
 
         const result = await befly.mysql.getList({
@@ -98,16 +61,15 @@ export default {
             orderBy: ["reportTime#DESC"]
         });
 
-        const lists = [];
-        for (const item of result.data?.lists || []) {
+        const lists = (result.data?.lists || []).map((item) => {
             const row = Object.assign({}, item);
-            row.reportTime = Number(item.reportTime || 0);
-            row.firstReportTime = Number(item.firstReportTime || 0);
-            row.bucketTime = Number(item.bucketTime || 0);
-            row.bucketDate = Number(item.bucketDate || 0);
-            row.hitCount = Number(item.hitCount || 0) || 1;
-            lists.push(row);
-        }
+
+            for (const field of NUMBER_FIELDS) {
+                row[field] = Number(item[field] || 0) || (field === "hitCount" ? 1 : 0);
+            }
+
+            return row;
+        });
 
         const data = Object.assign({}, result.data);
         data.lists = lists;

package/apis/tongJi/errorReport.js

@@ -2,9 +2,9 @@ import errorReportTable from "#befly/tables/errorReport.json";
 import { getDateYmdNumber, getTimeBucketStart } from "#befly/utils/datetime.js";
 import { parseUserAgent } from "#befly/utils/userAgent.js";
 
-import { expireTongJiRedisKeys, getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
+import { expireRedisKeys, getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
 
-const VISIT_STATS_BUCKET_MS = 30 * 60 * 1000;
+const ERROR_STATS_BUCKET_MS = 30 * 60 * 1000;
 const ERROR_STATS_REDIS_TTL_SECONDS = 45 * 24 * 60 * 60;
 
 function getErrorReportUaData(ctx) {
@@ -26,25 +26,18 @@ async function updateErrorStatsRedis(befly, now, bucketDate, bucketTime, errorTy
 
     const weekStartDate = getTongJiWeekStartDate(now);
     const monthStartDate = getTongJiMonthStartDate(now);
+    const safeErrorType = String(errorType || "unknown");
     const dayCountKey = getErrorStatsPeriodCountKey("day", bucketDate);
     const weekCountKey = getErrorStatsPeriodCountKey("week", weekStartDate);
     const monthCountKey = getErrorStatsPeriodCountKey("month", monthStartDate);
     const dayBucketsKey = getErrorStatsDayBucketsKey(bucketDate);
     const dayBucketCountKey = getErrorStatsDayBucketCountKey(bucketDate, bucketTime);
     const dayTypesKey = getErrorStatsDayTypesKey(bucketDate);
-    const dayTypeCountKey = getErrorStatsDayTypeCountKey(bucketDate, errorType);
+    const dayTypeCountKey = getErrorStatsDayTypeCountKey(bucketDate, safeErrorType);
 
-    await befly.redis.incr(dayCountKey);
-    await befly.redis.incr(weekCountKey);
-    await befly.redis.incr(monthCountKey);
+    await Promise.all([befly.redis.incr(dayCountKey), befly.redis.incr(weekCountKey), befly.redis.incr(monthCountKey), befly.redis.sadd(dayBucketsKey, [String(bucketTime)]), befly.redis.incr(dayBucketCountKey), befly.redis.sadd(dayTypesKey, [safeErrorType]), befly.redis.incr(dayTypeCountKey)]);
 
-    await befly.redis.sadd(dayBucketsKey, [String(bucketTime)]);
-    await befly.redis.incr(dayBucketCountKey);
-
-    await befly.redis.sadd(dayTypesKey, [String(errorType || "unknown")]);
-    await befly.redis.incr(dayTypeCountKey);
-
-    await expireTongJiRedisKeys(befly, [dayCountKey, weekCountKey, monthCountKey, dayBucketsKey, dayBucketCountKey, dayTypesKey, dayTypeCountKey], ERROR_STATS_REDIS_TTL_SECONDS);
+    await expireRedisKeys(befly, [dayCountKey, weekCountKey, monthCountKey, dayBucketsKey, dayBucketCountKey, dayTypesKey, dayTypeCountKey], ERROR_STATS_REDIS_TTL_SECONDS);
 }
 
 export default {
@@ -66,37 +59,20 @@ export default {
     required: [],
     handler: async (befly, ctx) => {
         const now = Date.now();
-        const bucketTime = getTimeBucketStart(now, VISIT_STATS_BUCKET_MS);
+        const bucketTime = getTimeBucketStart(now, ERROR_STATS_BUCKET_MS);
         const bucketDate = getDateYmdNumber(now);
         const uaData = getErrorReportUaData(ctx);
 
         await befly.mysql.insData({
             table: "beflyErrorReport",
             data: {
+                ...ctx.body,
+                ...uaData,
                 reportTime: now,
                 firstReportTime: now,
                 bucketTime: bucketTime,
                 bucketDate: bucketDate,
-                hitCount: 1,
-                source: ctx.body.source || "",
-                productName: ctx.body.productName || "",
-                productCode: ctx.body.productCode || "",
-                productVersion: ctx.body.productVersion || "",
-                pagePath: ctx.body.pagePath || "",
-                pageName: ctx.body.pageName || "",
-                errorType: ctx.body.errorType || "",
-                message: ctx.body.message || "",
-                detail: ctx.body.detail || "",
-                userAgent: uaData.userAgent,
-                browserName: uaData.browserName,
-                browserVersion: uaData.browserVersion,
-                osName: uaData.osName,
-                osVersion: uaData.osVersion,
-                deviceType: uaData.deviceType,
-                deviceVendor: uaData.deviceVendor,
-                deviceModel: uaData.deviceModel,
-                engineName: uaData.engineName,
-                cpuArchitecture: uaData.cpuArchitecture
+                hitCount: 1
             }
         });