midway-fatcms 0.0.5 → 0.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.qoder/skills/midway-fatcms-crud/SKILL.md +375 -0
- package/.qoder/skills/midway-fatcms-crud/examples.md +990 -0
- package/.qoder/skills/midway-fatcms-crud/reference.md +568 -0
- package/README.md +377 -134
- package/dist/controller/manage/CrudStandardDesignApi.d.ts +0 -2
- package/dist/controller/manage/CrudStandardDesignApi.js +11 -85
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/libs/crud-pro/CrudPro.d.ts +9 -1
- package/dist/libs/crud-pro/CrudPro.js +15 -0
- package/dist/libs/crud-pro/README.md +809 -0
- package/dist/libs/crud-pro/README_FUNC.md +193 -0
- package/dist/libs/crud-pro/exceptions.d.ts +2 -0
- package/dist/libs/crud-pro/exceptions.js +2 -0
- package/dist/libs/crud-pro/interfaces.d.ts +34 -1
- package/dist/libs/crud-pro/models/ExecuteContext.d.ts +3 -3
- package/dist/libs/crud-pro/models/ExecuteContext.js +2 -0
- package/dist/libs/crud-pro/models/RequestModel.d.ts +6 -2
- package/dist/libs/crud-pro/models/RequestModel.js +20 -53
- package/dist/libs/crud-pro/models/ResModel.d.ts +6 -4
- package/dist/libs/crud-pro/models/ServiceHub.d.ts +1 -0
- package/dist/libs/crud-pro/models/keys.d.ts +6 -1
- package/dist/libs/crud-pro/models/keys.js +5 -0
- package/dist/libs/crud-pro/services/CrudProDataTypeConvertService.d.ts +52 -0
- package/dist/libs/crud-pro/services/CrudProDataTypeConvertService.js +158 -0
- package/dist/libs/crud-pro/services/CrudProExecuteSqlService.js +20 -1
- package/dist/libs/crud-pro/services/CrudProFieldValidateService.d.ts +7 -0
- package/dist/libs/crud-pro/services/CrudProFieldValidateService.js +32 -0
- package/dist/libs/crud-pro/services/CrudProGenSqlService.d.ts +13 -0
- package/dist/libs/crud-pro/services/CrudProGenSqlService.js +44 -7
- package/dist/libs/crud-pro/services/CrudProOriginToExecuteSql.d.ts +43 -0
- package/dist/libs/crud-pro/services/CrudProOriginToExecuteSql.js +132 -1
- package/dist/libs/crud-pro/services/CrudProTableMetaService.d.ts +15 -1
- package/dist/libs/crud-pro/services/CrudProTableMetaService.js +107 -0
- package/dist/libs/crud-pro/services/CurdProServiceHub.d.ts +5 -1
- package/dist/libs/crud-pro/services/CurdProServiceHub.js +11 -0
- package/dist/libs/crud-pro/utils/DateTimeUtils.d.ts +1 -0
- package/dist/libs/crud-pro/utils/DateTimeUtils.js +3 -0
- package/dist/libs/crud-pro/utils/MixinUtils.d.ts +32 -0
- package/dist/libs/crud-pro/utils/MixinUtils.js +85 -1
- package/dist/libs/crud-pro/utils/OrderByUtils.d.ts +70 -0
- package/dist/libs/crud-pro/utils/OrderByUtils.js +158 -0
- package/dist/libs/crud-pro/utils/ValidateUtils.js +1 -1
- package/dist/libs/crud-sharding/ROUTING_LOGIC.md +944 -0
- package/dist/libs/crud-sharding/ShardingConfig.d.ts +218 -0
- package/dist/libs/crud-sharding/ShardingConfig.js +32 -0
- package/dist/libs/crud-sharding/ShardingCountCache.d.ts +69 -0
- package/dist/libs/crud-sharding/ShardingCountCache.js +160 -0
- package/dist/libs/crud-sharding/ShardingCrudPro.d.ts +363 -0
- package/dist/libs/crud-sharding/ShardingCrudPro.js +675 -0
- package/dist/libs/crud-sharding/ShardingMerger.d.ts +130 -0
- package/dist/libs/crud-sharding/ShardingMerger.js +282 -0
- package/dist/libs/crud-sharding/ShardingRouter.d.ts +69 -0
- package/dist/libs/crud-sharding/ShardingRouter.js +377 -0
- package/dist/libs/crud-sharding/ShardingTableCreator.d.ts +146 -0
- package/dist/libs/crud-sharding/ShardingTableCreator.js +805 -0
- package/dist/libs/crud-sharding/ShardingUtils.d.ts +38 -0
- package/dist/libs/crud-sharding/ShardingUtils.js +77 -0
- package/dist/libs/crud-sharding/index.d.ts +45 -0
- package/dist/libs/crud-sharding/index.js +55 -0
- package/dist/models/StandardColumns.d.ts +71 -0
- package/dist/models/StandardColumns.js +28 -0
- package/dist/service/SysAppService.js +2 -2
- package/dist/service/SysConfigService.js +1 -1
- package/dist/service/SysDictDataService.js +2 -2
- package/dist/service/SysMenuService.js +1 -1
- package/dist/service/UserAccountService.d.ts +1 -1
- package/dist/service/crudstd/CrudStdService.d.ts +0 -1
- package/dist/service/crudstd/CrudStdService.js +0 -27
- package/dist/service/curd/CrudProQuick.d.ts +134 -4
- package/dist/service/curd/CrudProQuick.js +155 -3
- package/dist/service/curd/CurdMixService.d.ts +2 -1
- package/dist/service/curd/CurdMixService.js +5 -1
- package/dist/service/curd/CurdProService.d.ts +44 -2
- package/dist/service/curd/CurdProService.js +53 -1
- package/dist/service/curd/README.md +1100 -0
- package/dist/service/curd/fixSoftDelete.d.ts +14 -0
- package/dist/service/curd/fixSoftDelete.js +29 -11
- package/dist/service/flow/FlowConfigService.js +1 -1
- package/dist/service/flow/FlowInstanceCrudService.js +1 -1
- package/package.json +4 -1
- package/src/controller/gateway/AsyncTaskController.ts +1 -1
- package/src/controller/manage/CrudStandardDesignApi.ts +16 -100
- package/src/index.ts +3 -0
- package/src/libs/crud-pro/CrudPro.ts +19 -1
- package/src/libs/crud-pro/README.md +809 -0
- package/src/libs/crud-pro/README_FUNC.md +193 -0
- package/src/libs/crud-pro/exceptions.ts +2 -0
- package/src/libs/crud-pro/interfaces.ts +38 -1
- package/src/libs/crud-pro/models/ExecuteContext.ts +6 -3
- package/src/libs/crud-pro/models/RequestModel.ts +23 -65
- package/src/libs/crud-pro/models/ResModel.ts +10 -4
- package/src/libs/crud-pro/models/ServiceHub.ts +2 -0
- package/src/libs/crud-pro/models/keys.ts +5 -0
- package/src/libs/crud-pro/services/CrudProDataTypeConvertService.ts +171 -0
- package/src/libs/crud-pro/services/CrudProExecuteSqlService.ts +24 -1
- package/src/libs/crud-pro/services/CrudProFieldValidateService.ts +53 -1
- package/src/libs/crud-pro/services/CrudProGenSqlService.ts +51 -7
- package/src/libs/crud-pro/services/CrudProOriginToExecuteSql.ts +159 -2
- package/src/libs/crud-pro/services/CrudProTableMetaService.ts +139 -1
- package/src/libs/crud-pro/services/CurdProServiceHub.ts +16 -1
- package/src/libs/crud-pro/utils/DateTimeUtils.ts +3 -0
- package/src/libs/crud-pro/utils/MixinUtils.ts +97 -1
- package/src/libs/crud-pro/utils/OrderByUtils.ts +169 -0
- package/src/libs/crud-pro/utils/ValidateUtils.ts +1 -1
- package/src/libs/crud-sharding/ROUTING_LOGIC.md +944 -0
- package/src/libs/crud-sharding/ShardingConfig.ts +240 -0
- package/src/libs/crud-sharding/ShardingCountCache.ts +200 -0
- package/src/libs/crud-sharding/ShardingCrudPro.ts +835 -0
- package/src/libs/crud-sharding/ShardingMerger.ts +384 -0
- package/src/libs/crud-sharding/ShardingRouter.ts +512 -0
- package/src/libs/crud-sharding/ShardingTableCreator.ts +1007 -0
- package/src/libs/crud-sharding/ShardingUtils.ts +84 -0
- package/src/libs/crud-sharding/index.ts +64 -0
- package/src/models/StandardColumns.ts +76 -0
- package/src/service/FileCenterService.ts +1 -1
- package/src/service/SysAppService.ts +2 -2
- package/src/service/SysConfigService.ts +1 -1
- package/src/service/SysDictDataService.ts +2 -2
- package/src/service/SysMenuService.ts +2 -2
- package/src/service/WorkbenchService.ts +1 -1
- package/src/service/anyapi/AnyApiService.ts +1 -1
- package/src/service/asyncTask/AsyncTaskRunnerService.ts +1 -1
- package/src/service/crudstd/CrudStdService.ts +0 -32
- package/src/service/curd/CrudProQuick.ts +164 -5
- package/src/service/curd/CurdMixService.ts +7 -2
- package/src/service/curd/CurdProService.ts +62 -3
- package/src/service/curd/README.md +1100 -0
- package/src/service/curd/fixCfgModel.ts +1 -2
- package/src/service/curd/fixSoftDelete.ts +38 -16
- package/src/service/flow/FlowConfigService.ts +1 -1
- package/src/service/flow/FlowInstanceCrudService.ts +1 -1
|
@@ -3,6 +3,85 @@ import { CommonException, Exceptions } from '../exceptions';
|
|
|
3
3
|
// 至少需要2个字符
|
|
4
4
|
const FIELD_NAME_REG_EXP = /^[a-zA-Z][0-9a-zA-Z_]+$/;
|
|
5
5
|
|
|
6
|
+
// ===================== 雪花ID =====================
|
|
7
|
+
let snowflakeSeq = 0;
|
|
8
|
+
let snowflakeLastTs = -1;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* 生成雪花ID(64位整数,JS 中以 string 返回)
|
|
12
|
+
* 结构:1位符号 + 41位时间戳(ms) + 10位机器ID + 12位序列号
|
|
13
|
+
* - 时间戳:相对于 2024-01-01 00:00:00 的毫秒偏移,可用约 69 年
|
|
14
|
+
* - 机器ID:0-1023,优先取参数 > 环境变量 SNOWFLAKE_MACHINE_ID > process.pid 低10位
|
|
15
|
+
* - 序列号:0-4095,同一毫秒内自增
|
|
16
|
+
*
|
|
17
|
+
* @param machineId 机器ID(0-1023),不传则依次从环境变量 SNOWFLAKE_MACHINE_ID、process.pid 获取
|
|
18
|
+
* @returns 雪花ID字符串
|
|
19
|
+
*/
|
|
20
|
+
function generateSnowflakeId(machineId?: number): string {
|
|
21
|
+
const EPOCH = 1704067200000; // 2024-01-01 00:00:00 UTC
|
|
22
|
+
|
|
23
|
+
let mid = machineId;
|
|
24
|
+
if (mid === undefined || mid === null) {
|
|
25
|
+
// 优先从环境变量获取,适配多实例部署场景
|
|
26
|
+
const envMid = typeof process !== 'undefined' && process.env && process.env.SNOWFLAKE_MACHINE_ID
|
|
27
|
+
? parseInt(process.env.SNOWFLAKE_MACHINE_ID, 10)
|
|
28
|
+
: NaN;
|
|
29
|
+
mid = !isNaN(envMid) ? envMid : (typeof process !== 'undefined' && process.pid ? process.pid & 0x3ff : 0);
|
|
30
|
+
}
|
|
31
|
+
mid = mid & 0x3ff; // 确保在 0-1023 范围
|
|
32
|
+
|
|
33
|
+
let now = Date.now();
|
|
34
|
+
let ts = now - EPOCH;
|
|
35
|
+
|
|
36
|
+
if (ts === snowflakeLastTs) {
|
|
37
|
+
snowflakeSeq = (snowflakeSeq + 1) & 0xfff; // 0-4095 循环
|
|
38
|
+
if (snowflakeSeq === 0) {
|
|
39
|
+
// 本毫秒序列号耗尽,等待下一毫秒
|
|
40
|
+
while (now <= Date.now()) {
|
|
41
|
+
now = Date.now();
|
|
42
|
+
}
|
|
43
|
+
ts = now - EPOCH;
|
|
44
|
+
}
|
|
45
|
+
} else {
|
|
46
|
+
snowflakeSeq = 0;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
snowflakeLastTs = ts;
|
|
50
|
+
|
|
51
|
+
// 雪花ID超过JS安全整数范围(2^53),不能用Number位运算,采用字符串拼接
|
|
52
|
+
const tsPart = ts * 4194304; // ts << 22,等价于 ts * 2^22
|
|
53
|
+
const midPart = mid * 4096; // mid << 12,等价于 mid * 2^12
|
|
54
|
+
return '' + (tsPart + midPart + snowflakeSeq);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* 生成 UUID v4 字符串(纯随机,无外部依赖)
|
|
61
|
+
* 格式:xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx,其中 y 为 8/9/a/b 之一
|
|
62
|
+
* @returns 符合 RFC 4122 v4 规范的 UUID 字符串
|
|
63
|
+
*/
|
|
64
|
+
function uuid(): string {
|
|
65
|
+
// crypto.getRandomValues 在 Node.js >= 11 和现代浏览器中可用
|
|
66
|
+
if (typeof crypto !== 'undefined' && crypto.getRandomValues) {
|
|
67
|
+
const bytes = new Uint8Array(16);
|
|
68
|
+
crypto.getRandomValues(bytes);
|
|
69
|
+
// 版本位:第6字节高4位设为 0100 (v4)
|
|
70
|
+
bytes[6] = (bytes[6] & 0x0f) | 0x40;
|
|
71
|
+
// 变体位:第8字节高2位设为 10
|
|
72
|
+
bytes[8] = (bytes[8] & 0x3f) | 0x80;
|
|
73
|
+
const hex = Array.from(bytes, b => b.toString(16).padStart(2, '0')).join('');
|
|
74
|
+
return hex.slice(0, 8) + '-' + hex.slice(8, 12) + '-' + hex.slice(12, 16) + '-' + hex.slice(16, 20) + '-' + hex.slice(20);
|
|
75
|
+
}
|
|
76
|
+
// 降级方案:Math.random
|
|
77
|
+
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
|
|
78
|
+
const r = Math.random() * 16 | 0;
|
|
79
|
+
const v = c === 'x' ? r : (r & 0x3 | 0x8);
|
|
80
|
+
return v.toString(16);
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
|
|
6
85
|
const MixinUtils = {
|
|
7
86
|
isNil(obj: any): boolean {
|
|
8
87
|
return typeof obj === 'undefined' || obj === null;
|
|
@@ -284,7 +363,24 @@ const MixinUtils = {
|
|
|
284
363
|
},
|
|
285
364
|
sleepMs(ms: number): Promise<any> {
|
|
286
365
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
287
|
-
}
|
|
366
|
+
},
|
|
367
|
+
|
|
368
|
+
/**
|
|
369
|
+
* 生成 UUID v4 字符串(纯随机,无外部依赖)
|
|
370
|
+
* 格式:xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx,其中 y 为 8/9/a/b 之一
|
|
371
|
+
* @returns 符合 RFC 4122 v4 规范的 UUID 字符串
|
|
372
|
+
*/
|
|
373
|
+
uuid: uuid,
|
|
374
|
+
|
|
375
|
+
/**
|
|
376
|
+
* 生成雪花ID(64位整数,以字符串返回)
|
|
377
|
+
* 结构:1位符号 + 41位时间戳(ms) + 10位机器ID + 12位序列号
|
|
378
|
+
* 同一毫秒内可生成 4096 个不重复ID,单机每秒可生成约 400 万个
|
|
379
|
+
*
|
|
380
|
+
* @param machineId 机器ID(0-1023),不传则依次从环境变量 SNOWFLAKE_MACHINE_ID、process.pid 获取
|
|
381
|
+
* @returns 雪花ID字符串
|
|
382
|
+
*/
|
|
383
|
+
generateSnowflakeId: generateSnowflakeId,
|
|
288
384
|
};
|
|
289
385
|
|
|
290
386
|
export { MixinUtils };
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { IOrderByItem } from '../interfaces';
|
|
2
|
+
import { MixinUtils } from './MixinUtils';
|
|
3
|
+
import { CommonException, Exceptions } from '../exceptions';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* OrderBy 解析工具类
|
|
7
|
+
*
|
|
8
|
+
* 提供统一的 orderBy 参数解析功能,支持多种格式:
|
|
9
|
+
* 1. 字符串格式(逗号分隔多个字段):
|
|
10
|
+
* - 标准 SQL 格式:'created_at DESC, amount ASC'
|
|
11
|
+
* - 简写 +/- 格式:'created_at-, amount+'('-' 表示 DESC,'+' 或省略表示 ASC)
|
|
12
|
+
* - 默认升序:'order_id'(无后缀时默认为 ASC)
|
|
13
|
+
*
|
|
14
|
+
* 2. 数组格式:
|
|
15
|
+
* - 纯对象数组:[{ fieldName: 'created_at', orderType: 'desc' }]
|
|
16
|
+
* - 混合数组(字符串+对象):['order_id+', { fieldName: 'amount', orderType: 'asc' }]
|
|
17
|
+
*
|
|
18
|
+
* SQL 注入防护:
|
|
19
|
+
* - 所有字段名必须通过 MixinUtils.isValidFieldName() 校验
|
|
20
|
+
* - 只允许 ASC/DESC 作为排序方向
|
|
21
|
+
*/
|
|
22
|
+
export class OrderByUtils {
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* 解析 orderBy 参数为 IOrderByItem 数组
|
|
26
|
+
*
|
|
27
|
+
* @param orderByStr 排序参数,可以是字符串或数组
|
|
28
|
+
* @returns IOrderByItem[] 解析后的排序项数组
|
|
29
|
+
*/
|
|
30
|
+
public static parseOrderBys(orderByStr: any): IOrderByItem[] {
|
|
31
|
+
if (MixinUtils.isEmpty(orderByStr)) {
|
|
32
|
+
return [];
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
// 数组格式:支持字符串和对象混合
|
|
36
|
+
if (Array.isArray(orderByStr)) {
|
|
37
|
+
return orderByStr
|
|
38
|
+
.map(item => this.parseOrderByItem(item))
|
|
39
|
+
.filter((o): o is IOrderByItem => !!o);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
// 字符串格式:逗号分隔多个字段
|
|
43
|
+
return orderByStr
|
|
44
|
+
.split(',')
|
|
45
|
+
.map(s => s.trim())
|
|
46
|
+
.filter(s => !!s)
|
|
47
|
+
.map(item => this.parseOrderByString(item))
|
|
48
|
+
.filter((o): o is IOrderByItem => !!o);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* 获取第一个排序项
|
|
53
|
+
*
|
|
54
|
+
* @param orderByStr 排序参数
|
|
55
|
+
* @returns IOrderByItem | null 第一个排序项,无则返回 null
|
|
56
|
+
*/
|
|
57
|
+
public static getFirstOrderBy(orderByStr: any): IOrderByItem | null {
|
|
58
|
+
const orderBys = this.parseOrderBys(orderByStr);
|
|
59
|
+
return orderBys.length > 0 ? orderBys[0] : null;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* 判断是否为 ASC 升序排序
|
|
64
|
+
*
|
|
65
|
+
* @param orderByStr 排序参数
|
|
66
|
+
* @returns true 表示 ASC,false 表示 DESC 或无排序
|
|
67
|
+
*/
|
|
68
|
+
public static isFirstOrderByAsc(orderByStr: any): boolean {
|
|
69
|
+
const first = this.getFirstOrderBy(orderByStr);
|
|
70
|
+
if (!first) {
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
return first.orderType.toUpperCase() === 'ASC';
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* 判断是否为 DESC 降序排序
|
|
78
|
+
*
|
|
79
|
+
* @param orderByStr 排序参数
|
|
80
|
+
* @returns true 表示 DESC,false 表示 ASC 或无排序
|
|
81
|
+
*/
|
|
82
|
+
public static isFirstOrderByDesc(orderByStr: any): boolean {
|
|
83
|
+
const first = this.getFirstOrderBy(orderByStr);
|
|
84
|
+
if (!first) {
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
return first.orderType.toUpperCase() === 'DESC';
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* 判断排序字段是否匹配指定的时间字段
|
|
92
|
+
*
|
|
93
|
+
* 用于分表查询时校验排序字段是否为分表字段
|
|
94
|
+
*
|
|
95
|
+
* @param orderByStr 排序参数
|
|
96
|
+
* @param timeColumn 时间字段名
|
|
97
|
+
* @returns true 表示匹配,false 表示不匹配或无排序
|
|
98
|
+
*/
|
|
99
|
+
public static isOrderByTimeColumn(orderByStr: any, timeColumn: string): boolean {
|
|
100
|
+
const first = this.getFirstOrderBy(orderByStr);
|
|
101
|
+
if (!first) {
|
|
102
|
+
return false;
|
|
103
|
+
}
|
|
104
|
+
return first.fieldName === timeColumn;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/**
|
|
108
|
+
* 解析单个排序项(数组元素)
|
|
109
|
+
*/
|
|
110
|
+
private static parseOrderByItem(item: any): IOrderByItem | null {
|
|
111
|
+
// 字符串格式:解析标准 SQL 格式或简写格式
|
|
112
|
+
if (typeof item === 'string') {
|
|
113
|
+
return this.parseOrderByString(item);
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
// 对象格式:提取 fieldName 和 orderType
|
|
117
|
+
const { fieldName, orderType = 'asc' } = item || {};
|
|
118
|
+
if (!fieldName) {
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
this.validateFieldName(fieldName, fieldName);
|
|
123
|
+
return { fieldName, orderType };
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/**
|
|
127
|
+
* 解析字符串格式的排序项(支持标准 SQL 和简写格式)
|
|
128
|
+
*/
|
|
129
|
+
private static parseOrderByString(orderByStr: string): IOrderByItem | null {
|
|
130
|
+
let orderType = 'asc';
|
|
131
|
+
let fieldName = orderByStr;
|
|
132
|
+
|
|
133
|
+
// 检查是否为空格分隔的标准 SQL 格式(如 'created_at DESC')
|
|
134
|
+
const spaceIndex = orderByStr.lastIndexOf(' ');
|
|
135
|
+
if (spaceIndex > 0) {
|
|
136
|
+
const beforeSpace = orderByStr.substring(0, spaceIndex).trim();
|
|
137
|
+
const afterSpace = orderByStr.substring(spaceIndex + 1).trim().toUpperCase();
|
|
138
|
+
|
|
139
|
+
if (afterSpace === 'ASC' || afterSpace === 'DESC') {
|
|
140
|
+
fieldName = beforeSpace;
|
|
141
|
+
orderType = afterSpace.toLowerCase() as 'asc' | 'desc';
|
|
142
|
+
} else {
|
|
143
|
+
throw new CommonException(Exceptions.REQUEST_MODEL_PARSE_ORDER_BY_FAILED, orderByStr);
|
|
144
|
+
}
|
|
145
|
+
} else if (orderByStr.endsWith('+')) {
|
|
146
|
+
// 简写格式:+ 表示升序
|
|
147
|
+
fieldName = orderByStr.slice(0, -1);
|
|
148
|
+
orderType = 'asc';
|
|
149
|
+
} else if (orderByStr.endsWith('-')) {
|
|
150
|
+
// 简写格式:- 表示降序
|
|
151
|
+
fieldName = orderByStr.slice(0, -1);
|
|
152
|
+
orderType = 'desc';
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
fieldName = fieldName.trim();
|
|
156
|
+
this.validateFieldName(fieldName, orderByStr);
|
|
157
|
+
|
|
158
|
+
return { fieldName, orderType };
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* SQL 注入防护:校验字段名格式
|
|
163
|
+
*/
|
|
164
|
+
private static validateFieldName(fieldName: string, originalValue: string): void {
|
|
165
|
+
if (MixinUtils.isEmpty(fieldName) || !MixinUtils.isValidFieldName(fieldName)) {
|
|
166
|
+
throw new CommonException(Exceptions.REQUEST_MODEL_PARSE_ORDER_BY_FAILED, originalValue);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
}
|
|
@@ -50,7 +50,7 @@ const validatorUtils = {
|
|
|
50
50
|
},
|
|
51
51
|
|
|
52
52
|
isMomentValid(itemCfg: string, itemValue: any): boolean {
|
|
53
|
-
const cfgPart = itemCfg.substring(KeysOfValidators.
|
|
53
|
+
const cfgPart = itemCfg.substring(KeysOfValidators.MOMENT.length).trim();
|
|
54
54
|
return moment(itemValue, cfgPart, true).isValid();
|
|
55
55
|
},
|
|
56
56
|
|