befly 3.15.2 → 3.15.3

package/dist/befly.config.js

@@ -24,6 +24,7 @@ const defaultOptions = {
     },
     // ========== 数据库配置 ==========
     db: {
+        idMode: "timeId",
         host: "127.0.0.1",
         port: 3306,
         username: "root",
@@ -93,5 +94,9 @@ export async function loadBeflyConfig(nodeEnv) {
             throw new Error(`配置错误：redis.prefix 不允许包含 ':'（RedisHelper 会自动拼接分隔符 ':'），请改为不带冒号的前缀，例如 'befly_demo'，当前值=${redisPrefix}`);
         }
     }
+    const idMode = config.db?.idMode;
+    if (idMode !== undefined && idMode !== "timeId" && idMode !== "autoId") {
+        throw new Error(`配置错误：db.idMode 只能是 'timeId' 或 'autoId'，当前值=${String(idMode)}`);
+    }
     return config;
 }

package/dist/befly.js

@@ -7547,6 +7547,7 @@ var defaultOptions = {
     maxArrayItems: 100
   },
   db: {
+    idMode: "timeId",
     host: "127.0.0.1",
     port: 3306,
     username: "root",
@@ -7602,6 +7603,10 @@ async function loadBeflyConfig(nodeEnv) {
       throw new Error(`\u914D\u7F6E\u9519\u8BEF\uFF1Aredis.prefix \u4E0D\u5141\u8BB8\u5305\u542B ':'\uFF08RedisHelper \u4F1A\u81EA\u52A8\u62FC\u63A5\u5206\u9694\u7B26 ':'\uFF09\uFF0C\u8BF7\u6539\u4E3A\u4E0D\u5E26\u5192\u53F7\u7684\u524D\u7F00\uFF0C\u4F8B\u5982 'befly_demo'\uFF0C\u5F53\u524D\u503C=${redisPrefix}`);
     }
   }
+  const idMode = config2.db?.idMode;
+  if (idMode !== undefined && idMode !== "timeId" && idMode !== "autoId") {
+    throw new Error(`\u914D\u7F6E\u9519\u8BEF\uFF1Adb.idMode \u53EA\u80FD\u662F 'timeId' \u6216 'autoId'\uFF0C\u5F53\u524D\u503C=${String(idMode)}`);
+  }
   return config2;
 }
 
