midway-fatcms 0.0.17 → 0.0.19

package/src/libs/crud-pro/utils/idgene/generateSnowflakeId.ts

@@ -0,0 +1,65 @@
+const SNOWFLAKE_SEQ_START = 1;
+let snowflakeSeq = SNOWFLAKE_SEQ_START;
+let snowflakeLastTs = -1;
+
+/**
+ * 生成雪花ID（64位整数，JS 中以 string 返回）
+ * 结构：1位符号 + 41位时间戳(ms) + 10位机器ID + 12位序列号
+ * - 时间戳：相对于 2024-01-01 00:00:00 的毫秒偏移，可用约 69 年
+ * - 机器ID：0-1023，优先取参数 > 环境变量 SNOWFLAKE_MACHINE_ID > process.pid 低10位
+ * - 序列号：0-4095，同一毫秒内自增
+ *
+ * @param machineId 机器ID（0-1023），不传则依次从环境变量 SNOWFLAKE_MACHINE_ID、process.pid 获取
+ * @returns 雪花ID字符串
+ */
+function generateSnowflakeId(machineId?: number): string {
+  const EPOCH = 1704067200000; // 2024-01-01 00:00:00 UTC
+
+  let mid = Number(machineId);
+  if (mid === undefined || mid === null || isNaN(mid)) {
+    // 优先从环境变量获取，适配多实例部署场景
+    const envMid = typeof process !== 'undefined' && process.env && process.env.SNOWFLAKE_MACHINE_ID
+      ? parseInt(process.env.SNOWFLAKE_MACHINE_ID, 10)
+      : NaN;
+    mid = !isNaN(envMid) ? envMid : (typeof process !== 'undefined' && process.pid ? process.pid & 0x3ff : 0);
+  }
+
+  mid = Math.abs(mid) & 0x3ff; // 确保在 0-1023 范围
+
+  let now = Date.now();
+  let ts = now - EPOCH;
+
+  // 时钟回拨保护：若当前时间戳小于上次，直接沿用上次时间戳继续递增，
+  // 避免 NTP 校正/VM 快照恢复等场景下生成重复 ID，同时不阻塞 CPU
+  if (ts < snowflakeLastTs) {
+    const drift = snowflakeLastTs - ts;
+    if (drift <= 5) {
+      // 小幅回拨，沿用上次时间戳（ID 仅比实际时间快 ≤5ms，不影响唯一性和排序性）
+      ts = snowflakeLastTs;
+    } else {
+      // 大幅回拨，无法安全恢复，抛出异常
+      throw new Error(`Snowflake clock drift detected: ${drift}ms backwards. Refusing to generate ID.`);
+    }
+  }
+
+  if (ts === snowflakeLastTs) {
+    snowflakeSeq = (snowflakeSeq + 1) & 0xfff; // 0-4095 循环
+    if (snowflakeSeq === 0) {
+      // 本毫秒序列号耗尽，直接推进到下一毫秒（不阻塞CPU忙等待）
+      // ID 的时间戳比实际时间快 ≤1ms，不影响唯一性和排序性
+      ts = snowflakeLastTs + 1;
+      snowflakeSeq = SNOWFLAKE_SEQ_START;
+    }
+  } else {
+    snowflakeSeq = SNOWFLAKE_SEQ_START;
+  }
+
+  snowflakeLastTs = ts;
+
+  // 雪花ID超过JS安全整数范围(2^53)，Number运算会丢失精度
+  // 使用 BigInt 做位移拼接，确保 64 位精度完整
+  const id = (BigInt(ts) << BigInt(22)) | (BigInt(mid) << BigInt(12)) | BigInt(snowflakeSeq);
+  return id.toString();
+}
+
+export { generateSnowflakeId };

package/src/libs/crud-pro/utils/idgene/generateSnowflakeIdExt.ts

