befly 3.24.19 → 3.25.0

package/apis/tongJi/fallbackReset.js

@@ -1,5 +1,7 @@
 import { getDateYmdNumber } from "#root/utils/datetime.js";
 
+import { getTongJiNumber } from "./_tongJi.js";
+
 const INFO_STATS_FALLBACK_COUNT_KEY = "stats:fallback:infoStats:count";
 const ERROR_STATS_FALLBACK_COUNT_KEY = "stats:fallback:errorStats:count";
 
@@ -11,16 +13,6 @@ function getErrorStatsFallbackDailyCountKey(reportDate) {
     return `stats:fallback:errorStats:count:day:${reportDate}`;
 }
 
-function toNumber(value) {
-    const num = Number(value);
-
-    if (!Number.isFinite(num)) {
-        return 0;
-    }
-
-    return num;
-}
-
 export default {
     name: "重置统计回退计数",
     method: "POST",
@@ -40,11 +32,11 @@ export default {
         const errorDailyKey = getErrorStatsFallbackDailyCountKey(reportDate);
         const resetKeys = [INFO_STATS_FALLBACK_COUNT_KEY, ERROR_STATS_FALLBACK_COUNT_KEY, infoDailyKey, errorDailyKey];
         const before = {
-            infoStats: toNumber(await befly.redis.getString(INFO_STATS_FALLBACK_COUNT_KEY)),
-            errorStats: toNumber(await befly.redis.getString(ERROR_STATS_FALLBACK_COUNT_KEY)),
+            infoStats: getTongJiNumber(await befly.redis.getString(INFO_STATS_FALLBACK_COUNT_KEY)),
+            errorStats: getTongJiNumber(await befly.redis.getString(ERROR_STATS_FALLBACK_COUNT_KEY)),
             today: {
-                infoStats: toNumber(await befly.redis.getString(infoDailyKey)),
-                errorStats: toNumber(await befly.redis.getString(errorDailyKey))
+                infoStats: getTongJiNumber(await befly.redis.getString(infoDailyKey)),
+                errorStats: getTongJiNumber(await befly.redis.getString(errorDailyKey))
             }
         };
 
@@ -53,7 +45,7 @@ export default {
         return befly.tool.Yes("重置成功", {
             reset: true,
             reportDate: reportDate,
-            removedCount: toNumber(removedCount),
+            removedCount: getTongJiNumber(removedCount),
             keys: resetKeys,
             before: before,
             after: {

package/apis/tongJi/infoReport.js

@@ -1,8 +1,11 @@
 import { UAParser } from "ua-parser-js";
 
-import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+import infoReportTable from "#root/tables/infoReport.json";
+import { getDateYmdNumber } from "#root/utils/datetime.js";
 import { isValidPositiveInt } from "#root/utils/is.js";
 
+import { getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
+
 const INFO_STATS_REDIS_TTL_SECONDS = 45 * 24 * 60 * 60;
 const INFO_STATS_FIELDS = [
     { key: "sources", valueKey: "source" },
@@ -30,20 +33,6 @@ function getInfoStatsMember(ctx) {
     return `ip:${ctx.ip || "unknown"}`;
 }
 
-function getInfoStatsWeekStartDate(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));
-}
-
-function getInfoStatsMonthStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
-
-    return getDateYmdNumber(Reflect.construct(Date, [date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0]).getTime());
-}
-
 function getInfoStatsNamesKey(periodType, periodValue, fieldKey) {
     return `info:${periodType}:${periodValue}:${fieldKey}:names`;
 }
@@ -83,8 +72,8 @@ async function updateInfoStatsRedis(befly, now, reportDate, statData) {
         return;
     }
 
-    const weekStartDate = getInfoStatsWeekStartDate(now);
-    const monthStartDate = getInfoStatsMonthStartDate(now);
+    const weekStartDate = getTongJiWeekStartDate(now);
+    const monthStartDate = getTongJiMonthStartDate(now);
 
     await updateInfoStatsPeriodRedis(befly, "day", reportDate, statData, now);
     await updateInfoStatsPeriodRedis(befly, "week", weekStartDate, statData, now);
@@ -97,13 +86,13 @@ export default {
     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 },
-        detail: { name: "扩展详情", input: "string", min: 0, max: 5000 }
+        pagePath: infoReportTable.pagePath,
+        pageName: infoReportTable.pageName,
+        source: infoReportTable.source,
+        productName: infoReportTable.productName,
+        productCode: infoReportTable.productCode,
+        productVersion: infoReportTable.productVersion,
+        detail: infoReportTable.detail
     },
     required: [],
     handler: async (befly, ctx) => {
@@ -111,7 +100,6 @@ export default {
         const reportDate = getDateYmdNumber(now);
         const member = getInfoStatsMember(ctx);
         const tableReady = (await befly.mysql.tableExists("beflyInfoReport")).data === true;
-        const body = ctx.body || {};
         let userAgent = "";
 
         if (!tableReady) {
@@ -149,12 +137,12 @@ export default {
         }
 
         const statData = {
-            source: body.source || "",
-            productName: body.productName || "",
-            productCode: body.productCode || "",
-            productVersion: body.productVersion || "",
-            pagePath: body.pagePath || "",
-            pageName: body.pageName || "",
+            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 || "",
@@ -178,7 +166,7 @@ export default {
                 productVersion: statData.productVersion,
                 pagePath: statData.pagePath,
                 pageName: statData.pageName,
-                detail: body.detail || "",
+                detail: ctx.body.detail || "",
                 userAgent: userAgent,
                 deviceType: statData.deviceType,
                 browserName: statData.browserName,

package/apis/tongJi/infoStats.js

@@ -1,4 +1,6 @@
-import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+import { getDateYmdNumber } from "#root/utils/datetime.js";
+
+import { getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
 
 const INFO_STATS_FIELDS = [
     { dbField: "source", key: "sources" },
@@ -25,20 +27,6 @@ function getInfoStatsFallbackDailyCountKey(reportDate) {
     return `${INFO_STATS_FALLBACK_DAILY_COUNT_KEY_PREFIX}${reportDate}`;
 }
 
-function getInfoStatsWeekStartDate(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));
-}
-
-function getInfoStatsMonthStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
-
-    return getDateYmdNumber(Reflect.construct(Date, [date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0]).getTime());
-}
-
 function formatInfoStatsList(rows = []) {
     const list = [];
 
@@ -211,8 +199,8 @@ export default {
     handler: async (befly, ctx) => {
         const now = Date.now();
         const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getInfoStatsWeekStartDate(now);
-        const monthStartDate = getInfoStatsMonthStartDate(now);
+        const weekStartDate = getTongJiWeekStartDate(now);
+        const monthStartDate = getTongJiMonthStartDate(now);
         const productName = String(ctx?.body?.productName || "").trim();
         const hasProductFilter = productName.length > 0;
 

package/apis/tongJi/onlineReport.js

@@ -1,6 +1,8 @@
-import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+import { getDateYmdNumber } from "#root/utils/datetime.js";
 import { isValidPositiveInt } from "#root/utils/is.js";
 
+import { expireTongJiRedisKeys, getTongJiMonthStartDate, getTongJiWeekStartDate } from "./_tongJi.js";
+
 const ONLINE_STATS_ONLINE_TTL_SECONDS = 10 * 60;
 const ONLINE_STATS_REDIS_TTL_SECONDS = 7 * 24 * 60 * 60;
 const ONLINE_STATS_TEMP_TTL_SECONDS = 45 * 24 * 60 * 60;
@@ -11,62 +13,42 @@ function getOnlineStatsMember(ctx) {
         return `user:${ctx.userId}`;
     }
 
-    return `ip:${ctx.ip || "unknown"}`;
-}
-
-function getOnlineStatsWeekStartDate(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));
-}
-
-function getOnlineStatsMonthStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
+    const clientId = String(ctx.body.clientId || "").trim();
 
-    return getDateYmdNumber(Reflect.construct(Date, [date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0]).getTime());
-}
-
-function getPeriodKeys(periodType, periodValue) {
-    return {
-        pv: `online:${periodType}:${periodValue}:pv`,
-        members: `online:${periodType}:${periodValue}:members`,
-        reportTime: `online:${periodType}:${periodValue}:reportTime`
-    };
-}
+    if (clientId) {
+        return `client:${clientId}`;
+    }
 
-function getOnlineStatsProductKey(productName) {
-    return encodeURIComponent(String(productName || ""));
+    return `ip:${ctx.ip || "unknown"}`;
 }
 
-function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
-    const productKey = getOnlineStatsProductKey(productName);
+async function updateOnlineStatsActiveMemberProduct(befly, member, productName, expireAt) {
+    const normalizedProductName = String(productName || "").trim();
 
-    return {
-        pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
-        members: `online:${periodType}:${periodValue}:product:${productKey}:members`,
-        reportTime: `online:${periodType}:${periodValue}:product:${productKey}:reportTime`
-    };
-}
+    if (!normalizedProductName) {
+        return;
+    }
 
-function getOnlineStatsProductsKey(periodType, periodValue) {
-    return `online:${periodType}:${periodValue}:products`;
-}
+    const memberProductKey = `online:active:member:${encodeURIComponent(member)}:product`;
+    const previousProductName = String((await befly.redis.getString(memberProductKey)) || "").trim();
 
-async function touchRedisKeys(befly, keys, ttl) {
-    for (const key of keys) {
-        await befly.redis.expire(key, ttl);
+    if (previousProductName && previousProductName !== normalizedProductName) {
+        await befly.redis.zrem(`online:active:product:${encodeURIComponent(previousProductName)}`, [member]);
     }
-}
 
-async function getOnlineStatsOnlineCount(befly) {
-    const now = Date.now();
-    await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
-    return await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
+    const activeProductKey = `online:active:product:${encodeURIComponent(normalizedProductName)}`;
+
+    await befly.redis.setString(memberProductKey, normalizedProductName, ONLINE_STATS_ONLINE_TTL_SECONDS);
+    await befly.redis.zadd(activeProductKey, [
+        {
+            score: expireAt,
+            member: member
+        }
+    ]);
+    await befly.redis.expire(activeProductKey, ONLINE_STATS_REDIS_TTL_SECONDS);
 }
 
-async function updateOnlineStatsActiveMember(befly, member, now) {
+async function updateOnlineStatsActiveMember(befly, member, now, productName) {
     const expireAt = now + ONLINE_STATS_ONLINE_TTL_SECONDS * 1000;
 
     await befly.redis.zadd(ONLINE_STATS_ACTIVE_KEY, [
@@ -75,16 +57,21 @@ async function updateOnlineStatsActiveMember(befly, member, now) {
             member: member
         }
     ]);
+    await updateOnlineStatsActiveMemberProduct(befly, member, productName, expireAt);
     await befly.redis.expire(ONLINE_STATS_ACTIVE_KEY, ONLINE_STATS_REDIS_TTL_SECONDS);
 }
 
 async function updateOnlineStatsPeriod(befly, periodType, periodValue, member) {
-    const keys = getPeriodKeys(periodType, periodValue);
+    const keys = {
+        pv: `online:${periodType}:${periodValue}:pv`,
+        members: `online:${periodType}:${periodValue}:members`,
+        reportTime: `online:${periodType}:${periodValue}:reportTime`
+    };
 
     await befly.redis.incr(keys.pv);
     await befly.redis.sadd(keys.members, [member]);
     await befly.redis.setString(keys.reportTime, String(Date.now()), ONLINE_STATS_TEMP_TTL_SECONDS);
-    await touchRedisKeys(befly, Object.values(keys), ONLINE_STATS_TEMP_TTL_SECONDS);
+    await expireTongJiRedisKeys(befly, Object.values(keys), ONLINE_STATS_TEMP_TTL_SECONDS);
 }
 
 async function updateOnlineStatsProductPeriod(befly, periodType, periodValue, member, productName) {
@@ -92,14 +79,19 @@ async function updateOnlineStatsProductPeriod(befly, periodType, periodValue, me
         return;
     }
 
-    const keys = getOnlineStatsProductPeriodKeys(periodType, periodValue, productName);
-    const productsKey = getOnlineStatsProductsKey(periodType, periodValue);
+    const productKey = encodeURIComponent(productName);
+    const keys = {
+        pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
+        members: `online:${periodType}:${periodValue}:product:${productKey}:members`,
+        reportTime: `online:${periodType}:${periodValue}:product:${productKey}:reportTime`
+    };
+    const productsKey = `online:${periodType}:${periodValue}:products`;
 
     await befly.redis.incr(keys.pv);
     await befly.redis.sadd(keys.members, [member]);
     await befly.redis.setString(keys.reportTime, String(Date.now()), ONLINE_STATS_TEMP_TTL_SECONDS);
     await befly.redis.sadd(productsKey, [productName]);
-    await touchRedisKeys(befly, [...Object.values(keys), productsKey], ONLINE_STATS_TEMP_TTL_SECONDS);
+    await expireTongJiRedisKeys(befly, [...Object.values(keys), productsKey], ONLINE_STATS_TEMP_TTL_SECONDS);
 }
 
 export default {
@@ -111,6 +103,7 @@ export default {
         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 }
@@ -119,14 +112,15 @@ export default {
     handler: async (befly, ctx) => {
         const now = Date.now();
         const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getOnlineStatsWeekStartDate(now);
-        const monthStartDate = getOnlineStatsMonthStartDate(now);
+        const weekStartDate = getTongJiWeekStartDate(now);
+        const monthStartDate = getTongJiMonthStartDate(now);
         const member = getOnlineStatsMember(ctx);
-        const productName = ctx.body?.productName || "";
+        const productName = String(ctx.body.productName || "").trim();
 
-        await updateOnlineStatsActiveMember(befly, member, now);
+        await updateOnlineStatsActiveMember(befly, member, now, productName);
 
-        const onlineCount = await getOnlineStatsOnlineCount(befly);
+        await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
+        const onlineCount = await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
 
         await updateOnlineStatsPeriod(befly, "day", reportDate, member);
         await updateOnlineStatsPeriod(befly, "week", weekStartDate, member);

package/apis/tongJi/onlineStats.js

@@ -1,42 +1,11 @@
-import { addDays, getDateYmdNumber } from "#root/utils/datetime.js";
+import { getDateYmdNumber } from "#root/utils/datetime.js";
+
+import { getTongJiMonthStartDate, getTongJiNumber, getTongJiRecentDateList, getTongJiWeekStartDate } from "./_tongJi.js";
 
 const ONLINE_STATS_DAY_LIMIT = 30;
 const ONLINE_STATS_ACTIVE_KEY = "online:active";
 
-function toOnlineStatsNumber(value) {
-    const num = Number(value);
-
-    if (!Number.isFinite(num)) {
-        return 0;
-    }
-
-    return num;
-}
-
-function getOnlineStatsWeekStartDate(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));
-}
-
-function getOnlineStatsMonthStartDate(timestamp = Date.now()) {
-    const date = Reflect.construct(Date, [timestamp]);
-
-    return getDateYmdNumber(Reflect.construct(Date, [date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0]).getTime());
-}
-
-function getOnlineStatsRecentDateList(now = Date.now(), limit = ONLINE_STATS_DAY_LIMIT) {
-    const list = [];
-
-    for (let i = limit - 1; i >= 0; i--) {
-        list.push(getDateYmdNumber(addDays(now, -i)));
-    }
-
-    return list;
-}
-
+// 构造全量统计的 Redis 键。
 function getPeriodKeys(periodType, periodValue) {
     return {
         pv: `online:${periodType}:${periodValue}:pv`,
@@ -45,12 +14,9 @@ function getPeriodKeys(periodType, periodValue) {
     };
 }
 
-function getOnlineStatsProductKey(productName) {
-    return encodeURIComponent(String(productName || ""));
-}
-
+// 构造单产品统计的 Redis 键。
 function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
-    const productKey = getOnlineStatsProductKey(productName);
+    const productKey = encodeURIComponent(productName);
 
     return {
         pv: `online:${periodType}:${periodValue}:product:${productKey}:pv`,
@@ -59,78 +25,84 @@ function getOnlineStatsProductPeriodKeys(periodType, periodValue, productName) {
     };
 }
 
-function getOnlineStatsProductsKey(periodType, periodValue) {
-    return `online:${periodType}:${periodValue}:products`;
+// 构造单产品实时在线集合的 Redis 键。
+function getOnlineStatsActiveProductKey(productName) {
+    const productKey = encodeURIComponent(productName);
+
+    return `online:active:product:${productKey}`;
 }
 
+// 读取 Redis 字符串并转成统计数字。
 async function getRedisNumber(befly, key) {
-    return toOnlineStatsNumber(await befly.redis.getString(key));
+    return getTongJiNumber(await befly.redis.getString(key));
 }
 
+// 读取某个周期的全量统计数据。
 async function getOnlineStatsPeriodData(befly, periodType, periodValue) {
     const keys = getPeriodKeys(periodType, periodValue);
     return {
         reportTime: await getRedisNumber(befly, keys.reportTime),
         pv: await getRedisNumber(befly, keys.pv),
-        uv: toOnlineStatsNumber(await befly.redis.scard(keys.members))
+        uv: getTongJiNumber(await befly.redis.scard(keys.members))
     };
 }
 
-async function getOnlineStatsPeriodDataByProduct(befly, periodType, periodValue, productName) {
-    if (!productName) {
-        return await getOnlineStatsPeriodData(befly, periodType, periodValue);
-    }
-
-    return await getOnlineStatsProductPeriodData(befly, periodType, periodValue, productName);
-}
-
+// 读取某个周期的单产品统计数据。
 async function getOnlineStatsProductPeriodData(befly, periodType, periodValue, productName) {
     const keys = getOnlineStatsProductPeriodKeys(periodType, periodValue, productName);
 
     return {
         reportTime: await getRedisNumber(befly, keys.reportTime),
         pv: await getRedisNumber(befly, keys.pv),
-        uv: toOnlineStatsNumber(await befly.redis.scard(keys.members))
+        uv: getTongJiNumber(await befly.redis.scard(keys.members))
     };
 }
 
-async function getOnlineStatsProductNames(befly, recentDateList) {
-    const productSet = new Set();
-
-    for (const item of recentDateList) {
-        for (const productName of await befly.redis.smembers(getOnlineStatsProductsKey("day", item))) {
-            if (!productName) {
-                continue;
-            }
-
-            productSet.add(String(productName));
-        }
-    }
+// 清理过期成员后返回全站实时在线人数。
+async function getOnlineStatsTotalOnlineCount(befly) {
+    const now = Date.now();
 
-    return Array.from(productSet.values());
+    await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
+    return await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
 }
 
-async function getOnlineStatsOnlineCount(befly) {
+// 清理过期成员后返回单产品实时在线人数。
+async function getOnlineStatsProductOnlineCount(befly, productName) {
     const now = Date.now();
-    await befly.redis.zremrangebyscore(ONLINE_STATS_ACTIVE_KEY, "-inf", now);
-    return await befly.redis.zcard(ONLINE_STATS_ACTIVE_KEY);
+    const productKey = getOnlineStatsActiveProductKey(productName);
+
+    await befly.redis.zremrangebyscore(productKey, "-inf", now);
+    return await befly.redis.zcard(productKey);
 }
 
-function sumProductTrendField(list, field) {
-    let total = 0;
+// 构造全量统计的按天趋势列表。
+async function buildOnlineStatsDays(befly, recentDateList) {
+    const days = [];
+
+    for (const item of recentDateList) {
+        const dayData = await getOnlineStatsPeriodData(befly, "day", item);
+
+        if (dayData.reportTime <= 0) {
+            continue;
+        }
 
-    for (const item of list) {
-        total += toOnlineStatsNumber(item?.[field]);
+        days.push({
+            reportDate: item,
+            reportTime: dayData.reportTime,
+            pv: dayData.pv,
+            uv: dayData.uv
+        });
     }
 
-    return total;
+    return days;
 }
 
-async function buildOnlineStatsDays(befly, recentDateList, productName) {
+// 构造单产品统计的按天趋势列表。
+async function buildOnlineStatsProductDays(befly, recentDateList, productName) {
     const days = [];
 
     for (const item of recentDateList) {
-        const dayData = await getOnlineStatsPeriodDataByProduct(befly, "day", item, productName);
+        const dayData = await getOnlineStatsProductPeriodData(befly, "day", item, productName);
 
         if (dayData.reportTime <= 0) {
             continue;
@@ -147,34 +119,29 @@ async function buildOnlineStatsDays(befly, recentDateList, productName) {
     return days;
 }
 
-async function buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, productNames) {
+// 按配置项目列表构造项目统计，并按近 30 天 PV 排序。
+async function buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, projectLists) {
     const products = [];
 
-    for (const productItemName of productNames) {
-        const productDays = [];
+    for (const item of projectLists) {
+        const productDays = await buildOnlineStatsProductDays(befly, recentDateList, item.productName);
+        let totalPv = 0;
 
-        for (const item of recentDateList) {
-            const dayData = await getOnlineStatsProductPeriodData(befly, "day", item, productItemName);
-
-            if (dayData.reportTime <= 0) {
-                continue;
-            }
-
-            productDays.push({
-                reportDate: item,
-                reportTime: dayData.reportTime,
-                pv: dayData.pv,
-                uv: dayData.uv
-            });
+        for (const productDay of productDays) {
+            totalPv += productDay.pv;
         }
 
-        const productToday = await getOnlineStatsProductPeriodData(befly, "day", reportDate, productItemName);
-        const productWeek = await getOnlineStatsProductPeriodData(befly, "week", weekStartDate, productItemName);
-        const productMonth = await getOnlineStatsProductPeriodData(befly, "month", monthStartDate, productItemName);
+        const productToday = await getOnlineStatsProductPeriodData(befly, "day", reportDate, item.productName);
+        const productWeek = await getOnlineStatsProductPeriodData(befly, "week", weekStartDate, item.productName);
+        const productMonth = await getOnlineStatsProductPeriodData(befly, "month", monthStartDate, item.productName);
+        const productOnlineCount = await getOnlineStatsProductOnlineCount(befly, item.productName);
 
         products.push({
-            key: productItemName,
-            productName: productItemName,
+            key: item.productCode,
+            productName: item.productName,
+            productCode: item.productCode,
+            productVersion: item.productVersion || "",
+            onlineCount: productOnlineCount,
             today: {
                 pv: productToday.pv,
                 uv: productToday.uv
@@ -188,18 +155,23 @@ async function buildOnlineStatsProducts(befly, recentDateList, reportDate, weekS
                 uv: productMonth.uv
             },
             days: productDays,
-            totalPv: sumProductTrendField(productDays, "pv"),
-            totalUv: sumProductTrendField(productDays, "uv")
+            totalPv: totalPv
         });
     }
 
-    return products.toSorted((a, b) => {
+    const sortedProducts = products.toSorted((a, b) => {
         if (b.totalPv !== a.totalPv) {
             return b.totalPv - a.totalPv;
         }
 
         return String(a.productName).localeCompare(String(b.productName), "zh-CN");
     });
+
+    for (const item of sortedProducts) {
+        delete item.totalPv;
+    }
+
+    return sortedProducts;
 }
 
 export default {
@@ -211,22 +183,36 @@ export default {
         productName: { name: "产品名称", input: "string", min: 0, max: 100 }
     },
     required: [],
+    // 汇总当前查询范围的在线统计，并在未筛选产品时附带配置项目统计。
     handler: async (befly, ctx) => {
         const now = Date.now();
         const reportDate = getDateYmdNumber(now);
-        const weekStartDate = getOnlineStatsWeekStartDate(now);
-        const monthStartDate = getOnlineStatsMonthStartDate(now);
-        const recentDateList = getOnlineStatsRecentDateList(now, ONLINE_STATS_DAY_LIMIT);
+        const weekStartDate = getTongJiWeekStartDate(now);
+        const monthStartDate = getTongJiMonthStartDate(now);
+        const recentDateList = getTongJiRecentDateList(now, ONLINE_STATS_DAY_LIMIT);
         const productName = String(ctx?.body?.productName || "").trim();
         const hasProductFilter = productName.length > 0;
-        const days = await buildOnlineStatsDays(befly, recentDateList, productName);
-
-        const currentDay = await getOnlineStatsPeriodDataByProduct(befly, "day", reportDate, productName);
-        const weekCurrent = await getOnlineStatsPeriodDataByProduct(befly, "week", weekStartDate, productName);
-        const monthCurrent = await getOnlineStatsPeriodDataByProduct(befly, "month", monthStartDate, productName);
-        const onlineCount = await getOnlineStatsOnlineCount(befly);
-        const productNames = hasProductFilter ? [] : await getOnlineStatsProductNames(befly, recentDateList);
-        const products = await buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, productNames);
+        const days = hasProductFilter ? await buildOnlineStatsProductDays(befly, recentDateList, productName) : await buildOnlineStatsDays(befly, recentDateList);
+
+        let currentDay;
+        let weekCurrent;
+        let monthCurrent;
+        let onlineCount;
+
+        if (hasProductFilter) {
+            currentDay = await getOnlineStatsProductPeriodData(befly, "day", reportDate, productName);
+            weekCurrent = await getOnlineStatsProductPeriodData(befly, "week", weekStartDate, productName);
+            monthCurrent = await getOnlineStatsProductPeriodData(befly, "month", monthStartDate, productName);
+            onlineCount = await getOnlineStatsProductOnlineCount(befly, productName);
+        } else {
+            currentDay = await getOnlineStatsPeriodData(befly, "day", reportDate);
+            weekCurrent = await getOnlineStatsPeriodData(befly, "week", weekStartDate);
+            monthCurrent = await getOnlineStatsPeriodData(befly, "month", monthStartDate);
+            onlineCount = await getOnlineStatsTotalOnlineCount(befly);
+        }
+
+        const projectLists = hasProductFilter ? [] : befly.config.projectLists;
+        const products = await buildOnlineStatsProducts(befly, recentDateList, reportDate, weekStartDate, monthStartDate, projectLists);
 
         return befly.tool.Yes("获取成功", {
             queryTime: now,