befly 3.63.0 → 3.65.0

package/apis/auth/login.js

@@ -1,4 +1,5 @@
 import adminTable from "#befly/tables/admin.json";
+import loginLogTable from "#befly/tables/loginLog.json";
 import { toSessionTtlSeconds } from "#befly/utils/util.js";
 
 export default {
@@ -21,61 +22,15 @@ export default {
             min: null,
             max: null
         },
-        clientType: {
-            name: "客户端类型",
-            input: "enum",
-            check: "browser|vscode|desktop|miniapp|app",
-            min: 3,
-            max: 20
-        },
-        productName: {
-            name: "产品名称",
-            input: "string",
-            min: 0,
-            max: 100
-        },
-        productCode: {
-            name: "产品代号",
-            input: "string",
-            min: 0,
-            max: 100
-        },
-        productVersion: {
-            name: "产品版本",
-            input: "string",
-            min: 0,
-            max: 50
-        },
-        clientVersion: {
-            name: "客户端版本",
-            input: "string",
-            min: 0,
-            max: 100
-        },
-        os: {
-            name: "操作系统",
-            input: "string",
-            min: 0,
-            max: 100
-        },
-        system: {
-            name: "系统",
-            input: "string",
-            min: 0,
-            max: 100
-        },
-        brand: {
-            name: "设备品牌",
-            input: "string",
-            min: 0,
-            max: 100
-        },
-        model: {
-            name: "设备型号",
-            input: "string",
-            min: 0,
-            max: 100
-        }
+        clientType: loginLogTable.clientType,
+        productName: loginLogTable.productName,
+        productCode: loginLogTable.productCode,
+        productVersion: loginLogTable.productVersion,
+        clientVersion: loginLogTable.clientVersion,
+        os: loginLogTable.os,
+        system: loginLogTable.system,
+        brand: loginLogTable.brand,
+        model: loginLogTable.model
     },
     required: ["account", "password", "loginType"],
     handler: async (befly, ctx) => {
@@ -86,15 +41,15 @@ export default {
             username: ctx.body.account,
             nickname: "",
             ip: ctx.ip || "",
-            clientType: body.clientType,
-            productName: body.productName || null,
-            productCode: body.productCode || null,
-            productVersion: body.productVersion || null,
-            clientVersion: body.clientVersion || null,
-            os: body.os || null,
-            system: body.system || null,
-            brand: body.brand || null,
-            model: body.model || null,
+            clientType: body.clientType || "",
+            productName: body.productName || "",
+            productCode: body.productCode || "",
+            productVersion: body.productVersion || "",
+            clientVersion: body.clientVersion || "",
+            os: body.os || "",
+            system: body.system || "",
+            brand: body.brand || "",
+            model: body.model || "",
             loginTime: Date.now(),
             loginResult: 0,
             failReason: ""

package/apis/tongJi/dailyReportSelect.js

@@ -0,0 +1,36 @@
+import { queryFields } from "#befly/apis/_apis.js";
+import dailyReportTable from "#befly/tables/dailyReport.json";
+
+export default {
+    name: "获取日报记录列表",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        ...queryFields,
+        productCode: dailyReportTable.productCode,
+        clientType: dailyReportTable.clientType,
+        reportDate: dailyReportTable.reportDate,
+        memberType: dailyReportTable.memberType
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const result = await befly.mysql.getList({
+            table: "beflyDailyReport",
+            where: {
+                productCode$like$or: ctx.body.productCode,
+                clientType: ctx.body.clientType,
+                memberType: ctx.body.memberType,
+                reportDate: ctx.body.reportDate,
+                productName$like$or: ctx.body.keyword,
+                member$like$or: ctx.body.keyword,
+                clientId$like$or: ctx.body.keyword
+            },
+            page: ctx.body.page,
+            limit: ctx.body.limit,
+            orderBy: ["id#desc"]
+        });
+
+        return befly.tool.Yes("获取成功", result.data);
+    }
+};

package/apis/tongJi/dailyStats.js

@@ -86,7 +86,23 @@ function buildProductSummary(item, stats, todayCount) {
     };
 }
 