@@ -0,0 +1,106 @@
+/**
+ * 128 位雪花 ID 生成器（优化版）
+ *
+ * 位布局（128 bit，无符号，BigInt 拼接后 Base58 编码返回）：
+ * - 41 bit 时间戳：相对 2024-01-01 00:00:00 UTC 的毫秒偏移，可用约 69 年（至 ~2093 年）
+ * - 10 bit 机器ID：0-1023，与标准 64 位雪花 ID 一致，优先参数 > 环境变量 > process.pid
+ * - 77 bit 序列号：同一毫秒内自增，2^77 ≈ 1.5×10²³，无需考虑耗尽
+ *
+ * 输出：Bitcoin 字母表 Base58（无 0/O/I/l），左填充 '1' 至恒定 22 字符，建议 VARCHAR(24)
+ * 时间戳在高位，ID 随时间单调递增，适合做数据库主键。
+ * 2^128-1 < 58^22，故 22 字符足以覆盖全部 128 位取值范围。
+ */
+
+const EPOCH = BigInt(1704067200000); // 2024-01-01 00:00:00 UTC
+
+const TS_BITS = BigInt(41);
+const MID_BITS = BigInt(10);
+const SEQ_BITS = BigInt(77);
+const TS_MASK = (BigInt(1) << TS_BITS) - BigInt(1); // 41 bit
+const MID_MASK = (BigInt(1) << MID_BITS) - BigInt(1); // 10 bit
+const SEQ_MASK = (BigInt(1) << SEQ_BITS) - BigInt(1); // 77 bit
+const PAD_LENGTH = 22;
+
+const SEQ_START = BigInt(1);
+const DRIFT_TOLERANCE = BigInt(5);
+
+/** Bitcoin Base58 字母表 */
+const BASE58_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+const BASE58_RADIX = BigInt(58);
+
+let snowflakeExtSeq = SEQ_START;
+let snowflakeExtLastTs = BigInt(-1);
+
+/** 无符号 BigInt → Base58 字符串 */
+function encodeBase58(value: bigint): string {
+  if (value === BigInt(0)) {
+    return BASE58_ALPHABET[0];
+  }
+  let n = value;
+  let result = '';
+  while (n > BigInt(0)) {
+    const rem = Number(n % BASE58_RADIX);
+    result = BASE58_ALPHABET[rem] + result;
+    n = n / BASE58_RADIX;
+  }
+  return result;
+}
+
+/** 解析机器 ID（10 bit，0-1023） */
+function resolveMachineId(machineId?: number): bigint {
+  let mid = Number(machineId);
+  if (machineId === undefined || machineId === null || isNaN(mid)) {
+    const envMid =
+      typeof process !== 'undefined' && process.env?.SNOWFLAKE_MACHINE_ID
+        ? parseInt(process.env.SNOWFLAKE_MACHINE_ID, 10)
+        : NaN;
+    mid = !isNaN(envMid)
+      ? envMid
+      : typeof process !== 'undefined' && process.pid
+        ? process.pid
+        : 0;
+  }
+  return BigInt(Math.abs(mid)) & MID_MASK;
+}
+
+/**
+ * 生成 128 位雪花 ID（Base58 字符串，恒定 22 字符）
+ *
+ * 位布局：41 bit 时间戳 | 10 bit 机器ID | 77 bit 序列号
+ * 时间戳采用 41 bit（与标准 64 位雪花 ID 一致），毫秒精度，可用约 69 年。
+ * 机器ID 采用 10 bit（0-1023），与标准 64 位雪花 ID 一致，防止多机 ID 冲突。
+ * 时间戳在高位，ID 随时间单调递增，适合做数据库主键。
+ * Base58 输出左填充 '1'（零字符）至 22 字符，保证长度恒定且不破坏字典序排序。
+ *
+ * @param machineId 机器ID（0-1023），不传则依次从环境变量 SNOWFLAKE_MACHINE_ID、process.pid 获取
+ * @returns Base58 编码的 128 位雪花 ID（恒定 22 字符）
+ */
+function generateSnowflakeIdExt(machineId?: number): string {
+  const mid = resolveMachineId(machineId);
+
+  let ts = BigInt(Date.now()) - EPOCH;
+
+  if (ts < snowflakeExtLastTs) {
+    const drift = snowflakeExtLastTs - ts;
+    if (drift <= DRIFT_TOLERANCE) {
+      ts = snowflakeExtLastTs;
+    } else {
+      throw new Error(
+        `SnowflakeExt clock drift detected: ${drift}ms backwards. Refusing to generate ID.`
+      );
+    }
+  }
+
+  if (ts === snowflakeExtLastTs) {
+    snowflakeExtSeq = (snowflakeExtSeq + BigInt(1)) & SEQ_MASK;
+  } else {
+    snowflakeExtSeq = SEQ_START;
+  }
+
+  snowflakeExtLastTs = ts;
+
+  const id = ((ts & TS_MASK) << (MID_BITS + SEQ_BITS)) | (mid << SEQ_BITS) | snowflakeExtSeq;
+  return encodeBase58(id).padStart(PAD_LENGTH, BASE58_ALPHABET[0]);
+}
+
+export { generateSnowflakeIdExt, EPOCH as SNOWFLAKE_EXT_EPOCH };

