befly 3.21.0 → 3.21.2

package/scripts/syncDb/report.js

@@ -4,25 +4,44 @@ import { dirname } from "node:path";
 import { Logger } from "../../lib/logger.js";
 import { isNonEmptyString } from "../../utils/is.js";
 import { camelCase } from "../../utils/util.js";
-import { countSyncDbMissingFields } from "./diff.js";
 import { toSyncDbFieldDef } from "./transform.js";
 
 export function printSyncDbProcessLog(message) {
     process.stdout.write(`[syncDb] ${message}\n`);
 }
 
-export function printSyncDbDiffSummary(mode, diff) {
+export function printSyncDbDiffSummary(diff) {
     const tableNames = diff.missingTables.map((item) => item.tableName);
+    const extraTableFileNames = diff.extraTables.map((item) => item.tableFileName);
     const missingFieldGroups = Object.values(diff.missingFieldsByTable);
-    const missingFieldCount = countSyncDbMissingFields(diff);
+    const missingFieldCount = resolveSyncDbFieldCount(diff.missingFieldsByTable, diff.missingFieldCount);
+    const extraFieldGroups = Object.values(diff.extraFieldsByTable);
+    const extraFieldCount = resolveSyncDbFieldCount(diff.extraFieldsByTable, diff.extraFieldCount);
 
-    Logger.info("DB 与项目根目录 tables 差异检查完成", {
-        mode: mode,
+    Logger.info("数据库与项目根目录表定义差异检查完成", {
         missingTableCount: diff.missingTables.length,
         missingFieldCount: missingFieldCount,
-        missingTables: tableNames
+        extraTableCount: diff.extraTables.length,
+        extraFieldCount: extraFieldCount,
+        missingTables: tableNames,
+        extraTables: extraTableFileNames
     });
 
+    for (const item of diff.missingTables) {
+        Logger.info("发现缺失表", {
+            tableName: item.tableName,
+            tableFileName: item.tableFileName,
+            columnNames: item.columns.map((column) => column.columnName)
+        });
+    }
+
+    for (const item of diff.extraTables) {
+        Logger.info("发现多余表", {
+            tableFileName: item.tableFileName,
+            filePath: item.filePath
+        });
+    }
+
     for (const item of missingFieldGroups) {
         Logger.info("发现缺失字段", {
             tableName: item.tableName,
@@ -30,6 +49,14 @@ export function printSyncDbDiffSummary(mode, diff) {
             fieldNames: item.fields.map((field) => field.fieldName)
         });
     }
+
+    for (const item of extraFieldGroups) {
+        Logger.info("发现多余字段", {
+            tableName: item.tableName,
+            tableFileName: item.tableFileName,
+            fieldNames: item.fields.map((field) => field.fieldName)
+        });
+    }
 }
 
 function escapeSyncDbMdCell(value) {
@@ -47,144 +74,116 @@ function formatSyncDbValue(value) {
     return String(value);
 }
 
-function buildSyncDbCheckRows(diff) {
-    const rows = [];
-
-    for (const missingTable of diff.missingTables) {
-        for (const columnMeta of missingTable.columns) {
-            const fieldInfo = toSyncDbFieldDef(columnMeta);
-            rows.push({
-                diffType: "缺少表",
-                tableName: missingTable.tableName,
-                tableFileName: `${missingTable.tableFileName}.json`,
-                dbColumnName: columnMeta.columnName,
-                fieldName: fieldInfo.fieldName,
-                dbDataType: columnMeta.dataType,
-                dbColumnType: columnMeta.columnType,
-                dbCharLength: columnMeta.charLength,
-                fieldInput: fieldInfo.fieldDef.input,
-                fieldMax: fieldInfo.fieldDef.max,
-                fieldDisplayName: fieldInfo.fieldDef.name
-            });
-        }
+function resolveSyncDbFieldCount(groups, fieldCount) {
+    if (Number.isInteger(fieldCount) && fieldCount >= 0) {
+        return fieldCount;
     }
 
-    for (const tableInfo of Object.values(diff.missingFieldsByTable)) {
-        for (const fieldItem of tableInfo.fields) {
-            rows.push({
-                diffType: "缺少字段",
-                tableName: tableInfo.tableName,
-                tableFileName: `${tableInfo.tableFileName}.json`,
-                dbColumnName: fieldItem.dbColumnName,
-                fieldName: fieldItem.fieldName,
-                dbDataType: fieldItem.dbDataType,
-                dbColumnType: fieldItem.dbColumnType,
-                dbCharLength: fieldItem.dbCharLength,
-                fieldInput: fieldItem.fieldDef.input,
-                fieldMax: fieldItem.fieldDef.max,
-                fieldDisplayName: fieldItem.fieldDef.name
-            });
-        }
+    let resolvedFieldCount = 0;
+    for (const item of Object.values(groups || {})) {
+        resolvedFieldCount = resolvedFieldCount + item.fields.length;
     }
 
-    return rows;
+    return resolvedFieldCount;
 }
 
-function groupSyncDbDiffRowsByTable(rows) {
-    const grouped = new Map();
-
-    for (const row of rows) {
-        const tableName = String(row.tableName || "-");
-        const tableFileName = String(row.tableFileName || "-");
-        const groupKey = `${tableName}@@${tableFileName}`;
-        if (!grouped.has(groupKey)) {
-            grouped.set(groupKey, {
-                tableName: tableName,
-                tableFileName: tableFileName,
-                rows: []
-            });
-        }
-
-        grouped.get(groupKey).rows.push(row);
-    }
-
-    return Array.from(grouped.values());
+function appendSyncDbMarkdownRow(lines, values) {
+    lines.push(`| ${values.map((item) => escapeSyncDbMdCell(formatSyncDbValue(item))).join(" | ")} |`);
 }
 
-function buildSyncDbAllTableRows(groupedDbColumns, existingTableMap) {
-    const rows = [];
-
-    for (const [tableName, columns] of groupedDbColumns.entries()) {
-        const hasTableDef = existingTableMap.has(String(camelCase(tableName)).toLowerCase()) ? "是" : "否";
-        const tableComment = isNonEmptyString(columns[0]?.tableComment) ? String(columns[0].tableComment).trim() : "-";
-        rows.push({
-            tableName: tableName,
-            tableComment: tableComment,
-            columnCount: columns.length,
-            hasTableDef: hasTableDef
-        });
+function appendSyncDbDiffGroup(lines, tableName, tableFileName, rows) {
+    lines.push(`### ${escapeSyncDbMdCell(formatSyncDbValue(tableName))}（${escapeSyncDbMdCell(formatSyncDbValue(tableFileName))}）`);
+    lines.push("");
+    lines.push("| 差异类型 | 数据库字段名 | 字段标识 | 字段名称 | 字段类型 | 列类型 | 字符串长度 | 推断input | 推断max |");
+    lines.push("|---|---|---|---|---|---|---:|---|---:|");
+    for (const row of rows) {
+        appendSyncDbMarkdownRow(lines, row);
     }
-
-    return rows;
+    lines.push("");
 }
 
-function buildSyncDbCheckMarkdown(diff, groupedDbColumns, existingTableMap) {
-    const allTableRows = buildSyncDbAllTableRows(groupedDbColumns, existingTableMap);
-    const rows = buildSyncDbCheckRows(diff);
-    const diffGroups = groupSyncDbDiffRowsByTable(rows);
-    const missingFieldCount = countSyncDbMissingFields(diff);
+function buildSyncDbReportMarkdown(diff, groupedDbColumns, existingTableMap) {
+    const missingFieldCount = resolveSyncDbFieldCount(diff.missingFieldsByTable, diff.missingFieldCount);
+    const extraFieldCount = resolveSyncDbFieldCount(diff.extraFieldsByTable, diff.extraFieldCount);
+    const hasDiff = diff.missingTables.length > 0 || missingFieldCount > 0 || diff.extraTables.length > 0 || extraFieldCount > 0;
 
     const lines = [];
-    lines.push("# DB 与项目根目录 tables 差异报告");
+    lines.push("# 数据库与项目根目录表定义差异报告");
     lines.push("");
     lines.push(`- 生成时间戳: ${String(Date.now())}`);
-    lines.push(`- 扫描数据库表数量: ${String(allTableRows.length)}`);
+    lines.push(`- 扫描数据库表数量: ${String(groupedDbColumns.size)}`);
     lines.push(`- 缺少表数量: ${String(diff.missingTables.length)}`);
     lines.push(`- 缺少字段数量: ${String(missingFieldCount)}`);
+    lines.push(`- 多余表数量: ${String(diff.extraTables.length)}`);
+    lines.push(`- 多余字段数量: ${String(extraFieldCount)}`);
+    if (diff.missingTables.length > 0) {
+        lines.push(`- 缺少表列表: ${diff.missingTables.map((item) => item.tableName).join(", ")}`);
+    }
+    if (diff.extraTables.length > 0) {
+        lines.push(`- 多余表列表: ${diff.extraTables.map((item) => item.tableFileName).join(", ")}`);
+    }
     lines.push("");
     lines.push("## 全部数据库表信息");
     lines.push("");
-    lines.push("| 数据库表 | 表说明 | 列数量 | tables中是否存在 |\n|---|---|---:|---|");
+    lines.push("| 数据库表 | 表说明 | 列数量 | 表定义中是否存在 |\n|---|---|---:|---|");
 
-    if (allTableRows.length === 0) {
+    if (groupedDbColumns.size === 0) {
         lines.push("| - | - | - | 未扫描到可对比表（可能全部被过滤） |");
     } else {
-        for (const row of allTableRows) {
-            lines.push(`| ${escapeSyncDbMdCell(formatSyncDbValue(row.tableName))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.tableComment))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.columnCount))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.hasTableDef))} |`);
+        for (const [tableName, columns] of groupedDbColumns.entries()) {
+            appendSyncDbMarkdownRow(lines, [tableName, isNonEmptyString(columns[0]?.tableComment) ? String(columns[0].tableComment).trim() : "-", columns.length, existingTableMap.has(String(camelCase(tableName)).toLowerCase()) ? "是" : "否"]);
         }
     }
 
     lines.push("");
     lines.push("## 全部差异信息");
     lines.push("");
-    if (rows.length === 0) {
+    if (!hasDiff) {
         lines.push("- 未发现差异");
         lines.push("");
         return lines.join("\n");
     }
 
-    for (const group of diffGroups) {
-        lines.push(`### ${escapeSyncDbMdCell(formatSyncDbValue(group.tableName))}（${escapeSyncDbMdCell(formatSyncDbValue(group.tableFileName))}）`);
-        lines.push("");
-        lines.push("| 差异类型 | 数据库字段名 | 字段标识 | 字段名称 | 字段类型 | 列类型 | 字符串长度 | 推断input | 推断max |");
-        lines.push("|---|---|---|---|---|---|---:|---|---:|");
-        for (const row of group.rows) {
-            lines.push(`| ${escapeSyncDbMdCell(formatSyncDbValue(row.diffType))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.dbColumnName))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.fieldName))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.fieldDisplayName))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.dbDataType))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.dbColumnType))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.dbCharLength))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.fieldInput))} | ${escapeSyncDbMdCell(formatSyncDbValue(row.fieldMax))} |`);
+    for (const missingTable of diff.missingTables) {
+        const groupRows = [];
+        for (const columnMeta of missingTable.columns) {
+            const fieldInfo = toSyncDbFieldDef(columnMeta);
+            groupRows.push(["缺少表", columnMeta.columnName, fieldInfo.fieldName, fieldInfo.fieldDef.name, columnMeta.dataType, columnMeta.columnType, columnMeta.charLength, fieldInfo.fieldDef.input, fieldInfo.fieldDef.max]);
         }
-        lines.push("");
+        appendSyncDbDiffGroup(lines, missingTable.tableName, `${missingTable.tableFileName}.json`, groupRows);
+    }
+
+    for (const tableInfo of Object.values(diff.missingFieldsByTable)) {
+        const groupRows = [];
+        for (const fieldItem of tableInfo.fields) {
+            groupRows.push(["缺少字段", fieldItem.dbColumnName, fieldItem.fieldName, fieldItem.fieldDef.name, fieldItem.dbDataType, fieldItem.dbColumnType, fieldItem.dbCharLength, fieldItem.fieldDef.input, fieldItem.fieldDef.max]);
+        }
+        appendSyncDbDiffGroup(lines, tableInfo.tableName, `${tableInfo.tableFileName}.json`, groupRows);
+    }
+
+    for (const extraTable of diff.extraTables) {
+        appendSyncDbDiffGroup(lines, "-", `${extraTable.tableFileName}.json`, [["多余表", "-", "-", extraTable.filePath || "-", "-", "-", null, "-", null]]);
+    }
+
+    for (const tableInfo of Object.values(diff.extraFieldsByTable)) {
+        const groupRows = [];
+        for (const fieldItem of tableInfo.fields) {
+            groupRows.push(["多余字段", "-", fieldItem.fieldName, fieldItem.fieldDef?.name, "-", "-", null, fieldItem.fieldDef?.input, fieldItem.fieldDef?.max]);
+        }
+        appendSyncDbDiffGroup(lines, tableInfo.tableName, `${tableInfo.tableFileName}.json`, groupRows);
     }
 
     lines.push("");
     return lines.join("\n");
 }
 
-export async function writeSyncDbCheckReport(reportPath, diff, groupedDbColumns, existingTableMap) {
+export async function writeSyncDbReport(reportPath, diff, groupedDbColumns, existingTableMap) {
     if (!isNonEmptyString(reportPath)) {
         return "";
     }
 
     await mkdir(dirname(reportPath), { recursive: true });
-    const markdown = buildSyncDbCheckMarkdown(diff, groupedDbColumns, existingTableMap);
+    const markdown = buildSyncDbReportMarkdown(diff, groupedDbColumns, existingTableMap);
     await Bun.write(reportPath, markdown);
     printSyncDbProcessLog(`差异报告已写入 ${reportPath}`);
     Logger.info("差异报告写入完成", {

package/sync/dev.js

@@ -23,11 +23,13 @@ export async function syncDev(ctx) {
 
         const devRole = await ctx.mysql.getOne({
             table: ROLE_TABLE_NAME,
+            fields: ["id"],
             where: { code: "dev", state$gte: 0 }
         });
 
         const devAdmin = await ctx.mysql.getOne({
             table: ADMIN_TABLE_NAME,
+            fields: ["id"],
             where: { username: "dev", state$gte: 0 }
         });
 
@@ -133,6 +135,7 @@ export async function syncDev(ctx) {
         for (const roleConfig of roles) {
             const existingRole = await ctx.mysql.getOne({
                 table: ROLE_TABLE_NAME,
+                fields: ["id", "apis"],
                 where: {
                     code: roleConfig.code,
                     state$gte: 0

package/tables/admin.json

@@ -1,4 +1,10 @@
 {
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
     "nickname": {
         "name": "昵称",
         "input": "string",
@@ -57,5 +63,23 @@
         "name": "最后登录IP",
         "input": "string",
         "max": 50
+    },
+    "state": {
+        "name": "状态",
+        "input": "integer",
+        "min": 0,
+        "max": 2
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
     }
 }

package/tables/api.json

@@ -1,4 +1,10 @@
 {
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
     "name": {
         "name": "接口名称",
         "input": "string",
@@ -28,5 +34,23 @@
         "input": "string",
         "min": 1,
         "max": 200
+    },
+    "state": {
+        "name": "状态",
+        "input": "integer",
+        "min": 0,
+        "max": 2
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
     }
 }

package/tables/dict.json

@@ -1,4 +1,10 @@
 {
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
     "typeCode": {
         "name": "字典类型代码",
         "input": "regexp",
@@ -28,5 +34,23 @@
         "name": "备注",
         "input": "string",
         "max": 200
+    },
+    "state": {
+        "name": "状态",
+        "input": "integer",
+        "min": 0,
+        "max": 2
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
     }
 }

package/tables/dictType.json

@@ -1,4 +1,10 @@
 {
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
     "code": {
         "name": "类型代码",
         "input": "regexp",
@@ -21,5 +27,23 @@
         "name": "排序",
         "input": "number",
         "max": 9999
+    },
+    "state": {
+        "name": "状态",
+        "input": "integer",
+        "min": 0,
+        "max": 2
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
     }
 }

package/tables/emailLog.json

@@ -1,4 +1,10 @@
 {
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
     "adminId": {
         "name": "发送人ID",
         "input": "number"
@@ -58,5 +64,23 @@
         "name": "失败原因",
         "input": "string",
         "max": 500
+    },
+    "state": {
+        "name": "状态",
+        "input": "integer",
+        "min": 0,
+        "max": 2
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
     }
 }

package/tables/errorReport.json

@@ -0,0 +1,140 @@
+{
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
+    "reportTime": {
+        "name": "上报时间",
+        "input": "number"
+    },
+    "firstReportTime": {
+        "name": "首次上报时间",
+        "input": "number"
+    },
+    "bucketTime": {
+        "name": "时间桶时间",
+        "input": "number"
+    },
+    "bucketDate": {
+        "name": "时间桶日期",
+        "input": "number"
+    },
+    "hitCount": {
+        "name": "命中次数",
+        "input": "number"
+    },
+    "source": {
+        "name": "来源",
+        "input": "string",
+        "max": 50
+    },
+    "productName": {
+        "name": "产品名称",
+        "input": "string",
+        "max": 100
+    },
+    "productCode": {
+        "name": "产品代号",
+        "input": "string",
+        "max": 100
+    },
+    "productVersion": {
+        "name": "产品版本",
+        "input": "string",
+        "max": 100
+    },
+    "pagePath": {
+        "name": "页面路径",
+        "input": "string",
+        "max": 200
+    },
+    "pageName": {
+        "name": "页面名称",
+        "input": "string",
+        "max": 100
+    },
+    "errorType": {
+        "name": "错误类型",
+        "input": "string",
+        "max": 50
+    },
+    "message": {
+        "name": "错误信息",
+        "input": "string",
+        "max": 500
+    },
+    "detail": {
+        "name": "错误详情",
+        "input": "string"
+    },
+    "userAgent": {
+        "name": "用户代理",
+        "input": "string",
+        "max": 500
+    },
+    "browserName": {
+        "name": "浏览器名称",
+        "input": "string",
+        "max": 100
+    },
+    "browserVersion": {
+        "name": "浏览器版本",
+        "input": "string",
+        "max": 100
+    },
+    "osName": {
+        "name": "操作系统名称",
+        "input": "string",
+        "max": 100
+    },
+    "osVersion": {
+        "name": "操作系统版本",
+        "input": "string",
+        "max": 100
+    },
+    "deviceType": {
+        "name": "设备类型",
+        "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
+    },
+    "state": {
+        "name": "状态",
+        "input": "integer",
+        "min": 0,
+        "max": 2
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
+    }
+}