@@ -13324,7 +13329,12 @@ class DbUtils {
     for (const [key, value] of Object.entries(userData)) {
       result[key] = value;
     }
-    result["id"] = options.id;
+    if (options.idMode === "timeId") {
+      if (!Number.isFinite(options.id) || options.id <= 0) {
+        throw new Error(`buildInsertRow(timeId) \u5931\u8D25\uFF1Aid \u5FC5\u987B\u4E3A > 0 \u7684\u6709\u9650 number (id: ${String(options.id)})`);
+      }
+      result["id"] = options.id;
+    }
     result["created_at"] = options.now;
     result["updated_at"] = options.now;
     result["state"] = 1;
@@ -14095,6 +14105,7 @@ class DbHelper {
   dbName;
   sql = null;
   isTransaction = false;
+  idMode;
   constructor(options) {
     this.redis = options.redis;
     if (typeof options.dbName !== "string" || options.dbName.trim() === "") {
@@ -14103,6 +14114,7 @@ class DbHelper {
     this.dbName = options.dbName;
     this.sql = options.sql || null;
     this.isTransaction = Boolean(options.sql);
+    this.idMode = options.idMode === "autoId" ? "autoId" : "timeId";
   }
   createSqlBuilder() {
     return new SqlBuilder({ quoteIdent: quoteIdentMySql });
@@ -14397,13 +14409,18 @@ class DbHelper {
     const { table, data } = options;
     const snakeTable = snakeCase(table);
     const now = Date.now();
-    let id;
-    try {
-      id = await this.redis.genTimeID();
-    } catch (error) {
-      throw new Error(`\u751F\u6210 ID \u5931\u8D25\uFF0CRedis \u53EF\u80FD\u4E0D\u53EF\u7528 (table: ${table})`, { cause: error });
+    let processed;
+    if (this.idMode === "autoId") {
+      processed = DbUtils.buildInsertRow({ idMode: "autoId", data, now });
+    } else {
+      let id;
+      try {
+        id = await this.redis.genTimeID();
+      } catch (error) {
+        throw new Error(`\u751F\u6210 ID \u5931\u8D25\uFF0CRedis \u53EF\u80FD\u4E0D\u53EF\u7528 (table: ${table})`, { cause: error });
+      }
+      processed = DbUtils.buildInsertRow({ idMode: "timeId", data, id, now });
     }
-    const processed = DbUtils.buildInsertRow({ data, id, now });
     SqlCheck.assertNoUndefinedInRecord(processed, `insData \u63D2\u5165\u6570\u636E (table: ${snakeTable})`);
     const builder = this.createSqlBuilder();
     const { sql, params } = builder.toInsertSql(snakeTable, processed);
@@ -14411,7 +14428,10 @@ class DbHelper {
     const processedId = processed["id"];
     const processedIdNum = typeof processedId === "number" ? processedId : 0;
     const lastInsertRowidNum = toNumberFromSql(execRes.data?.lastInsertRowid);
-    const insertedId = processedIdNum || lastInsertRowidNum || 0;
+    const insertedId = this.idMode === "autoId" ? lastInsertRowidNum || 0 : processedIdNum || lastInsertRowidNum || 0;
+    if (this.idMode === "autoId" && insertedId <= 0) {
+      throw new Error(`\u63D2\u5165\u5931\u8D25\uFF1AautoId \u6A21\u5F0F\u4E0B\u65E0\u6CD5\u83B7\u53D6 lastInsertRowid (table: ${table})`);
+    }
     return {
       data: insertedId,
       sql: execRes.sql
@@ -14430,23 +14450,46 @@ class DbHelper {
       throw new Error(`\u6279\u91CF\u63D2\u5165\u6570\u91CF ${dataList.length} \u8D85\u8FC7\u6700\u5927\u9650\u5236 ${MAX_BATCH_SIZE}`);
     }
     const snakeTable = snakeCase(table);
-    const ids = [];
-    for (let i = 0;i < dataList.length; i++) {
-      ids.push(await this.redis.genTimeID());
-    }
     const now = Date.now();
-    const processedList = dataList.map((data, index) => {
-      const id = ids[index];
-      if (typeof id !== "number") {
-        throw new Error(`\u6279\u91CF\u63D2\u5165\u751F\u6210 ID \u5931\u8D25\uFF1Aids[${index}] \u4E0D\u662F number (table: ${snakeTable})`);
+    let ids = [];
+    let processedList;
+    if (this.idMode === "autoId") {
+      processedList = dataList.map((data) => {
+        return DbUtils.buildInsertRow({ idMode: "autoId", data, now });
+      });
+    } else {
+      const nextIds = [];
+      for (let i = 0;i < dataList.length; i++) {
+        nextIds.push(await this.redis.genTimeID());
       }
-      return DbUtils.buildInsertRow({ data, id, now });
-    });
+      ids = nextIds;
+      processedList = dataList.map((data, index) => {
+        const id = nextIds[index];
+        if (typeof id !== "number") {
+          throw new Error(`\u6279\u91CF\u63D2\u5165\u751F\u6210 ID \u5931\u8D25\uFF1Aids[${index}] \u4E0D\u662F number (table: ${snakeTable})`);
+        }
+        return DbUtils.buildInsertRow({ idMode: "timeId", data, id, now });
+      });
+    }
     const insertFields = SqlCheck.assertBatchInsertRowsConsistent(processedList, { table: snakeTable });
     const builder = this.createSqlBuilder();
     const { sql, params } = builder.toInsertSql(snakeTable, processedList);
     try {
       const execRes = await this.executeRun(sql, params);
+      if (this.idMode === "autoId") {
+        const firstId = toNumberFromSql(execRes.data?.lastInsertRowid);
+        if (firstId <= 0) {
+          throw new Error(`\u6279\u91CF\u63D2\u5165\u5931\u8D25\uFF1AautoId \u6A21\u5F0F\u4E0B\u65E0\u6CD5\u83B7\u53D6 lastInsertRowid (table: ${table})`);
+        }
+        const outIds = [];
+        for (let i = 0;i < dataList.length; i++) {
+          outIds.push(firstId + i);
+        }
+        return {
+          data: outIds,
+          sql: execRes.sql
+        };
+      }
       return {
         data: ids,
         sql: execRes.sql
@@ -14600,7 +14643,7 @@ class DbHelper {
       throw new Error("\u5F53\u524D SQL \u5BA2\u6237\u7AEF\u4E0D\u652F\u6301\u4E8B\u52A1 begin() \u65B9\u6CD5");
     }
     return await sql.begin(async (tx) => {
-      const trans = new DbHelper({ redis: this.redis, dbName: this.dbName, sql: tx });
+      const trans = new DbHelper({ redis: this.redis, dbName: this.dbName, sql: tx, idMode: this.idMode });
       return await callback(trans);
     });
   }
@@ -14745,7 +14788,9 @@ var dbPlugin = {
     }
     try {
       const sql = Connect.getSql();
-      const dbManager = new DbHelper({ redis: befly.redis, dbName, sql });
+      const idMode = befly.config?.db?.idMode;
+      const normalizedIdMode = idMode === "autoId" ? "autoId" : "timeId";
+      const dbManager = new DbHelper({ redis: befly.redis, dbName, sql, idMode: normalizedIdMode });
       return dbManager;
     } catch (error) {
       Logger.error({ env, err: error, msg: "\u6570\u636E\u5E93\u521D\u59CB\u5316\u5931\u8D25" });