package/src/libs/crud-pro/utils/idgene/index.ts

@@ -0,0 +1,3 @@
+export { generateSnowflakeId } from './generateSnowflakeId';
+export { generateSnowflakeIdExt, SNOWFLAKE_EXT_EPOCH } from './generateSnowflakeIdExt';
+export { uuid } from './uuid';

package/src/libs/crud-pro/utils/idgene/uuid.ts

@@ -0,0 +1,26 @@
+/**
+ * 生成 UUID v4 字符串（纯随机，无外部依赖）
+ * 格式：xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx，其中 y 为 8/9/a/b 之一
+ * @returns 符合 RFC 4122 v4 规范的 UUID 字符串
+ */
+function uuid(): string {
+  // crypto.getRandomValues 在 Node.js >= 11 和现代浏览器中可用
+  if (typeof crypto !== 'undefined' && crypto.getRandomValues) {
+    const bytes = new Uint8Array(16);
+    crypto.getRandomValues(bytes);
+    // 版本位：第6字节高4位设为 0100 (v4)
+    bytes[6] = (bytes[6] & 0x0f) | 0x40;
+    // 变体位：第8字节高2位设为 10
+    bytes[8] = (bytes[8] & 0x3f) | 0x80;
+    const hex = Array.from(bytes, b => b.toString(16).padStart(2, '0')).join('');
+    return hex.slice(0, 8) + '-' + hex.slice(8, 12) + '-' + hex.slice(12, 16) + '-' + hex.slice(16, 20) + '-' + hex.slice(20);
+  }
+  // 降级方案：Math.random
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    const r = Math.random() * 16 | 0;
+    const v = c === 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+}
+
+export { uuid };

package/src/libs/crud-pro-quick/fixSoftDelete.ts

@@ -1,18 +1,8 @@
 import { KeysOfSimpleSQL } from "@/libs/crud-pro/models/keys";
 import { IRequestModel, IVisitor } from "@/libs/crud-pro/interfaces";
-import { IRequestCfgModel2, ICommonStandardColumns } from "./models";
+import { IRequestCfgModel2, ICommonStandardColumns, ICommonStandardColumns2 } from "./models";
+import { DateTimeUtils } from "@/libs/crud-pro/utils/DateTimeUtils";
 
-/**
- * 软删除需要的用户信息（最小子集）
- */
-interface ISoftDeleteUserInfo {
-  accountId: string;
-}
-
-/**
- * 获取当前用户信息的函数类型
- */
-type GetCurrentUserFunc = () => ISoftDeleteUserInfo | null | undefined;
 
 /**
  * 软删除处理函数
@@ -28,17 +18,13 @@ type GetCurrentUserFunc = () => ISoftDeleteUserInfo | null | undefined;
  * @param params 请求参数（会被修改）
  * @param visitor 获取当前用户信息的函数（用于软删除时记录删除人）
  */