-async function buildDailyStatsProducts(befly, projectLists, history, dateStats) {
+async function loadProjectLists(befly) {
+    if (!befly.mysql) {
+        return [];
+    }
+
+    const result = await befly.mysql.getAll({
+        table: "beflyProject",
+        fields: ["code", "name"],
+        where: { state: 1 },
+        orderBy: ["sort#asc"]
+    });
+
+    return result.data?.lists || [];
+}
+
+async function buildDailyStatsProducts(befly, history, dateStats) {
+    const projectLists = await loadProjectLists(befly);
     const products = await Promise.all(
         projectLists.map(async (item) => {
             const stats = history[item.code] || { yesterday: 0, dayBeforeYesterday: 0, month: 0, lastMonth: 0 };
@@ -131,7 +147,6 @@ export default {
         const [previousMonthStartDate, previousMonthEndDate] = getPreviousMonthDateRange(reportDate);
         const recentDateList = getTongJiRecentDateList(now, DAILY_STATS_DAY_LIMIT, befly.config?.tz);
         const productCode = ctx.body?.productCode ?? "";
-        const projectLists = productCode ? [] : befly.config?.projectLists || [];
         const dateStats = {
             reportDate: reportDate,
             yesterdayDate: recentDateList[recentDateList.length - 2],
@@ -144,7 +159,7 @@ export default {
         const history = await loadHistory(befly, reportDate, dateStats);
         const todayCount = productCode ? await getTodayCount(befly, reportDate, productCode) : 0;
         const summary = productCode ? buildFullSummary(history[productCode] || { yesterday: 0, dayBeforeYesterday: 0, month: 0, lastMonth: 0 }, dateStats, todayCount) : null;
-        const products = await buildDailyStatsProducts(befly, projectLists, history, dateStats);
+        const products = productCode ? [] : await buildDailyStatsProducts(befly, history, dateStats);
 
         return befly.tool.Yes("获取成功", {
             queryTime: now,

package/apis/tongJi/errorReport.js

@@ -108,7 +108,7 @@ export default {
             };
 
             try {
-                await befly.mysql.insData({ table: "errorReport", data: data });
+                await befly.mysql.insData({ table: "beflyErrorReport", data: data });
                 stored = true;
             } catch (error) {
                 Logger.error("errorReport 插入失败", error);

package/apis/tongJi/projectDelete.js

@@ -0,0 +1,20 @@
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "删除产品",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        id: projectTable.id
+    },
+    required: ["id"],
+    handler: async (befly, ctx) => {
+        await befly.mysql.delData({
+            table: "beflyProject",
+            where: { id: ctx.body.id }
+        });
+
+        return befly.tool.Yes("删除成功");
+    }
+};

package/apis/tongJi/projectInsert.js

@@ -0,0 +1,35 @@
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "添加产品",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        code: projectTable.code,
+        name: projectTable.name,
+        sort: projectTable.sort
+    },
+    required: ["code", "name"],
+    handler: async (befly, ctx) => {
+        const existing = await befly.mysql.getOne({
+            table: "beflyProject",
+            where: { code: ctx.body.code }
+        });
+
+        if (existing.data?.id) {
+            return befly.tool.No("产品代号已存在");
+        }
+
+        const projectId = await befly.mysql.insData({
+            table: "beflyProject",
+            data: {
+                code: ctx.body.code,
+                name: ctx.body.name,
+                sort: ctx.body.sort
+            }
+        });
+
+        return befly.tool.Yes("添加成功", { id: projectId.data });
+    }
+};

package/apis/tongJi/projectSelect.js

@@ -0,0 +1,31 @@
+import { queryFields } from "#befly/apis/_apis.js";
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "获取产品列表",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        ...queryFields,
+        code: projectTable.code,
+        state: projectTable.state
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const result = await befly.mysql.getList({
+            table: "beflyProject",
+            fields: ["id", "code", "name", "sort", "state", "createdAt", "updatedAt"],
+            where: {
+                code$like$or: ctx.body.code,
+                name$like$or: ctx.body.keyword,
+                state: ctx.body.state
+            },
+            page: ctx.body.page,
+            limit: ctx.body.limit,
+            orderBy: ["sort#asc"]
+        });
+
+        return befly.tool.Yes("获取成功", result.data);
+    }
+};

package/apis/tongJi/projectUpdate.js

@@ -0,0 +1,52 @@
+import projectTable from "#befly/tables/project.json";
+
+export default {
+    name: "更新产品",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        id: projectTable.id,
+        code: projectTable.code,
+        name: projectTable.name,
+        sort: projectTable.sort,
+        state: projectTable.state
+    },
+    required: ["id"],
+    handler: async (befly, ctx) => {
+        const current = await befly.mysql.getOne({
+            table: "beflyProject",
+            where: { id: ctx.body.id }
+        });
+
+        if (!current.data?.id) {
+            return befly.tool.No("产品不存在");
+        }
+
+        if (ctx.body.code !== undefined && ctx.body.code !== current.data.code) {
+            const existing = await befly.mysql.getOne({
+                table: "beflyProject",
+                where: { code: ctx.body.code }
+            });
+
+            if (existing.data?.id) {
+                return befly.tool.No("产品代号已存在");
+            }
+        }
+
+        const updateData = {};
+
+        if (ctx.body.code !== undefined) updateData.code = ctx.body.code;
+        if (ctx.body.name !== undefined) updateData.name = ctx.body.name;
+        if (ctx.body.sort !== undefined) updateData.sort = ctx.body.sort;
+        if (ctx.body.state !== undefined) updateData.state = ctx.body.state;
+
+        await befly.mysql.updData({
+            table: "beflyProject",
+            data: updateData,
+            where: { id: ctx.body.id }
+        });
+
+        return befly.tool.Yes("更新成功");
+    }
+};

package/configs/beflyMenus.json

@@ -5,9 +5,26 @@
         "sort": 0
     },
     {
-        "name": "项目统计",
-        "path": "/project-stats",
-        "sort": 1
+        "name": "统计管理",
+        "path": "/tong-ji",
+        "sort": 2,
+        "children": [
+            {
+                "name": "统计数据",
+                "path": "/statistics-data",
+                "sort": 1
+            },
+            {
+                "name": "项目管理",
+                "path": "/project-manage",
+                "sort": 2
+            },
+            {
+                "name": "统计记录",
+                "path": "/statistics-record",
+                "sort": 3
+            }
+        ]
     },
     {
         "name": "人员管理",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.63.0",
+    "version": "3.65.0",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/sql/befly.sql

@@ -255,3 +255,17 @@ CREATE TABLE IF NOT EXISTS `befly_error_report` (
     KEY `idx_befly_error_report_product_code_report_time` (`product_code`, `report_time`),
     KEY `idx_befly_error_report_error_type_report_time` (`error_type`, `report_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+CREATE TABLE IF NOT EXISTS `befly_project` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
+    `code` VARCHAR(100) NOT NULL DEFAULT '',
+    `name` VARCHAR(100) NOT NULL DEFAULT '',
+    `sort` INT 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_project_code` (`code`),
+    KEY `idx_befly_project_state` (`state`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/tables/project.json

@@ -0,0 +1,42 @@
+{
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
+    "code": {
+        "name": "产品代号",
+        "input": "string",
+        "min": 1,
+        "max": 100
+    },
+    "name": {
+        "name": "产品名称",
+        "input": "string",
+        "min": 1,
+        "max": 100
+    },
+    "sort": {
+        "name": "排序",
+        "input": "number",
+        "max": 9999
+    },
+    "state": {
+        "name": "状态（0=已删除，1=正常，2=禁用）",
+        "input": "enumInteger",
+        "check": "0|1|2"
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
+    }
+}