befly 3.62.0 → 3.64.0

package/sql/befly.sql

@@ -31,6 +31,33 @@ CREATE TABLE IF NOT EXISTS `befly_api` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
+CREATE TABLE IF NOT EXISTS `befly_daily_report` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
+    `report_time` BIGINT NOT NULL DEFAULT 0,
+    `report_date` INT NOT NULL DEFAULT 0,
+    `member_type` VARCHAR(6) NOT NULL DEFAULT '',
+    `member` VARCHAR(500) NOT NULL DEFAULT '',
+    `user_id` BIGINT NOT NULL DEFAULT 0,
+    `client_id` VARCHAR(120) NOT NULL DEFAULT '',
+    `ip` VARCHAR(50) NOT NULL DEFAULT '',
+    `client_type` VARCHAR(20) NOT NULL DEFAULT '',
+    `product_name` VARCHAR(100) NOT NULL DEFAULT '',
+    `product_code` VARCHAR(100) NOT NULL DEFAULT '',
+    `product_version` VARCHAR(50) NOT NULL DEFAULT '',
+    `client_version` VARCHAR(100) NOT NULL DEFAULT '',
+    `os` VARCHAR(100) NOT NULL DEFAULT '',
+    `system` VARCHAR(100) NOT NULL DEFAULT '',
+    `brand` VARCHAR(100) NOT NULL DEFAULT '',
+    `model` VARCHAR(100) NOT NULL DEFAULT '',
+    `state` TINYINT NOT NULL DEFAULT 1,
+    `created_at` BIGINT NOT NULL DEFAULT 0,
+    `updated_at` BIGINT NOT NULL DEFAULT 0,
+    `deleted_at` BIGINT NULL DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_befly_daily_report_report_date_member` (`report_date`, `member`),
+    KEY `idx_befly_daily_report_report_date_product_code` (`report_date`, `product_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
 CREATE TABLE IF NOT EXISTS `befly_dict` (
     `id` BIGINT NOT NULL,
     `type_code` VARCHAR(50) NOT NULL DEFAULT '',
@@ -100,21 +127,20 @@ CREATE TABLE IF NOT EXISTS `befly_file` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_login_log` (
-    `id` BIGINT NOT NULL,
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
     `admin_id` BIGINT NOT NULL DEFAULT 0,
     `username` VARCHAR(50) NOT NULL DEFAULT '',
     `nickname` VARCHAR(50) NOT NULL DEFAULT '',
     `ip` VARCHAR(50) NOT NULL DEFAULT '',
-    `user_agent` VARCHAR(500) NOT NULL DEFAULT '',
-    `browser_name` VARCHAR(50) NOT NULL DEFAULT '',
-    `browser_version` VARCHAR(50) NOT NULL DEFAULT '',
-    `os_name` VARCHAR(50) NOT NULL DEFAULT '',
-    `os_version` VARCHAR(50) NOT NULL DEFAULT '',
-    `device_type` VARCHAR(20) NOT NULL DEFAULT '',
-    `device_vendor` VARCHAR(50) NOT NULL DEFAULT '',
-    `device_model` VARCHAR(50) NOT NULL DEFAULT '',
-    `engine_name` VARCHAR(50) NOT NULL DEFAULT '',
-    `cpu_architecture` VARCHAR(20) NOT NULL DEFAULT '',
+    `client_type` VARCHAR(20) NOT NULL DEFAULT '',
+    `product_name` VARCHAR(100) NOT NULL DEFAULT '',
+    `product_code` VARCHAR(100) NOT NULL DEFAULT '',
+    `product_version` VARCHAR(50) NOT NULL DEFAULT '',
+    `client_version` VARCHAR(100) NOT NULL DEFAULT '',
+    `os` VARCHAR(100) NOT NULL DEFAULT '',
+    `system` VARCHAR(100) NOT NULL DEFAULT '',
+    `brand` VARCHAR(100) NOT NULL DEFAULT '',
+    `model` VARCHAR(100) NOT NULL DEFAULT '',
     `login_time` BIGINT NOT NULL DEFAULT 0,
     `login_result` TINYINT NOT NULL DEFAULT 0,
     `fail_reason` VARCHAR(200) NOT NULL DEFAULT '',
@@ -122,7 +148,8 @@ CREATE TABLE IF NOT EXISTS `befly_login_log` (
     `created_at` BIGINT NOT NULL DEFAULT 0,
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
-    PRIMARY KEY (`id`)
+    PRIMARY KEY (`id`),
+    KEY `idx_befly_login_log_login_time` (`login_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_menu` (
@@ -194,13 +221,19 @@ CREATE TABLE IF NOT EXISTS `befly_sys_config` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 CREATE TABLE IF NOT EXISTS `befly_error_report` (
-    `id` BIGINT NOT NULL,
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
     `report_time` BIGINT NOT NULL DEFAULT 0,
     `first_report_time` BIGINT NOT NULL DEFAULT 0,
+    `last_report_time` BIGINT NOT NULL DEFAULT 0,
     `bucket_time` BIGINT NOT NULL DEFAULT 0,
     `bucket_date` INT NOT NULL DEFAULT 0,
     `hit_count` BIGINT NOT NULL DEFAULT 1,
-    `source` VARCHAR(50) NOT NULL DEFAULT '',
+    `client_type` VARCHAR(20) NOT NULL DEFAULT '',
+    `client_id` VARCHAR(120) NOT NULL DEFAULT '',
+    `member_type` VARCHAR(6) NOT NULL DEFAULT '',
+    `member` VARCHAR(200) NOT NULL DEFAULT '',
+    `user_id` BIGINT NULL DEFAULT NULL,
+    `ip` VARCHAR(50) NULL DEFAULT NULL,
     `product_name` VARCHAR(100) NOT NULL DEFAULT '',
     `product_code` VARCHAR(100) NOT NULL DEFAULT '',
     `product_version` VARCHAR(100) NOT NULL DEFAULT '',
@@ -208,22 +241,31 @@ CREATE TABLE IF NOT EXISTS `befly_error_report` (
     `page_name` VARCHAR(100) NOT NULL DEFAULT '',
     `error_type` VARCHAR(50) NOT NULL DEFAULT '',
     `message` VARCHAR(500) NOT NULL DEFAULT '',
+    `extracted_message` VARCHAR(200) NOT NULL DEFAULT '',
     `detail` TEXT NULL,
-    `user_agent` VARCHAR(500) NOT NULL DEFAULT '',
-    `browser_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `browser_version` VARCHAR(100) NOT NULL DEFAULT '',
-    `os_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `os_version` VARCHAR(100) NOT NULL DEFAULT '',
-    `device_type` VARCHAR(50) NOT NULL DEFAULT '',
-    `device_vendor` VARCHAR(100) NOT NULL DEFAULT '',
-    `device_model` VARCHAR(100) NOT NULL DEFAULT '',
-    `engine_name` VARCHAR(100) NOT NULL DEFAULT '',
-    `cpu_architecture` VARCHAR(100) NOT NULL DEFAULT '',
     `state` TINYINT NOT NULL DEFAULT 1,
     `created_at` BIGINT NOT NULL DEFAULT 0,
     `updated_at` BIGINT NOT NULL DEFAULT 0,
     `deleted_at` BIGINT NULL DEFAULT NULL,
     PRIMARY KEY (`id`),
     KEY `idx_befly_error_report_time` (`report_time`),
-    KEY `idx_befly_error_report_bucket_date` (`bucket_date`)
+    KEY `idx_befly_error_report_bucket_date` (`bucket_date`),
+    UNIQUE KEY `idx_befly_error_report_unique` (`bucket_date`, `error_type`, `extracted_message`, `product_code`, `member`),
+    KEY `idx_befly_error_report_bucket_date_error_type` (`bucket_date`, `error_type`),
+    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/dailyReport.json

@@ -0,0 +1,124 @@
+{
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null,
+        "detail": "1"
+    },
+    "reportTime": {
+        "name": "上报时间戳",
+        "input": "number",
+        "detail": "1720875600000"
+    },
+    "reportDate": {
+        "name": "上报日期",
+        "input": "integer",
+        "detail": "20260713"
+    },
+    "memberType": {
+        "name": "成员类型",
+        "input": "enum",
+        "check": "user|client|ip",
+        "min": 2,
+        "max": 6,
+        "detail": "user"
+    },
+    "member": {
+        "name": "成员标识",
+        "input": "string",
+        "max": 500,
+        "detail": "user:42:befly-admin"
+    },
+    "userId": {
+        "name": "用户ID",
+        "input": "integer",
+        "detail": "42"
+    },
+    "clientId": {
+        "name": "客户端标识",
+        "input": "string",
+        "max": 120,
+        "detail": "1691234567890-a1b2c3d4"
+    },
+    "ip": {
+        "name": "IP地址",
+        "input": "string",
+        "max": 50,
+        "detail": "192.168.1.1"
+    },
+    "clientType": {
+        "name": "客户端类型",
+        "input": "enum",
+        "check": "browser|vscode|desktop|miniapp|app",
+        "min": 3,
+        "max": 20,
+        "detail": "browser"
+    },
+    "productName": {
+        "name": "产品名称",
+        "input": "string",
+        "max": 100,
+        "detail": "Befly 后台管理"
+    },
+    "productCode": {
+        "name": "产品代号",
+        "input": "string",
+        "max": 100,
+        "detail": "befly-admin"
+    },
+    "productVersion": {
+        "name": "产品版本",
+        "input": "string",
+        "max": 50,
+        "detail": "1.2.3"
+    },
+    "clientVersion": {
+        "name": "客户端版本",
+        "input": "string",
+        "max": 100,
+        "detail": "1.90.0"
+    },
+    "os": {
+        "name": "操作系统",
+        "input": "string",
+        "max": 100,
+        "detail": "Android 14"
+    },
+    "system": {
+        "name": "系统",
+        "input": "string",
+        "max": 100,
+        "detail": "iOS 17.0"
+    },
+    "brand": {
+        "name": "设备品牌",
+        "input": "string",
+        "max": 100,
+        "detail": "Apple"
+    },
+    "model": {
+        "name": "设备型号",
+        "input": "string",
+        "max": 100,
+        "detail": "TAS-AN00"
+    },
+    "state": {
+        "name": "状态（0=已删除，1=正常，2=禁用）",
+        "input": "enumInteger",
+        "check": "0|1|2"
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number",
+        "detail": "1720875600000"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
+    }
+}

package/tables/errorReport.json

@@ -21,15 +21,6 @@
         "name": "时间桶日期",
         "input": "number"
     },
-    "hitCount": {
-        "name": "命中次数",
-        "input": "number"
-    },
-    "source": {
-        "name": "来源",
-        "input": "string",
-        "max": 50
-    },
     "productName": {
         "name": "产品名称",
         "input": "string",
@@ -65,60 +56,52 @@
         "input": "string",
         "max": 500
     },
+    "extractedMessage": {
+        "name": "提取的错误信息",
+        "input": "string",
+        "max": 200
+    },
     "detail": {
         "name": "错误详情",
         "input": "string",
         "max": 5000
     },
-    "userAgent": {
-        "name": "用户代理",
-        "input": "string",
-        "max": 500
+    "clientType": {
+        "name": "客户端类型",
+        "input": "enum",
+        "check": "browser|vscode|desktop|miniapp|app",
+        "min": 3,
+        "max": 20
     },
-    "browserName": {
-        "name": "浏览器名称",
+    "clientId": {
+        "name": "客户端标识",
         "input": "string",
-        "max": 100
+        "max": 120
     },
-    "browserVersion": {
-        "name": "浏览器版本",
-        "input": "string",
-        "max": 100
+    "memberType": {
+        "name": "成员类型",
+        "input": "enum",
+        "check": "user|client|ip",
+        "min": 2,
+        "max": 6
     },
-    "osName": {
-        "name": "操作系统名称",
+    "member": {
+        "name": "成员标识",
         "input": "string",
-        "max": 100
+        "max": 200
     },
-    "osVersion": {
-        "name": "操作系统版本",
-        "input": "string",
-        "max": 100
+    "userId": {
+        "name": "用户ID",
+        "input": "integer"
     },
-    "deviceType": {
-        "name": "设备类型",
+    "ip": {
+        "name": "IP地址",
         "input": "string",
         "max": 50
     },
-    "deviceVendor": {
-        "name": "设备厂商",
-        "input": "string",
-        "max": 100
-    },
-    "deviceModel": {
-        "name": "设备型号",
-        "input": "string",
-        "max": 100
-    },
-    "engineName": {
-        "name": "引擎名称",
-        "input": "string",
-        "max": 100
-    },
-    "cpuArchitecture": {
-        "name": "CPU架构",
-        "input": "string",
-        "max": 100
+    "lastReportTime": {
+        "name": "最后上报时间",
+        "input": "number"
     },
     "state": {
         "name": "状态（0=已删除，1=正常，2=禁用）",

package/tables/loginLog.json

@@ -25,55 +25,52 @@
         "input": "string",
         "max": 50
     },
-    "userAgent": {
-        "name": "用户代理",
-        "input": "string",
-        "max": 500
-    },
-    "browserName": {
-        "name": "浏览器名称",
-        "input": "string",
-        "max": 50
+    "clientType": {
+        "name": "客户端类型",
+        "input": "enum",
+        "check": "browser|vscode|desktop|miniapp|app",
+        "min": 3,
+        "max": 20
     },
-    "browserVersion": {
-        "name": "浏览器版本",
+    "productName": {
+        "name": "产品名称",
         "input": "string",
-        "max": 50
+        "max": 100
     },
-    "osName": {
-        "name": "操作系统",
+    "productCode": {
+        "name": "产品代号",
         "input": "string",
-        "max": 50
+        "max": 100
     },
-    "osVersion": {
-        "name": "系统版本",
+    "productVersion": {
+        "name": "产品版本",
         "input": "string",
         "max": 50
     },
-    "deviceType": {
-        "name": "设备类型",
+    "clientVersion": {
+        "name": "客户端版本",
         "input": "string",
-        "max": 20
+        "max": 100
     },
-    "deviceVendor": {
-        "name": "设备厂商",
+    "os": {
+        "name": "操作系统",
         "input": "string",
-        "max": 50
+        "max": 100
     },
-    "deviceModel": {
-        "name": "设备型号",
+    "system": {
+        "name": "系统",
         "input": "string",
-        "max": 50
+        "max": 100
     },
-    "engineName": {
-        "name": "引擎名称",
+    "brand": {
+        "name": "设备品牌",
         "input": "string",
-        "max": 50
+        "max": 100
     },
-    "cpuArchitecture": {
-        "name": "CPU架构",
+    "model": {
+        "name": "设备型号",
         "input": "string",
-        "max": 20
+        "max": 100
     },
     "loginTime": {
         "name": "登录时间",

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"
+    }
+}

package/utils/is.js

@@ -346,44 +346,11 @@ export function isEmpty(value) {
 }
 
 /**
- * 判断当前进程是否为主进程（针对 PM2 cluster 常见环境变量）。
+ * 判断当前进程是否为主进程。
+ * PM2 cluster 的实例 0 是主进程；未由 PM2 启动时视为主进程。
  */
 export function isPrimaryProcess(env) {
-    const sourceEnv = env && typeof env === "object" ? env : process.env;
-
-    const bunWorkerId = sourceEnv.BUN_WORKER_ID;
-    if (bunWorkerId !== undefined && bunWorkerId !== null) {
-        const normalizedBunWorkerId = String(bunWorkerId).trim();
-        if (normalizedBunWorkerId === "" || normalizedBunWorkerId === "0") {
-            return true;
-        }
-        const bunWorkerIdNumber = Number(normalizedBunWorkerId);
-        if (Number.isInteger(bunWorkerIdNumber) && bunWorkerIdNumber >= 0) {
-            return bunWorkerIdNumber === 0;
-        }
-        return false;
-    }
-
-    const pm2InstanceIdRaw = sourceEnv.NODE_APP_INSTANCE ?? sourceEnv.PM2_INSTANCE_ID ?? sourceEnv.pm_id;
-    if (pm2InstanceIdRaw !== undefined && pm2InstanceIdRaw !== null) {
-        const normalizedPm2InstanceId = String(pm2InstanceIdRaw).trim();
-        if (normalizedPm2InstanceId === "0") {
-            return true;
-        }
-        const pm2InstanceIdNumber = Number(normalizedPm2InstanceId);
-        if (Number.isInteger(pm2InstanceIdNumber) && pm2InstanceIdNumber >= 0) {
-            return pm2InstanceIdNumber === 0;
-        }
-        return false;
-    }
-
-    const execMode = String(sourceEnv.exec_mode || sourceEnv.NODE_EXEC_MODE || "").toLowerCase();
-    const hasPm2Markers = sourceEnv.PM2_HOME !== undefined || sourceEnv.pm_exec_path !== undefined || sourceEnv.PM2_USAGE !== undefined || execMode.includes("cluster");
-    if (hasPm2Markers) {
-        return false;
-    }
-
-    return true;
+    return env.NODE_APP_INSTANCE === "0" || env.NODE_APP_INSTANCE === undefined;
 }
 
 export const isDirentDirectory = (parentDir, entry) => {