-function fixSoftDelete(
+function fixSoftDelete1(
   oldSqlSimpleName: KeysOfSimpleSQL,
   cfgModel: IRequestCfgModel2,
   params: IRequestModel,
   visitor?: IVisitor
 ): void {
 
-  // 没有开启软删除，不做处理，直接物理删除
-  if (cfgModel.enableSoftDelete !== true) {
-    return;
-  }
 
   // INSERT 操作：刚插入的数据，肯定是未删除的
   if (KeysOfSimpleSQL.SIMPLE_INSERT === oldSqlSimpleName) {
@@ -83,8 +69,88 @@ function fixSoftDelete(
 }
 
 
+function fixSoftDelete2(
+  oldSqlSimpleName: KeysOfSimpleSQL,
+  cfgModel: IRequestCfgModel2,
+  params: IRequestModel,
+  visitor?: IVisitor
+): void {
+
+
+  // INSERT 操作：刚插入的数据，肯定是未删除的
+  if (KeysOfSimpleSQL.SIMPLE_INSERT === oldSqlSimpleName) {
+    if (!params.data) {
+      params.data = {};
+    }
+    const dataObj = params.data as ICommonStandardColumns2;
+    dataObj.is_deleted = false;
+  }
+
+  // DELETE 操作：如果是软删除，修改为 UPDATE 语句
+  if (KeysOfSimpleSQL.SIMPLE_DELETE === oldSqlSimpleName) {
+
+    if (!params.condition || Object.keys(params.condition).length === 0) {
+      throw new Error('执行删除操作，必须指定删除条件');
+    }
+
+
+    // 在原有 data 对象上添加软删除字段
+    if (!params.data) {
+      params.data = {};
+    }
+    const dataObj = params.data as ICommonStandardColumns2;
+    dataObj.is_deleted = true;
+    dataObj.deleted_at = DateTimeUtils.getCurrentTimeString();
+    dataObj.deleted_by = visitor?.accountId || '';
+
+    // 改为执行 UPDATE 操作
+    cfgModel.sqlSimpleName = KeysOfSimpleSQL.SIMPLE_UPDATE;
+  }
+
+  // QUERY 操作：强制查询未删除的记录
+  if (KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName
+    || KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName
+    || KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
+
+    if (!params.condition) {
+      params.condition = {};
+    }
+    params.condition.is_deleted = false;
+  }
+}
+
+
+
+/**
+ * 软删除处理函数
+ *
+ * @param oldSqlSimpleName 原始 SQL 类型
+ * @param cfgModel 配置模型
+ * @param params 请求参数（会被修改）
+ * @param visitor 获取当前用户信息的函数（用于软删除时记录删除人）
+ */
+function fixSoftDelete(
+  oldSqlSimpleName: KeysOfSimpleSQL,
+  cfgModel: IRequestCfgModel2,
+  params: IRequestModel,
+  visitor?: IVisitor
+): void {
+
+
+  if (cfgModel.enableSoftDelete === true || cfgModel.enableSoftDelete === 'soft') {
+    fixSoftDelete1(oldSqlSimpleName, cfgModel, params, visitor);
+    return;
+  }
+
+  if (cfgModel.enableSoftDelete === 'soft2') {
+    fixSoftDelete2(oldSqlSimpleName, cfgModel, params, visitor);
+    return;
+  }
+
+}
+
+
 export {
   fixSoftDelete,
 };
 
-export type { ISoftDeleteUserInfo, GetCurrentUserFunc };

package/src/libs/crud-pro-quick/models.ts

@@ -2,7 +2,7 @@ import { IRequestCfgModel } from '@/libs/crud-pro/interfaces';
 
 /**
  * 常用标准表结构字段（6个字段）
- * 
+ *
  * 用于软删除和审计跟踪：
  * - deleted_at: 删除时间戳，0=未删除
  * - deleted_by: 删除人ID
@@ -20,9 +20,21 @@ export interface ICommonStandardColumns {
   modified_at?: number;
 }
 
+export interface ICommonStandardColumns2 {
+  is_deleted?: boolean | number;
+  deleted_at?: string;
+  deleted_by?: string;
+  created_by?: string;
+  created_at?: number;
+  modified_by?: string;
+  modified_at?: number;
+}
+
+export type TEnableSoftDelete = null | false | true | 'soft' | 'soft2';
+
 /**
  * 扩展的请求配置模型
- * 
+ *
  * 在 IRequestCfgModel 基础上添加了业务层常用的配置项：
  * - enableStandardUpdateCfg: 启用标准字段自动填充
  * - enableStandardUpdateCfgCondition: 启用标准字段条件注入
@@ -31,5 +43,5 @@ export interface ICommonStandardColumns {
 export interface IRequestCfgModel2 extends IRequestCfgModel {
   enableStandardUpdateCfg?: boolean | string[]; // 默认为true
   enableStandardUpdateCfgCondition?: boolean | string[]; // 默认为false
-  enableSoftDelete?: boolean;
+  enableSoftDelete?: TEnableSoftDelete
 }

package/src/service/SysAppService.ts

@@ -42,22 +42,4 @@ export class SysAppService extends BaseService {
     return parsedAppInfo2;
   }
 
-  async removeSysAppOneCache(app_code: string) {
-    if (!app_code || typeof app_code !== 'string') {
-      throw new Error('[removeSysAppOneCache] app_code required');
-    }
-    await bizMemCacheStore.markDirty('sysAppCacheObj', this.redisService);
-  }
-
-  async removeSysAppPageCache() {
-    await bizMemCacheStore.markDirty('sysAppPageCacheObj', this.redisService);
-  }
-
-  async removeSysAppCacheByCondition({ condition }: any) {
-    if (!condition) {
-      throw new Error('[removeSysAppCacheByCondition] condition required');
-    }
-    await bizMemCacheStore.markDirty('sysAppCacheObj', this.redisService);
-  }
-
 }

package/src/service/SysConfigService.ts

@@ -13,12 +13,4 @@ export class SysConfigService extends BaseService {
     return sysConfigCodeMap[config_code];
   }
 
-
-  async removeSysConfigOneCache(config_code: string) {
-    if (!config_code || typeof config_code !== 'string') {
-      throw new Error('[removeSysConfigOneCache] config_code required');
-    }
-
-    await bizMemCacheStore.markDirty('sysConfgCacheObj', this.redisService);
-  }
 }

package/src/service/SysDictDataService.ts

@@ -12,18 +12,4 @@ export class SysDictDataService extends BaseService {
     const dictCodeMap = bizMemCacheStore.getDataDictItem()?.dictCodeMap || {};
     return dictCodeMap[dict_code] || [];
   }
-
-  public async removeCacheByDictItemId(dict_item_id: string) {
-    if (!dict_item_id) {
-      throw new Error('[removeCacheByDictItemId] dict_item_id required');
-    }
-    await bizMemCacheStore.markDirty('dataDictItemCacheObj', this.redisService);
-  }
-
-  public async removeCacheByDictCode(dict_code: string) {
-    if (!dict_code || typeof dict_code !== 'string') {
-      throw new Error('[removeCacheByDictCode] dict_code required');
-    }
-    await bizMemCacheStore.markDirty('dataDictItemCacheObj', this.redisService);
-  }
 }

package/src/service/SysMenuService.ts

@@ -53,8 +53,4 @@ export class SysMenuService extends BaseService {
     return bizMemCacheStore.getSysMenu()?.sysMenuList || [];
   }
 
-
-  async removeSysMenuCache() {
-    await bizMemCacheStore.markDirty('sysMenuCacheObj', this.redisService);
-  }
 }

package/src/service/WorkbenchService.ts

@@ -19,11 +19,6 @@ export class WorkbenchService extends BaseService {
   @Config('fatcmsTargetWorkbenchCode')
   private fatcmsTargetWorkbenchCode: string;
 
-
-  public async clearCache() {
-    await bizMemCacheStore.markDirty('workbenchCachedObj', this.redisService);
-  }
-
   private getWorkbenchCachedObj(): IWorkbenchCachedObj {
     return bizMemCacheStore.getWorkbench();
   }

package/src/service/base/bizmemcache/BizMemCacheService.ts

@@ -35,8 +35,10 @@ export class BizMemCacheService extends BaseService implements IScheduleService
   }
 
   private async reloadIfRedisChanged(key: BizMemCacheKey, loader: () => Promise<void>) {
-    const redisTime = Number(await this.redisService.get(bizMemCacheStore.getRedisKey(key))) || 0;
-    if (redisTime !== bizMemCacheStore.getLastTime(key)) {
+    const redisTimeStr = await this.redisService.get(bizMemCacheStore.getRedisKey(key));
+    const redisTime = Number(redisTimeStr) || 0;
+    const memTime = bizMemCacheStore.getLastTime(key);
+    if (redisTime !== memTime) {
       await loader();
       bizMemCacheStore.setLastTime(key, redisTime);
     }

package/src/service/base/bizmemcache/BizMemCacheStore.ts

@@ -30,16 +30,17 @@ function createEmptyData(): IBizMemCacheData {
 }
 
 function createEmptyLastTime(): Record<BizMemCacheKey, number> {
+  const defaultLastTime = -9999;
   return {
-    workbenchCachedObj: 0,
-    sysConfgCacheObj: 0,
-    sysMenuCacheObj: 0,
-    dataDictItemCacheObj: 0,
-    sysAppCacheObj: 0,
-    sysAppPageCacheObj: 0,
-    sysAnyApiCacheObj: 0,
-    sysProxyApiCacheObj: 0,
-    crudMethodCacheObj: 0,
+    workbenchCachedObj: defaultLastTime,
+    sysConfgCacheObj: defaultLastTime,
+    sysMenuCacheObj: defaultLastTime,
+    dataDictItemCacheObj: defaultLastTime,
+    sysAppCacheObj: defaultLastTime,
+    sysAppPageCacheObj: defaultLastTime,
+    sysAnyApiCacheObj: defaultLastTime,
+    sysProxyApiCacheObj: defaultLastTime,
+    crudMethodCacheObj: defaultLastTime,
   };
 }
 

package/src/service/crudstd/CrudStdService.ts

@@ -16,6 +16,7 @@ import { ApiBaseService } from '../base/ApiBaseService';
 import { parseDatabaseName } from '@/libs/crud-pro/utils/DatabaseName';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { SysAppService } from "@/service/SysAppService";
+import { TEnableSoftDelete } from "@/libs/crud-pro-quick/models";
 
 
 export const SPECIAL_SETTING_KEY = {
@@ -102,7 +103,7 @@ export class CrudStdService extends ApiBaseService {
     const stdCrudCfgObj = appInfo.stdCrudCfgObj;
 
     //删除策略
-    const deleteStrategy = _.get(stdCrudCfgObj, 'othersSetting.values.deleteStrategy');
+    const deleteStrategy: TEnableSoftDelete = _.get(stdCrudCfgObj, 'othersSetting.values.deleteStrategy');
     // 自动
     const enableStandardUpdateCfg: string[] = _.get(stdCrudCfgObj, 'othersSetting.values.enableStandardUpdateCfg');
     const enableStandardUpdateCfgCondition: string[] = _.get(stdCrudCfgObj, 'othersSetting.values.enableStandardUpdateCfgCondition');
@@ -117,7 +118,7 @@ export class CrudStdService extends ApiBaseService {
       sqlTable: getExecuteTableNameBySettingKey(appInfo, stdAction, sqlSimpleName),
       sqlSimpleName,
       updateCfg: {},
-      enableSoftDelete: deleteStrategy === 'soft', // 软删除
+      enableSoftDelete: deleteStrategy, // 软删除配置
       enableStandardUpdateCfg: Array.isArray(enableStandardUpdateCfg) && enableStandardUpdateCfg.length > 0 ? enableStandardUpdateCfg : ['by', 'at'], // 默认为 ['by', 'at']
       enableStandardUpdateCfgCondition: Array.isArray(enableStandardUpdateCfgCondition) && enableStandardUpdateCfgCondition.length > 0 ? enableStandardUpdateCfgCondition : false, // 默认为false
     };