befly 3.36.0 → 3.38.0

package/apis/dashboard/serviceStatus.js

@@ -1,5 +1,3 @@
-import cacheHealthApi from "#befly/apis/tongJi/cacheHealth.js";
-
 function isEmailConfigured(emailConfig) {
     if (!emailConfig || typeof emailConfig !== "object") {
         return false;
@@ -48,25 +46,6 @@ 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",
@@ -77,17 +56,6 @@ export default {
     handler: async (befly) => {
         const services = [await probeMysqlService(befly), await probeRedisService(befly), ...buildStaticServices(befly)];
 
-        let cacheHealthSummary = null;
-
-        try {
-            const cacheHealthResult = await cacheHealthApi.handler(befly);
-            const cacheHealthData = cacheHealthResult?.data || null;
-
-            cacheHealthSummary = buildCacheHealthSummary(cacheHealthData);
-        } catch (error) {
-            befly.logger.error("缓存健康状态聚合失败", error);
-        }
-
-        return befly.tool.Yes("获取成功", { services: services, cacheHealth: cacheHealthSummary });
+        return befly.tool.Yes("获取成功", { services: services });
     }
 };

package/apis/tongJi/_tongJi.js

@@ -39,3 +39,51 @@ export async function expireTongJiRedisKeys(befly, keys, ttl) {
         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 getVisitStatsRecentMembersKey() {
+    return "visit:recent30:members";
+}
+
+export function getVisitStatsRecentProductMembersKey(productCode) {
+    return `visit:recent30:product:${encodeURIComponent(productCode)}:members`;
+}
+
+export function getOnlineStatsActiveProductKey(productCode) {
+    return `online:active:product:${encodeURIComponent(productCode)}`;
+}
+
+export function getErrorStatsPeriodCountKey(periodType, periodValue) {
+    return `error:${periodType}:${periodValue}:count`;
+}
+
+export function getErrorStatsDayBucketsKey(bucketDate) {
+    return `error:day:${bucketDate}:buckets`;
+}
+
+export function getErrorStatsDayBucketCountKey(bucketDate, bucketTime) {
+    return `error:day:${bucketDate}:bucket:${bucketTime}:count`;
+}
+
+export function getErrorStatsDayTypesKey(bucketDate) {
+    return `error:day:${bucketDate}:types`;
+}
+
+export function getErrorStatsDayTypeCountKey(bucketDate, errorType) {
+    return `error:day:${bucketDate}:type:${encodeURIComponent(String(errorType || "unknown"))}:count`;
+}

package/apis/tongJi/errorReport.js

@@ -3,7 +3,7 @@ import { UAParser } from "ua-parser-js";
 import errorReportTable from "#befly/tables/errorReport.json";
 import { getDateYmdNumber, getTimeBucketStart } from "#befly/utils/datetime.js";
 
-import { expireTongJiRedisKeys, getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
+import { expireTongJiRedisKeys, getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
 
 const VISIT_STATS_BUCKET_MS = 30 * 60 * 1000;
 const ERROR_STATS_REDIS_TTL_SECONDS = 45 * 24 * 60 * 60;
@@ -33,26 +33,6 @@ function getErrorReportUaData(ctx) {
     };
 }
 
-function getErrorStatsPeriodCountKey(periodType, periodValue) {
-    return `error:${periodType}:${periodValue}:count`;
-}
-
-function getErrorStatsDayBucketsKey(bucketDate) {
-    return `error:day:${bucketDate}:buckets`;
-}
-
-function getErrorStatsDayBucketCountKey(bucketDate, bucketTime) {
-    return `error:day:${bucketDate}:bucket:${bucketTime}:count`;
-}
-
-function getErrorStatsDayTypesKey(bucketDate) {
-    return `error:day:${bucketDate}:types`;
-}
-
-function getErrorStatsDayTypeCountKey(bucketDate, errorType) {
-    return `error:day:${bucketDate}:type:${encodeURIComponent(String(errorType || "unknown"))}:count`;
-}
-
 async function updateErrorStatsRedis(befly, now, bucketDate, bucketTime, errorType) {
     if (!befly.redis) {
         return;

package/apis/tongJi/errorStats.js

@@ -1,35 +1,8 @@
 import { getDateYmdNumber } from "#befly/utils/datetime.js";
 
-import { getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
+import { getErrorStatsDayBucketCountKey, getErrorStatsDayBucketsKey, getErrorStatsDayTypeCountKey, getErrorStatsDayTypesKey, getErrorStatsPeriodCountKey, getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
 
 const ERROR_STATS_DAY_LIMIT = 30;
-const ERROR_STATS_FALLBACK_COUNT_KEY = "stats:fallback:errorStats:count";
-const ERROR_STATS_FALLBACK_DAILY_COUNT_KEY_PREFIX = "stats:fallback:errorStats:count:day:";
-const ERROR_STATS_FALLBACK_TTL_SECONDS = 7 * 24 * 60 * 60;
-
-function getErrorStatsFallbackDailyCountKey(bucketDate) {
-    return `${ERROR_STATS_FALLBACK_DAILY_COUNT_KEY_PREFIX}${bucketDate}`;
-}
-
-function getErrorStatsPeriodCountKey(periodType, periodValue) {
-    return `error:${periodType}:${periodValue}:count`;
-}
-
-function getErrorStatsDayBucketsKey(bucketDate) {
-    return `error:day:${bucketDate}:buckets`;
-}
-
-function getErrorStatsDayBucketCountKey(bucketDate, bucketTime) {
-    return `error:day:${bucketDate}:bucket:${bucketTime}:count`;
-}
-
-function getErrorStatsDayTypesKey(bucketDate) {
-    return `error:day:${bucketDate}:types`;
-}
-
-function getErrorStatsDayTypeCountKey(bucketDate, errorType) {
-    return `error:day:${bucketDate}:type:${encodeURIComponent(String(errorType || "unknown"))}:count`;
-}
 
 async function getErrorStatsRedisSummary(befly, periodType, periodValue) {
     return {
@@ -99,13 +72,22 @@ async function getErrorStatsRedisTopTypes(befly, bucketDate) {
 
 async function getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthStartDate, recentDateList) {
     const todaySummary = await getErrorStatsRedisSummary(befly, "day", bucketDate);
+    const yesterdayDate = recentDateList[recentDateList.length - 2] || bucketDate;
+    const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
+    const yesterdaySummary = await getErrorStatsRedisSummary(befly, "day", yesterdayDate);
+    const dayBeforeYesterdaySummary = await getErrorStatsRedisSummary(befly, "day", dayBeforeYesterdayDate);
     const weekSummary = await getErrorStatsRedisSummary(befly, "week", weekStartDate);
     const monthSummary = await getErrorStatsRedisSummary(befly, "month", monthStartDate);
     const trend = await getErrorStatsRedisTrend(befly, bucketDate);
     const days = await getErrorStatsRedisDays(befly, recentDateList);
     const topTypes = await getErrorStatsRedisTopTypes(befly, bucketDate);
+    let recent30Count = 0;
+
+    for (const item of days) {
+        recent30Count += item.count;
+    }
 
-    if (todaySummary.count <= 0 && weekSummary.count <= 0 && monthSummary.count <= 0 && trend.length === 0 && topTypes.length === 0) {
+    if (todaySummary.count <= 0 && yesterdaySummary.count <= 0 && dayBeforeYesterdaySummary.count <= 0 && weekSummary.count <= 0 && monthSummary.count <= 0 && recent30Count <= 0 && trend.length === 0 && topTypes.length === 0) {
         return null;
     }
 
@@ -114,6 +96,14 @@ async function getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthSta
             bucketDate: bucketDate,
             count: todaySummary.count
         },
+        yesterday: {
+            bucketDate: yesterdayDate,
+            count: yesterdaySummary.count
+        },
+        dayBeforeYesterday: {
+            bucketDate: dayBeforeYesterdayDate,
+            count: dayBeforeYesterdaySummary.count
+        },
         week: {
             startDate: weekStartDate,
             endDate: bucketDate,
@@ -124,31 +114,17 @@ async function getErrorStatsFromRedis(befly, bucketDate, weekStartDate, monthSta
             endDate: bucketDate,
             count: monthSummary.count
         },
+        recent30: {
+            startDate: recentDateList[0],
+            endDate: bucketDate,
+            count: recent30Count
+        },
         trend: trend,
         days: days,
         topTypes: topTypes
     };
 }
 
-async function incrErrorStatsFallbackCount(befly, bucketDate) {
-    if (!befly.redis) {
-        return;
-    }
-
-    const dailyKey = getErrorStatsFallbackDailyCountKey(bucketDate);
-
-    if (typeof befly.redis.incrWithExpire === "function") {
-        await befly.redis.incrWithExpire(ERROR_STATS_FALLBACK_COUNT_KEY, ERROR_STATS_FALLBACK_TTL_SECONDS);
-        await befly.redis.incrWithExpire(dailyKey, ERROR_STATS_FALLBACK_TTL_SECONDS);
-        return;
-    }
-
-    await befly.redis.incr(ERROR_STATS_FALLBACK_COUNT_KEY);
-    await befly.redis.expire(ERROR_STATS_FALLBACK_COUNT_KEY, ERROR_STATS_FALLBACK_TTL_SECONDS);
-    await befly.redis.incr(dailyKey);
-    await befly.redis.expire(dailyKey, ERROR_STATS_FALLBACK_TTL_SECONDS);
-}
-
 async function getErrorStatsSummary(befly, startDate, endDate) {
     const result = await befly.mysql.execute("SELECT SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date BETWEEN ? AND ?", [startDate, endDate]);
     const detail = result.data?.[0] || {};
@@ -173,13 +149,32 @@ export default {
         const weekStartDate = getTongJiWeekStartDate(now);
         const monthStartDate = getTongJiMonthStartDate(now);
         const recentDateList = getTongJiRecentDateList(now, ERROR_STATS_DAY_LIMIT);
+        const yesterdayDate = recentDateList[recentDateList.length - 2] || bucketDate;
+        const dayBeforeYesterdayDate = recentDateList[recentDateList.length - 3] || yesterdayDate;
 
         if (!tableReady) {
+            const days = [];
+
+            for (const item of recentDateList) {
+                days.push({
+                    bucketDate: item,
+                    count: 0
+                });
+            }
+
             return befly.tool.Yes("获取成功", {
                 today: {
                     bucketDate: bucketDate,
                     count: 0
                 },
+                yesterday: {
+                    bucketDate: yesterdayDate,
+                    count: 0
+                },
+                dayBeforeYesterday: {
+                    bucketDate: dayBeforeYesterdayDate,
+                    count: 0
+                },
                 week: {
                     startDate: weekStartDate,
                     endDate: bucketDate,
@@ -190,8 +185,13 @@ export default {
                     endDate: bucketDate,
                     count: 0
                 },
+                recent30: {
+                    startDate: recentDateList[0],
+                    endDate: bucketDate,
+                    count: 0
+                },
                 trend: [],
-                days: [],
+                days: days,
                 topTypes: []
             });
         }
@@ -202,13 +202,14 @@ export default {
             if (redisResult) {
                 return befly.tool.Yes("获取成功", redisResult);
             }
-
-            await incrErrorStatsFallbackCount(befly, bucketDate);
         }
 
         const todaySummary = await getErrorStatsSummary(befly, bucketDate, bucketDate);
+        const yesterdaySummary = await getErrorStatsSummary(befly, yesterdayDate, yesterdayDate);
+        const dayBeforeYesterdaySummary = await getErrorStatsSummary(befly, dayBeforeYesterdayDate, dayBeforeYesterdayDate);
         const weekSummary = await getErrorStatsSummary(befly, weekStartDate, bucketDate);
         const monthSummary = await getErrorStatsSummary(befly, monthStartDate, bucketDate);
+        const recent30Summary = await getErrorStatsSummary(befly, recentDateList[0], bucketDate);
         const trendRes = await befly.mysql.execute("SELECT bucket_time as bucketTime, bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY bucket_time, bucket_date ORDER BY bucket_time ASC", [bucketDate]);
         const daysRes = await befly.mysql.execute("SELECT bucket_date as bucketDate, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date >= ? GROUP BY bucket_date ORDER BY bucket_date ASC", [recentDateList[0]]);
         const topTypesRes = await befly.mysql.execute("SELECT error_type as errorType, SUM(hit_count) as count FROM befly_error_report WHERE state = 1 AND bucket_date = ? GROUP BY error_type ORDER BY count DESC LIMIT 5", [bucketDate]);
@@ -259,6 +260,14 @@ export default {
                 bucketDate: bucketDate,
                 count: todaySummary.count
             },
+            yesterday: {
+                bucketDate: yesterdayDate,
+                count: yesterdaySummary.count
+            },
+            dayBeforeYesterday: {
+                bucketDate: dayBeforeYesterdayDate,
+                count: dayBeforeYesterdaySummary.count
+            },
             week: {
                 startDate: weekStartDate,
                 endDate: bucketDate,
@@ -269,6 +278,11 @@ export default {
                 endDate: bucketDate,
                 count: monthSummary.count
             },
+            recent30: {
+                startDate: recentDateList[0],
+                endDate: bucketDate,
+                count: recent30Summary.count
+            },
             trend: trend,
             days: days,
             topTypes: topTypes

package/apis/tongJi/infoReport.js

@@ -1,108 +1,76 @@
-import { UAParser } from "ua-parser-js";
-
-import infoReportTable from "#befly/tables/infoReport.json";
-import { getDateYmdNumber } from "#befly/utils/datetime.js";
+import { addDays, getDateYmdNumber, getDayStartTime } from "#befly/utils/datetime.js";
 import { isValidPositiveInt } from "#befly/utils/is.js";
 
-import { getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
+import { expireTongJiRedisKeys, getTongJiMonthStartDate, getVisitStatsDayMembersKey, getVisitStatsDayProductMembersKey, getVisitStatsMonthMembersKey, getVisitStatsMonthProductMembersKey, getVisitStatsRecentMembersKey, getVisitStatsRecentProductMembersKey } from "./_tongJi.js";
 
-const INFO_STATS_REDIS_TTL_SECONDS = 45 * 24 * 60 * 60;
-const INFO_STATS_FIELDS = [
-    { key: "sources", valueKey: "source" },
-    { key: "productNames", valueKey: "productName" },
-    { key: "productCodes", valueKey: "productCode" },
-    { key: "productVersions", valueKey: "productVersion" },
-    { key: "pagePaths", valueKey: "pagePath" },
-    { key: "pageNames", valueKey: "pageName" },
-    { key: "deviceTypes", valueKey: "deviceType" },
-    { key: "browsers", valueKey: "browserName" },
-    { key: "browserVersions", valueKey: "browserVersion" },
-    { key: "osList", valueKey: "osName" },
-    { key: "osVersions", valueKey: "osVersion" },
-    { key: "deviceVendors", valueKey: "deviceVendor" },
-    { key: "deviceModels", valueKey: "deviceModel" },
-    { key: "engines", valueKey: "engineName" },
-    { key: "cpuArchitectures", valueKey: "cpuArchitecture" }
-];
+const VISIT_STATS_REDIS_TTL_SECONDS = 45 * 24 * 60 * 60;
 
-function getInfoStatsMember(ctx) {
-    if (isValidPositiveInt(ctx.userId)) {
+function getVisitStatsMember(ctx) {
+    if (isValidPositiveInt(ctx?.userId)) {
         return `user:${ctx.userId}`;
     }
 
-    return `ip:${ctx.ip || "unknown"}`;
+    return `ip:${ctx?.ip || "unknown"}`;
 }
 
-function getInfoStatsNamesKey(periodType, periodValue, fieldKey) {
-    return `info:${periodType}:${periodValue}:${fieldKey}:names`;
-}
+async function addRecentVisitMember(befly, key, member, now) {
+    const cutoffTime = getDayStartTime(addDays(now, -29));
 
-function getInfoStatsCountKey(periodType, periodValue, fieldKey, value) {
-    return `info:${periodType}:${periodValue}:${fieldKey}:count:${encodeURIComponent(String(value || ""))}`;
-}
-
-function getInfoStatsReportTimeKey(periodType, periodValue) {
-    return `info:${periodType}:${periodValue}:reportTime`;
-}
-
-async function updateInfoStatsPeriodRedis(befly, periodType, periodValue, statData, now) {
-    const reportTimeKey = getInfoStatsReportTimeKey(periodType, periodValue);
-    await befly.redis.setString(reportTimeKey, String(now), INFO_STATS_REDIS_TTL_SECONDS);
-    await befly.redis.expire(reportTimeKey, INFO_STATS_REDIS_TTL_SECONDS);
-
-    for (const item of INFO_STATS_FIELDS) {
-        const rawValue = String(statData[item.valueKey] || "").trim();
-
-        if (!rawValue) {
-            continue;
+    await befly.redis.zadd(key, [
+        {
+            score: now,
+            member: member
         }
-
-        const namesKey = getInfoStatsNamesKey(periodType, periodValue, item.key);
-        const countKey = getInfoStatsCountKey(periodType, periodValue, item.key, rawValue);
-
-        await befly.redis.sadd(namesKey, [rawValue]);
-        await befly.redis.incr(countKey);
-        await befly.redis.expire(namesKey, INFO_STATS_REDIS_TTL_SECONDS);
-        await befly.redis.expire(countKey, INFO_STATS_REDIS_TTL_SECONDS);
-    }
+    ]);
+    await befly.redis.zremrangebyscore(key, "-inf", cutoffTime - 1);
+    await befly.redis.expire(key, VISIT_STATS_REDIS_TTL_SECONDS);
 }
 
-async function updateInfoStatsRedis(befly, now, reportDate, statData) {
-    if (!befly.redis) {
-        return;
-    }
-
-    const weekStartDate = getTongJiWeekStartDate(now);
+async function updateVisitStatsRedis(befly, now, reportDate, member, productCode) {
     const monthStartDate = getTongJiMonthStartDate(now);
+    const dayKey = getVisitStatsDayMembersKey(reportDate);
+    const monthKey = getVisitStatsMonthMembersKey(monthStartDate);
+    const recentKey = getVisitStatsRecentMembersKey();
+    const dayAdded = await befly.redis.sadd(dayKey, [member]);
+
+    await befly.redis.sadd(monthKey, [member]);
+    await addRecentVisitMember(befly, recentKey, member, now);
+    await expireTongJiRedisKeys(befly, [dayKey, monthKey], VISIT_STATS_REDIS_TTL_SECONDS);
+
+    if (productCode) {
+        const dayProductKey = getVisitStatsDayProductMembersKey(reportDate, productCode);
+        const monthProductKey = getVisitStatsMonthProductMembersKey(monthStartDate, productCode);
+        const recentProductKey = getVisitStatsRecentProductMembersKey(productCode);
+
+        await befly.redis.sadd(dayProductKey, [member]);
+        await befly.redis.sadd(monthProductKey, [member]);
+        await addRecentVisitMember(befly, recentProductKey, member, now);
+        await expireTongJiRedisKeys(befly, [dayProductKey, monthProductKey], VISIT_STATS_REDIS_TTL_SECONDS);
+    }
 
-    await updateInfoStatsPeriodRedis(befly, "day", reportDate, statData, now);
-    await updateInfoStatsPeriodRedis(befly, "week", weekStartDate, statData, now);
-    await updateInfoStatsPeriodRedis(befly, "month", monthStartDate, statData, now);
+    return dayAdded > 0;
 }
 
 export default {
-    name: "上报访问信息统计",
+    name: "上报独立访客统计",
     method: "POST",
     body: "none",
     auth: false,
     fields: {
-        pagePath: infoReportTable.pagePath,
-        pageName: infoReportTable.pageName,
-        source: infoReportTable.source,
-        productName: infoReportTable.productName,
-        productCode: infoReportTable.productCode,
-        productVersion: infoReportTable.productVersion,
-        detail: infoReportTable.detail
+        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 },
+        detail: { name: "扩展详情", input: "string", min: 0, max: 1000 }
     },
     required: [],
     handler: async (befly, ctx) => {
         const now = Date.now();
         const reportDate = getDateYmdNumber(now);
-        const member = getInfoStatsMember(ctx);
-        const tableReady = (await befly.mysql.tableExists("beflyInfoReport")).data === true;
-        let userAgent = "";
 
-        if (!tableReady) {
+        if (!befly.redis) {
             return befly.tool.Yes("上报成功", {
                 reportTime: now,
                 reportDate: reportDate,
@@ -111,81 +79,12 @@ export default {
             });
         }
 
-        if (typeof ctx.req?.headers?.get === "function") {
-            userAgent = ctx.req.headers.get("user-agent") || "";
-        } else if (typeof ctx.headers?.get === "function") {
-            userAgent = ctx.headers.get("user-agent") || "";
-        }
-
-        const uaResult = UAParser(userAgent);
-
-        const detail = await befly.mysql.getOne({
-            table: "beflyInfoReport",
-            where: {
-                reportDate: reportDate,
-                memberKey: member
-            }
-        });
-
-        if (detail.data?.id) {
-            return befly.tool.Yes("上报成功", {
-                reportTime: now,
-                reportDate: reportDate,
-                counted: false,
-                stored: false
-            });
-        }
-
-        const statData = {
-            source: ctx.body.source || "",
-            productName: ctx.body.productName || "",
-            productCode: ctx.body.productCode || "",
-            productVersion: ctx.body.productVersion || "",
-            pagePath: ctx.body.pagePath || "",
-            pageName: ctx.body.pageName || "",
-            deviceType: uaResult.device.type || "desktop",
-            browserName: uaResult.browser.name || "",
-            browserVersion: uaResult.browser.version || "",
-            osName: uaResult.os.name || "",
-            osVersion: uaResult.os.version || "",
-            deviceVendor: uaResult.device.vendor || "",
-            deviceModel: uaResult.device.model || "",
-            engineName: uaResult.engine.name || "",
-            cpuArchitecture: uaResult.cpu.architecture || ""
-        };
-
-        await befly.mysql.insData({
-            table: "beflyInfoReport",
-            data: {
-                reportTime: now,
-                reportDate: reportDate,
-                memberKey: member,
-                source: statData.source,
-                productName: statData.productName,
-                productCode: statData.productCode,
-                productVersion: statData.productVersion,
-                pagePath: statData.pagePath,
-                pageName: statData.pageName,
-                detail: ctx.body.detail || "",
-                userAgent: userAgent,
-                deviceType: statData.deviceType,
-                browserName: statData.browserName,
-                browserVersion: statData.browserVersion,
-                osName: statData.osName,
-                osVersion: statData.osVersion,
-                deviceVendor: statData.deviceVendor,
-                deviceModel: statData.deviceModel,
-                engineName: statData.engineName,
-                cpuArchitecture: statData.cpuArchitecture
-            }
-        });
-
-        await updateInfoStatsRedis(befly, now, reportDate, statData);
+        const counted = await updateVisitStatsRedis(befly, now, reportDate, getVisitStatsMember(ctx), ctx.body?.productCode || "");
 
         return befly.tool.Yes("上报成功", {
             reportTime: now,
             reportDate: reportDate,
-            counted: true,
+            counted: counted,
             stored: true
         });
     }