@reglow/reglow 0.4.5 → 0.6.0
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/README.md +76 -16
- package/dist/reglow/common/sort.d.ts +66 -0
- package/dist/reglow/common/sort.js +102 -0
- package/dist/reglow/common/sort.js.map +1 -0
- package/dist/reglow/core/config.d.ts +3 -0
- package/dist/reglow/core/config.js +11 -1
- package/dist/reglow/core/config.js.map +1 -1
- package/dist/reglow/core/models.d.ts +2 -0
- package/dist/reglow/core/models.js +1 -0
- package/dist/reglow/core/models.js.map +1 -1
- package/dist/reglow/core/tenant_guard.d.ts +26 -0
- package/dist/reglow/core/tenant_guard.js +116 -0
- package/dist/reglow/core/tenant_guard.js.map +1 -0
- package/dist/reglow/modules/agreement/controller.js +48 -15
- package/dist/reglow/modules/agreement/controller.js.map +1 -1
- package/dist/reglow/modules/agreement/repository.d.ts +6 -2
- package/dist/reglow/modules/agreement/repository.js +50 -10
- package/dist/reglow/modules/agreement/repository.js.map +1 -1
- package/dist/reglow/modules/agreement/service.d.ts +2 -2
- package/dist/reglow/modules/agreement/service.js +4 -4
- package/dist/reglow/modules/agreement/service.js.map +1 -1
- package/dist/reglow/modules/ai/controller.js +22 -7
- package/dist/reglow/modules/ai/controller.js.map +1 -1
- package/dist/reglow/modules/article/controller.js +65 -18
- package/dist/reglow/modules/article/controller.js.map +1 -1
- package/dist/reglow/modules/article/repository.d.ts +6 -2
- package/dist/reglow/modules/article/repository.js +48 -10
- package/dist/reglow/modules/article/repository.js.map +1 -1
- package/dist/reglow/modules/article/service.d.ts +2 -2
- package/dist/reglow/modules/article/service.js +10 -8
- package/dist/reglow/modules/article/service.js.map +1 -1
- package/dist/reglow/modules/config/controller.js +1 -1
- package/dist/reglow/modules/config/controller.js.map +1 -1
- package/dist/reglow/modules/config/repository.d.ts +3 -1
- package/dist/reglow/modules/config/repository.js +18 -4
- package/dist/reglow/modules/config/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/controller.js +77 -23
- package/dist/reglow/modules/customer_service/controller.js.map +1 -1
- package/dist/reglow/modules/customer_service/repository.d.ts +15 -5
- package/dist/reglow/modules/customer_service/repository.js +93 -15
- package/dist/reglow/modules/customer_service/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/service.d.ts +5 -5
- package/dist/reglow/modules/customer_service/service.js +10 -10
- package/dist/reglow/modules/customer_service/service.js.map +1 -1
- package/dist/reglow/modules/dashboard/controller.d.ts +6 -0
- package/dist/reglow/modules/dashboard/controller.js +8 -0
- package/dist/reglow/modules/dashboard/controller.js.map +1 -0
- package/dist/reglow/modules/dashboard/router.d.ts +11 -0
- package/dist/reglow/modules/dashboard/router.js +9 -0
- package/dist/reglow/modules/dashboard/router.js.map +1 -0
- package/dist/reglow/modules/dashboard/service.d.ts +8 -0
- package/dist/reglow/modules/dashboard/service.js +34 -0
- package/dist/reglow/modules/dashboard/service.js.map +1 -0
- package/dist/reglow/modules/dept/controller.js +2 -2
- package/dist/reglow/modules/dept/controller.js.map +1 -1
- package/dist/reglow/modules/dept/repository.d.ts +3 -1
- package/dist/reglow/modules/dept/repository.js +42 -5
- package/dist/reglow/modules/dept/repository.js.map +1 -1
- package/dist/reglow/modules/dept/service.d.ts +1 -1
- package/dist/reglow/modules/dept/service.js +2 -2
- package/dist/reglow/modules/dept/service.js.map +1 -1
- package/dist/reglow/modules/dict/controller.js +18 -6
- package/dist/reglow/modules/dict/controller.js.map +1 -1
- package/dist/reglow/modules/dict/repository.d.ts +6 -2
- package/dist/reglow/modules/dict/repository.js +28 -7
- package/dist/reglow/modules/dict/repository.js.map +1 -1
- package/dist/reglow/modules/dict/service.d.ts +2 -2
- package/dist/reglow/modules/dict/service.js +4 -4
- package/dist/reglow/modules/dict/service.js.map +1 -1
- package/dist/reglow/modules/employee/controller.js +1 -1
- package/dist/reglow/modules/employee/controller.js.map +1 -1
- package/dist/reglow/modules/employee/repository.d.ts +3 -1
- package/dist/reglow/modules/employee/repository.js +35 -4
- package/dist/reglow/modules/employee/repository.js.map +1 -1
- package/dist/reglow/modules/employee/service.d.ts +1 -1
- package/dist/reglow/modules/employee/service.js +2 -2
- package/dist/reglow/modules/employee/service.js.map +1 -1
- package/dist/reglow/modules/log/controller.js +46 -7
- package/dist/reglow/modules/log/controller.js.map +1 -1
- package/dist/reglow/modules/material/controller.js +32 -11
- package/dist/reglow/modules/material/controller.js.map +1 -1
- package/dist/reglow/modules/material/repository.d.ts +4 -2
- package/dist/reglow/modules/material/repository.js +24 -7
- package/dist/reglow/modules/material/repository.js.map +1 -1
- package/dist/reglow/modules/material/service.d.ts +2 -2
- package/dist/reglow/modules/material/service.js +11 -7
- package/dist/reglow/modules/material/service.js.map +1 -1
- package/dist/reglow/modules/menu/controller.js +1 -1
- package/dist/reglow/modules/menu/controller.js.map +1 -1
- package/dist/reglow/modules/message/controller.js +32 -13
- package/dist/reglow/modules/message/controller.js.map +1 -1
- package/dist/reglow/modules/message/repository.d.ts +7 -3
- package/dist/reglow/modules/message/repository.js +63 -19
- package/dist/reglow/modules/message/repository.js.map +1 -1
- package/dist/reglow/modules/message/service.d.ts +3 -3
- package/dist/reglow/modules/message/service.js +18 -8
- package/dist/reglow/modules/message/service.js.map +1 -1
- package/dist/reglow/modules/notice/controller.js +22 -7
- package/dist/reglow/modules/notice/controller.js.map +1 -1
- package/dist/reglow/modules/notice/repository.d.ts +4 -2
- package/dist/reglow/modules/notice/repository.js +24 -9
- package/dist/reglow/modules/notice/repository.js.map +1 -1
- package/dist/reglow/modules/notice/service.d.ts +2 -2
- package/dist/reglow/modules/notice/service.js +16 -7
- package/dist/reglow/modules/notice/service.js.map +1 -1
- package/dist/reglow/modules/photo/controller.js +52 -19
- package/dist/reglow/modules/photo/controller.js.map +1 -1
- package/dist/reglow/modules/photo/controller_client.js +37 -15
- package/dist/reglow/modules/photo/controller_client.js.map +1 -1
- package/dist/reglow/modules/photo/policy.d.ts +35 -0
- package/dist/reglow/modules/photo/policy.js +40 -0
- package/dist/reglow/modules/photo/policy.js.map +1 -0
- package/dist/reglow/modules/photo/repository.d.ts +6 -2
- package/dist/reglow/modules/photo/repository.js +53 -8
- package/dist/reglow/modules/photo/repository.js.map +1 -1
- package/dist/reglow/modules/photo/service.d.ts +2 -2
- package/dist/reglow/modules/photo/service.js +23 -11
- package/dist/reglow/modules/photo/service.js.map +1 -1
- package/dist/reglow/modules/post/controller.js +1 -1
- package/dist/reglow/modules/post/controller.js.map +1 -1
- package/dist/reglow/modules/post/repository.d.ts +3 -1
- package/dist/reglow/modules/post/repository.js +26 -6
- package/dist/reglow/modules/post/repository.js.map +1 -1
- package/dist/reglow/modules/post/service.d.ts +1 -1
- package/dist/reglow/modules/post/service.js +2 -2
- package/dist/reglow/modules/post/service.js.map +1 -1
- package/dist/reglow/modules/role/controller.js +1 -1
- package/dist/reglow/modules/role/controller.js.map +1 -1
- package/dist/reglow/modules/role/repository.d.ts +3 -1
- package/dist/reglow/modules/role/repository.js +38 -9
- package/dist/reglow/modules/role/repository.js.map +1 -1
- package/dist/reglow/modules/role/service.d.ts +1 -1
- package/dist/reglow/modules/role/service.js +2 -2
- package/dist/reglow/modules/role/service.js.map +1 -1
- package/dist/reglow/modules/security/audit_chain.d.ts +64 -0
- package/dist/reglow/modules/security/audit_chain.js +91 -0
- package/dist/reglow/modules/security/audit_chain.js.map +1 -0
- package/dist/reglow/modules/security/crypto.d.ts +18 -0
- package/dist/reglow/modules/security/crypto.js +78 -0
- package/dist/reglow/modules/security/crypto.js.map +1 -0
- package/dist/reglow/modules/security/repository.d.ts +6 -0
- package/dist/reglow/modules/security/repository.js +30 -0
- package/dist/reglow/modules/security/repository.js.map +1 -0
- package/dist/reglow/modules/user/controller.js +1 -1
- package/dist/reglow/modules/user/controller.js.map +1 -1
- package/dist/reglow/modules/user/repository.d.ts +3 -1
- package/dist/reglow/modules/user/repository.js +30 -3
- package/dist/reglow/modules/user/repository.js.map +1 -1
- package/dist/reglow/modules/user/service.d.ts +1 -1
- package/dist/reglow/modules/user/service.js +2 -2
- package/dist/reglow/modules/user/service.js.map +1 -1
- package/dist/reglow/modules/video/controller.js +67 -20
- package/dist/reglow/modules/video/controller.js.map +1 -1
- package/dist/reglow/modules/video/repository.d.ts +6 -2
- package/dist/reglow/modules/video/repository.js +41 -8
- package/dist/reglow/modules/video/repository.js.map +1 -1
- package/dist/reglow/modules/video/service.d.ts +2 -2
- package/dist/reglow/modules/video/service.js +16 -10
- package/dist/reglow/modules/video/service.js.map +1 -1
- package/dist/reglow/scripts/init-data.js +28 -1
- package/dist/reglow/scripts/init-data.js.map +1 -1
- package/dist/reglow/scripts/schema.js +16 -0
- package/dist/reglow/scripts/schema.js.map +1 -1
- package/dist/server.js +23 -1
- package/dist/server.js.map +1 -1
- package/package.json +7 -3
|
@@ -4,17 +4,37 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { knex } from "../../core/database.js";
|
|
6
6
|
import { ModelRegistry } from "../../core/models.js";
|
|
7
|
+
import { applySort } from "../../common/sort.js";
|
|
7
8
|
const R = ModelRegistry.get("Role");
|
|
8
9
|
const RM = ModelRegistry.get("RoleMenu");
|
|
9
10
|
const RD = ModelRegistry.get("RoleDept");
|
|
10
11
|
const ER = ModelRegistry.get("EmployeeRole");
|
|
11
12
|
const E = ModelRegistry.get("Employee");
|
|
13
|
+
/** sys_role 表可排序列白名单(自有列,无敏感列) */
|
|
14
|
+
export const ROLE_SORTABLE_COLUMNS = [
|
|
15
|
+
"id",
|
|
16
|
+
"name",
|
|
17
|
+
"code",
|
|
18
|
+
"description",
|
|
19
|
+
"data_scope",
|
|
20
|
+
"sort",
|
|
21
|
+
"status",
|
|
22
|
+
"created_at",
|
|
23
|
+
"updated_at",
|
|
24
|
+
"deleted_at",
|
|
25
|
+
];
|
|
12
26
|
export class RoleRepository {
|
|
13
27
|
async findById(id) {
|
|
14
|
-
return (await knex(R)
|
|
28
|
+
return (await knex(R)
|
|
29
|
+
.where("id", id)
|
|
30
|
+
.whereNull("deleted_at")
|
|
31
|
+
.first());
|
|
15
32
|
}
|
|
16
33
|
async findByCode(code) {
|
|
17
|
-
return (await knex(R)
|
|
34
|
+
return (await knex(R)
|
|
35
|
+
.where("code", code)
|
|
36
|
+
.whereNull("deleted_at")
|
|
37
|
+
.first());
|
|
18
38
|
}
|
|
19
39
|
async create(data) {
|
|
20
40
|
const [id] = await knex(R).insert(data);
|
|
@@ -27,7 +47,7 @@ export class RoleRepository {
|
|
|
27
47
|
async softDelete(id) {
|
|
28
48
|
await knex(R).where("id", id).update({ deleted_at: knex.fn.now() });
|
|
29
49
|
}
|
|
30
|
-
async findAll(page, size, keyword, status) {
|
|
50
|
+
async findAll(page, size, keyword, status, sortBy, sortOrder) {
|
|
31
51
|
let query = knex(R).whereNull("deleted_at");
|
|
32
52
|
let countQuery = knex(R).whereNull("deleted_at");
|
|
33
53
|
if (keyword) {
|
|
@@ -39,15 +59,19 @@ export class RoleRepository {
|
|
|
39
59
|
query = query.where("status", status);
|
|
40
60
|
countQuery = countQuery.where("status", status);
|
|
41
61
|
}
|
|
42
|
-
const items = (await query
|
|
43
|
-
.orderBy("sort", "asc")
|
|
62
|
+
const items = (await applySort(query, sortBy, sortOrder, ROLE_SORTABLE_COLUMNS, [["sort", "asc"]])
|
|
44
63
|
.offset((page - 1) * size)
|
|
45
64
|
.limit(size));
|
|
46
65
|
const totalRow = await countQuery.count({ c: "*" }).first();
|
|
47
|
-
return {
|
|
66
|
+
return {
|
|
67
|
+
items,
|
|
68
|
+
total: Number(totalRow.c) || 0,
|
|
69
|
+
};
|
|
48
70
|
}
|
|
49
71
|
async getRoleMenuIds(roleId) {
|
|
50
|
-
const rows = (await knex(RM)
|
|
72
|
+
const rows = (await knex(RM)
|
|
73
|
+
.where("role_id", roleId)
|
|
74
|
+
.select("menu_id"));
|
|
51
75
|
return rows.map((r) => r.menu_id);
|
|
52
76
|
}
|
|
53
77
|
async assignMenus(roleId, menuIds) {
|
|
@@ -57,7 +81,9 @@ export class RoleRepository {
|
|
|
57
81
|
}
|
|
58
82
|
}
|
|
59
83
|
async getRoleDeptIds(roleId) {
|
|
60
|
-
const rows = (await knex(RD)
|
|
84
|
+
const rows = (await knex(RD)
|
|
85
|
+
.where("role_id", roleId)
|
|
86
|
+
.select("dept_id"));
|
|
61
87
|
return rows.map((r) => r.dept_id);
|
|
62
88
|
}
|
|
63
89
|
async setDataScope(roleId, dataScope, deptIds) {
|
|
@@ -69,7 +95,10 @@ export class RoleRepository {
|
|
|
69
95
|
return (await knex(R).where("id", roleId).first());
|
|
70
96
|
}
|
|
71
97
|
async hasAdmins(roleId) {
|
|
72
|
-
const row = await knex(ER)
|
|
98
|
+
const row = await knex(ER)
|
|
99
|
+
.where("role_id", roleId)
|
|
100
|
+
.count({ c: "*" })
|
|
101
|
+
.first();
|
|
73
102
|
return Number(row.c) > 0;
|
|
74
103
|
}
|
|
75
104
|
async listAdmins(roleId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/role/repository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/role/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class RoleService {
|
|
|
11
11
|
createRole(data: CreateRoleBody): Promise<Role>;
|
|
12
12
|
updateRole(roleId: number, data: UpdateRoleBody): Promise<Role>;
|
|
13
13
|
deleteRole(roleId: number): Promise<void>;
|
|
14
|
-
listRoles(page: number, size: number, keyword: string | null, status: number | null): Promise<{
|
|
14
|
+
listRoles(page: number, size: number, keyword: string | null, status: number | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
15
15
|
items: Role[];
|
|
16
16
|
total: number;
|
|
17
17
|
}>;
|
|
@@ -49,8 +49,8 @@ export class RoleService {
|
|
|
49
49
|
}
|
|
50
50
|
await this.repo.softDelete(roleId);
|
|
51
51
|
}
|
|
52
|
-
async listRoles(page, size, keyword, status) {
|
|
53
|
-
return await this.repo.findAll(page, size, keyword, status);
|
|
52
|
+
async listRoles(page, size, keyword, status, sortBy, sortOrder) {
|
|
53
|
+
return await this.repo.findAll(page, size, keyword, status, sortBy, sortOrder);
|
|
54
54
|
}
|
|
55
55
|
async assignMenus(roleId, menuIds) {
|
|
56
56
|
await this.getRole(roleId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/role/service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIjE,MAAM,OAAO,WAAW;IACtB,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;IAE5B,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI;YACP,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAoB;QACnC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;YACrC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,CAAC;YAChC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC;YACpB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC;SACzB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,IAAoB;QACnD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,KAAK,MAAM,KAAK,IAAI;YAClB,MAAM;YACN,MAAM;YACN,aAAa;YACb,YAAY;YACZ,MAAM;YACN,QAAQ;SACT,EAAE,CAAC;YACF,MAAM,CAAC,GAAI,IAAgC,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI;gBAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc;QAC7B,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,SAAS,CACb,IAAY,EACZ,IAAY,EACZ,OAAsB,EACtB,MAAqB;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/role/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 审计防篡改(哈希链)—— 等保支撑。
|
|
3
|
+
* 对应 Python 的 reglow/modules/security/audit_chain.py、Java 的 AuditChain.java
|
|
4
|
+
*
|
|
5
|
+
* 原理:每条审计记录 hash = H(prev_hash \n category \n action \n operator \n detail \n ts);
|
|
6
|
+
* 篡改任一条会导致其后全部记录校验失败(GB/T 22239:审计日志不得被普通操作员删除 / 篡改)。
|
|
7
|
+
*
|
|
8
|
+
* ⚠️ 哈希输入必须与 contract/audit_chain.json 逐位一致,否则跨语言链断裂、等保测评不通过。
|
|
9
|
+
*/
|
|
10
|
+
import { type CryptoProvider } from "./crypto.js";
|
|
11
|
+
/** 链首记录的前序哈希 */
|
|
12
|
+
export declare const GENESIS = "GENESIS";
|
|
13
|
+
/**
|
|
14
|
+
* 哈希输入的时间戳格式:本地墙钟、固定 6 位微秒、不带时区后缀。
|
|
15
|
+
*
|
|
16
|
+
* 不能用 Date.toISOString()(UTC 且带 Z 后缀)。
|
|
17
|
+
*
|
|
18
|
+
* 精度说明:JS 的 Date 只有**毫秒**精度,故微秒位后三位恒为 0(如 `.123000`)。
|
|
19
|
+
* 这不影响链的一致性 —— ts 是原样落库、verify 时原样读回参与哈希;
|
|
20
|
+
* 但若与其他语言混用同一张表,node 写入的记录精度低于其他语言(值本身仍然自洽)。
|
|
21
|
+
*/
|
|
22
|
+
export declare function formatTs(d: Date): string;
|
|
23
|
+
/** 计算记录哈希:H(prev_hash \n category \n action \n operator \n detail \n ts) */
|
|
24
|
+
export declare function buildHash(provider: CryptoProvider, prevHash: string, category: string, action: string, operator: string | null | undefined, detail: string | null | undefined, ts: string): string;
|
|
25
|
+
/** 审计记录行(表 sys_security_audit) */
|
|
26
|
+
export interface AuditLogRow {
|
|
27
|
+
id?: number;
|
|
28
|
+
category: string;
|
|
29
|
+
action: string;
|
|
30
|
+
operator: string | null;
|
|
31
|
+
detail: string | null;
|
|
32
|
+
prev_hash: string;
|
|
33
|
+
hash: string;
|
|
34
|
+
/** 参与哈希的规范化时间戳(原样存储,verify 直接读回) */
|
|
35
|
+
ts: string;
|
|
36
|
+
created_at?: Date | string | null;
|
|
37
|
+
updated_at?: Date | string | null;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* 存储抽象 —— 让链条行为可脱离数据库测试(也便于替换存储实现)。
|
|
41
|
+
*/
|
|
42
|
+
export interface AuditLogStore {
|
|
43
|
+
/** 链尾记录的 hash(无记录时返回 null) */
|
|
44
|
+
lastHash(): Promise<string | null>;
|
|
45
|
+
insert(row: AuditLogRow): Promise<AuditLogRow>;
|
|
46
|
+
/** 按 id 升序取全链 */
|
|
47
|
+
listAscending(): Promise<AuditLogRow[]>;
|
|
48
|
+
}
|
|
49
|
+
export interface VerifyResult {
|
|
50
|
+
ok: boolean;
|
|
51
|
+
message: string;
|
|
52
|
+
}
|
|
53
|
+
export declare class AuditChain {
|
|
54
|
+
private readonly store;
|
|
55
|
+
private readonly provider;
|
|
56
|
+
constructor(store: AuditLogStore, provider?: CryptoProvider);
|
|
57
|
+
/** 追加一条审计记录(自动链接前序哈希) */
|
|
58
|
+
append(category: string, action: string, operator?: string | null, detail?: string | null): Promise<AuditLogRow>;
|
|
59
|
+
/**
|
|
60
|
+
* 校验整条链完整性:按 id 升序逐条重算。
|
|
61
|
+
* 先校验 prev_hash 连续,再重算本条 hash;空链视为通过。
|
|
62
|
+
*/
|
|
63
|
+
verify(): Promise<VerifyResult>;
|
|
64
|
+
}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 审计防篡改(哈希链)—— 等保支撑。
|
|
3
|
+
* 对应 Python 的 reglow/modules/security/audit_chain.py、Java 的 AuditChain.java
|
|
4
|
+
*
|
|
5
|
+
* 原理:每条审计记录 hash = H(prev_hash \n category \n action \n operator \n detail \n ts);
|
|
6
|
+
* 篡改任一条会导致其后全部记录校验失败(GB/T 22239:审计日志不得被普通操作员删除 / 篡改)。
|
|
7
|
+
*
|
|
8
|
+
* ⚠️ 哈希输入必须与 contract/audit_chain.json 逐位一致,否则跨语言链断裂、等保测评不通过。
|
|
9
|
+
*/
|
|
10
|
+
import { getCryptoProvider } from "./crypto.js";
|
|
11
|
+
/** 链首记录的前序哈希 */
|
|
12
|
+
export const GENESIS = "GENESIS";
|
|
13
|
+
/**
|
|
14
|
+
* 哈希输入的时间戳格式:本地墙钟、固定 6 位微秒、不带时区后缀。
|
|
15
|
+
*
|
|
16
|
+
* 不能用 Date.toISOString()(UTC 且带 Z 后缀)。
|
|
17
|
+
*
|
|
18
|
+
* 精度说明:JS 的 Date 只有**毫秒**精度,故微秒位后三位恒为 0(如 `.123000`)。
|
|
19
|
+
* 这不影响链的一致性 —— ts 是原样落库、verify 时原样读回参与哈希;
|
|
20
|
+
* 但若与其他语言混用同一张表,node 写入的记录精度低于其他语言(值本身仍然自洽)。
|
|
21
|
+
*/
|
|
22
|
+
export function formatTs(d) {
|
|
23
|
+
const p = (n, width = 2) => String(n).padStart(width, "0");
|
|
24
|
+
const date = `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
|
|
25
|
+
const time = `${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
|
|
26
|
+
return `${date}T${time}.${p(d.getMilliseconds() * 1000, 6)}`;
|
|
27
|
+
}
|
|
28
|
+
/** 计算记录哈希:H(prev_hash \n category \n action \n operator \n detail \n ts) */
|
|
29
|
+
export function buildHash(provider, prevHash, category, action, operator, detail, ts) {
|
|
30
|
+
const content = [prevHash, category, action, operator ?? "", detail ?? "", ts].join("\n");
|
|
31
|
+
return provider.hash(Buffer.from(content, "utf8"));
|
|
32
|
+
}
|
|
33
|
+
function head(hash) {
|
|
34
|
+
return hash ? hash.slice(0, 12) : "null";
|
|
35
|
+
}
|
|
36
|
+
export class AuditChain {
|
|
37
|
+
store;
|
|
38
|
+
provider;
|
|
39
|
+
constructor(store, provider = getCryptoProvider()) {
|
|
40
|
+
this.store = store;
|
|
41
|
+
this.provider = provider;
|
|
42
|
+
}
|
|
43
|
+
/** 追加一条审计记录(自动链接前序哈希) */
|
|
44
|
+
async append(category, action, operator = null, detail = null) {
|
|
45
|
+
const prevHash = (await this.store.lastHash()) ?? GENESIS;
|
|
46
|
+
const now = new Date(); // 本地墙钟,与全库时区约定一致
|
|
47
|
+
const ts = formatTs(now);
|
|
48
|
+
const hash = buildHash(this.provider, prevHash, category, action, operator, detail, ts);
|
|
49
|
+
return this.store.insert({
|
|
50
|
+
category,
|
|
51
|
+
action,
|
|
52
|
+
operator,
|
|
53
|
+
detail,
|
|
54
|
+
prev_hash: prevHash,
|
|
55
|
+
hash,
|
|
56
|
+
// 哈希输入以 ts 为准(原样落库,verify 直接读回,不重新格式化)
|
|
57
|
+
ts,
|
|
58
|
+
// created_at 仅供展示:MySQL 的 DATETIME 会丢弃小数秒,不能用于重算哈希
|
|
59
|
+
created_at: now,
|
|
60
|
+
updated_at: now,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* 校验整条链完整性:按 id 升序逐条重算。
|
|
65
|
+
* 先校验 prev_hash 连续,再重算本条 hash;空链视为通过。
|
|
66
|
+
*/
|
|
67
|
+
async verify() {
|
|
68
|
+
const rows = await this.store.listAscending();
|
|
69
|
+
if (rows.length === 0) {
|
|
70
|
+
return { ok: true, message: "chain empty" };
|
|
71
|
+
}
|
|
72
|
+
let prevHash = GENESIS;
|
|
73
|
+
for (const row of rows) {
|
|
74
|
+
if (row.prev_hash !== prevHash) {
|
|
75
|
+
return {
|
|
76
|
+
ok: false,
|
|
77
|
+
message: `记录 #${row.id} 前序哈希断裂(预期 ${head(prevHash)}…,实际 ${head(row.prev_hash)}…)`,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
// 用存储的 ts 重算,而不是格式化 created_at:
|
|
81
|
+
// created_at 在 MySQL 上会丢失小数秒,用它重算会把整条链误报为被篡改。
|
|
82
|
+
const expect = buildHash(this.provider, prevHash, row.category, row.action, row.operator, row.detail, row.ts);
|
|
83
|
+
if (expect !== row.hash) {
|
|
84
|
+
return { ok: false, message: `记录 #${row.id} 哈希被篡改` };
|
|
85
|
+
}
|
|
86
|
+
prevHash = row.hash;
|
|
87
|
+
}
|
|
88
|
+
return { ok: true, message: `chain ok (${rows.length} records)` };
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=audit_chain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audit_chain.js","sourceRoot":"","sources":["../../../../reglow/modules/security/audit_chain.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,iBAAiB,EAAuB,MAAM,aAAa,CAAC;AAErE,gBAAgB;AAChB,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;AAEjC;;;;;;;;GAQG;AACH,MAAM,UAAU,QAAQ,CAAC,CAAO;IAC9B,MAAM,CAAC,GAAG,CAAC,CAAS,EAAE,KAAK,GAAG,CAAC,EAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;IAC3E,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;IAC5E,OAAO,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,SAAS,CACvB,QAAwB,EACxB,QAAgB,EAChB,QAAgB,EAChB,MAAc,EACd,QAAmC,EACnC,MAAiC,EACjC,EAAU;IAEV,MAAM,OAAO,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1F,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;AACrD,CAAC;AAiCD,SAAS,IAAI,CAAC,IAA+B;IAC3C,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AAC3C,CAAC;AAED,MAAM,OAAO,UAAU;IAEF;IACA;IAFnB,YACmB,KAAoB,EACpB,WAA2B,iBAAiB,EAAE;QAD9C,UAAK,GAAL,KAAK,CAAe;QACpB,aAAQ,GAAR,QAAQ,CAAsC;IAC9D,CAAC;IAEJ,yBAAyB;IACzB,KAAK,CAAC,MAAM,CACV,QAAgB,EAChB,MAAc,EACd,WAA0B,IAAI,EAC9B,SAAwB,IAAI;QAE5B,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,OAAO,CAAC;QAE1D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,iBAAiB;QACzC,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAExF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACvB,QAAQ;YACR,MAAM;YACN,QAAQ;YACR,MAAM;YACN,SAAS,EAAE,QAAQ;YACnB,IAAI;YACJ,uCAAuC;YACvC,EAAE;YACF,mDAAmD;YACnD,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC9C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QAC9C,CAAC;QAED,IAAI,QAAQ,GAAG,OAAO,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,GAAG,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAC/B,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,OAAO,EAAE,OAAO,GAAG,CAAC,EAAE,cAAc,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI;iBAClF,CAAC;YACJ,CAAC;YACD,gCAAgC;YAChC,8CAA8C;YAC9C,MAAM,MAAM,GAAG,SAAS,CACtB,IAAI,CAAC,QAAQ,EACb,QAAQ,EACR,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,EAAE,CACP,CAAC;YACF,IAAI,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC;gBACxB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC;YACvD,CAAC;YACD,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC;QACtB,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,IAAI,CAAC,MAAM,WAAW,EAAE,CAAC;IACpE,CAAC;CACF"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export interface CryptoProvider {
|
|
2
|
+
/** 摘要(SM3 / SHA-256)→ hex */
|
|
3
|
+
hash(data: Buffer): string;
|
|
4
|
+
/** HMAC 签名(SM3 / SHA-256)→ hex */
|
|
5
|
+
sign(data: Buffer, key: Buffer): string;
|
|
6
|
+
/** 对称加密(SM4 / AES) */
|
|
7
|
+
encrypt(data: Buffer, key: Buffer): Buffer;
|
|
8
|
+
/** 对称解密(SM4 / AES) */
|
|
9
|
+
decrypt(data: Buffer, key: Buffer): Buffer;
|
|
10
|
+
/** provider 名称(sha256 / sm) */
|
|
11
|
+
readonly name: string;
|
|
12
|
+
}
|
|
13
|
+
/** 默认实现(SHA-256 + AES-CBC),行为与 Python `Sha256Provider` 逐项对齐 */
|
|
14
|
+
export declare const sha256Provider: CryptoProvider;
|
|
15
|
+
/** 国密实现骨架(SM2 / SM3 / SM4)—— 接口已就绪,接入合规国密库后落地 */
|
|
16
|
+
export declare const smProvider: CryptoProvider;
|
|
17
|
+
/** 按名称返回 provider(对齐 Python `get_crypto_provider`:sm → 国密,其余 → SHA-256) */
|
|
18
|
+
export declare function getCryptoProvider(name?: string | null): CryptoProvider;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 加密 / 签名 / 哈希抽象接口(可切国密)—— 等保支撑。
|
|
3
|
+
* 对应 Python 的 reglow/modules/security/crypto.py、Java 的 CryptoProvider.java
|
|
4
|
+
*
|
|
5
|
+
* 商用密码(SM2/SM3/SM4)适配前提:**接口先行**,实现可平滑切换到合规国密库。
|
|
6
|
+
* 默认 provider = SHA-256 / AES(非国密);密评 / 信创项目切换 provider 即可,业务代码零改动。
|
|
7
|
+
*
|
|
8
|
+
* 切换方式:环境变量 SECURITY_CRYPTO_PROVIDER(auto / sha256 / sm),auto → SHA-256。
|
|
9
|
+
*/
|
|
10
|
+
import crypto from "node:crypto";
|
|
11
|
+
/** 对齐 Python 的 `data + b"\x00" * (16 - len(data) % 16)`:整除时也补满 16 字节 */
|
|
12
|
+
function zeroPad(data) {
|
|
13
|
+
const pad = 16 - (data.length % 16);
|
|
14
|
+
return Buffer.concat([data, Buffer.alloc(pad)]);
|
|
15
|
+
}
|
|
16
|
+
/** 对齐 Python 的 `rstrip(b"\x00")` */
|
|
17
|
+
function stripTrailingZeros(data) {
|
|
18
|
+
let end = data.length;
|
|
19
|
+
while (end > 0 && data[end - 1] === 0)
|
|
20
|
+
end--;
|
|
21
|
+
return data.subarray(0, end);
|
|
22
|
+
}
|
|
23
|
+
/** 对齐 Python 的 `key[:32]` */
|
|
24
|
+
function aesKey(key) {
|
|
25
|
+
return key.length > 32 ? key.subarray(0, 32) : key;
|
|
26
|
+
}
|
|
27
|
+
/** 对齐 Python 的 `key[:16]` */
|
|
28
|
+
function aesIv(key) {
|
|
29
|
+
if (key.length < 16)
|
|
30
|
+
throw new Error("AES-CBC 需要至少 16 字节的 key");
|
|
31
|
+
return key.subarray(0, 16);
|
|
32
|
+
}
|
|
33
|
+
/** 默认实现(SHA-256 + AES-CBC),行为与 Python `Sha256Provider` 逐项对齐 */
|
|
34
|
+
export const sha256Provider = {
|
|
35
|
+
name: "sha256",
|
|
36
|
+
hash(data) {
|
|
37
|
+
return crypto.createHash("sha256").update(data).digest("hex");
|
|
38
|
+
},
|
|
39
|
+
sign(data, key) {
|
|
40
|
+
return crypto.createHmac("sha256", key).update(data).digest("hex");
|
|
41
|
+
},
|
|
42
|
+
encrypt(data, key) {
|
|
43
|
+
const k = aesKey(key);
|
|
44
|
+
const cipher = crypto.createCipheriv(`aes-${k.length * 8}-cbc`, k, aesIv(key));
|
|
45
|
+
cipher.setAutoPadding(false);
|
|
46
|
+
return Buffer.concat([cipher.update(zeroPad(data)), cipher.final()]);
|
|
47
|
+
},
|
|
48
|
+
decrypt(data, key) {
|
|
49
|
+
const k = aesKey(key);
|
|
50
|
+
const decipher = crypto.createDecipheriv(`aes-${k.length * 8}-cbc`, k, aesIv(key));
|
|
51
|
+
decipher.setAutoPadding(false);
|
|
52
|
+
return stripTrailingZeros(Buffer.concat([decipher.update(data), decipher.final()]));
|
|
53
|
+
},
|
|
54
|
+
};
|
|
55
|
+
/** 国密实现骨架(SM2 / SM3 / SM4)—— 接口已就绪,接入合规国密库后落地 */
|
|
56
|
+
export const smProvider = {
|
|
57
|
+
name: "sm",
|
|
58
|
+
hash() {
|
|
59
|
+
return notReady("SM3 摘要");
|
|
60
|
+
},
|
|
61
|
+
sign() {
|
|
62
|
+
return notReady("SM2 / HMAC-SM3 签名");
|
|
63
|
+
},
|
|
64
|
+
encrypt() {
|
|
65
|
+
return notReady("SM4 加密");
|
|
66
|
+
},
|
|
67
|
+
decrypt() {
|
|
68
|
+
return notReady("SM4 解密");
|
|
69
|
+
},
|
|
70
|
+
};
|
|
71
|
+
function notReady(what) {
|
|
72
|
+
throw new Error(`${what}:请接入合规国密库后启用(SECURITY_CRYPTO_PROVIDER=sm)`);
|
|
73
|
+
}
|
|
74
|
+
/** 按名称返回 provider(对齐 Python `get_crypto_provider`:sm → 国密,其余 → SHA-256) */
|
|
75
|
+
export function getCryptoProvider(name) {
|
|
76
|
+
return (name ?? "").trim().toLowerCase() === "sm" ? smProvider : sha256Provider;
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=crypto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../../reglow/modules/security/crypto.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { AuditLogRow, AuditLogStore } from "./audit_chain.js";
|
|
2
|
+
export declare class SecurityAuditLogRepository implements AuditLogStore {
|
|
3
|
+
lastHash(): Promise<string | null>;
|
|
4
|
+
insert(row: AuditLogRow): Promise<AuditLogRow>;
|
|
5
|
+
listAscending(): Promise<AuditLogRow[]>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 审计记录仓储(knex 实现)—— 对应 Python 的 audit_chain 中的数据访问部分
|
|
3
|
+
*/
|
|
4
|
+
import { knex } from "../../core/database.js";
|
|
5
|
+
import { ModelRegistry } from "../../core/models.js";
|
|
6
|
+
const T = ModelRegistry.get("SecurityAuditLog");
|
|
7
|
+
export class SecurityAuditLogRepository {
|
|
8
|
+
async lastHash() {
|
|
9
|
+
const row = (await knex(T).orderBy("id", "desc").first("hash"));
|
|
10
|
+
return row?.hash ?? null;
|
|
11
|
+
}
|
|
12
|
+
async insert(row) {
|
|
13
|
+
const ids = await knex(T).insert({
|
|
14
|
+
category: row.category,
|
|
15
|
+
action: row.action,
|
|
16
|
+
operator: row.operator,
|
|
17
|
+
detail: row.detail,
|
|
18
|
+
prev_hash: row.prev_hash,
|
|
19
|
+
hash: row.hash,
|
|
20
|
+
ts: row.ts,
|
|
21
|
+
created_at: row.created_at,
|
|
22
|
+
updated_at: row.updated_at,
|
|
23
|
+
});
|
|
24
|
+
return { ...row, id: Number(Array.isArray(ids) ? ids[0] : ids) };
|
|
25
|
+
}
|
|
26
|
+
async listAscending() {
|
|
27
|
+
return (await knex(T).orderBy("id", "asc"));
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=repository.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/security/repository.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEhD,MAAM,OAAO,0BAA0B;IACrC,KAAK,CAAC,QAAQ;QACZ,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAEjD,CAAC;QACd,OAAO,GAAG,EAAE,IAAI,IAAI,IAAI,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAgB;QAC3B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,UAAU,EAAE,GAAG,CAAC,UAAU;SAC3B,CAAC,CAAC;QACH,OAAO,EAAE,GAAG,GAAG,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAkB,CAAC;IAC/D,CAAC;CACF"}
|
|
@@ -80,7 +80,7 @@ export async function userRoutes(fastify) {
|
|
|
80
80
|
const query = request.query;
|
|
81
81
|
const page = Math.max(1, int(query.page, 1));
|
|
82
82
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
83
|
-
const { items, total } = await service.listUsers(page, size, query.keyword || null, intOrNull(query.status), query.source || null, toBoolOrNull(query.is_verified));
|
|
83
|
+
const { items, total } = await service.listUsers(page, size, query.keyword || null, intOrNull(query.status), query.source || null, toBoolOrNull(query.is_verified), query.sort_by || null, query.sort_order || null);
|
|
84
84
|
return ApiResponse.success(new PageData(items.map((u) => toUserListDto(u)), total, page, size));
|
|
85
85
|
});
|
|
86
86
|
fastify.get("/:user_id", { schema: { summary: "查询用户详情" }, preHandler: [fastify.requirePermission("system:user:list")] }, async (request) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/user/controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/user/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import type { User } from "../../core/entities.js";
|
|
2
|
+
/** sys_user 表可排序列白名单(自有列,排除 password_hash 等敏感列) */
|
|
3
|
+
export declare const USER_SORTABLE_COLUMNS: readonly string[];
|
|
2
4
|
export declare class UserRepository {
|
|
3
5
|
findById(id: number): Promise<User | undefined>;
|
|
4
6
|
findByPhone(phone: string): Promise<User | undefined>;
|
|
5
7
|
findByEmail(email: string): Promise<User | undefined>;
|
|
6
8
|
update(id: number, payload: Record<string, unknown>): Promise<User>;
|
|
7
9
|
softDelete(id: number): Promise<void>;
|
|
8
|
-
list(page: number, size: number, keyword: string | null, status: number | null, source: string | null, isVerified: boolean | null): Promise<{
|
|
10
|
+
list(page: number, size: number, keyword: string | null, status: number | null, source: string | null, isVerified: boolean | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
9
11
|
items: User[];
|
|
10
12
|
total: number;
|
|
11
13
|
}>;
|
|
@@ -4,7 +4,35 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { knex } from "../../core/database.js";
|
|
6
6
|
import { ModelRegistry } from "../../core/models.js";
|
|
7
|
+
import { applySort } from "../../common/sort.js";
|
|
7
8
|
const UserT = ModelRegistry.get("User");
|
|
9
|
+
/** sys_user 表可排序列白名单(自有列,排除 password_hash 等敏感列) */
|
|
10
|
+
export const USER_SORTABLE_COLUMNS = [
|
|
11
|
+
"id",
|
|
12
|
+
"username",
|
|
13
|
+
"nickname",
|
|
14
|
+
"real_name",
|
|
15
|
+
"avatar",
|
|
16
|
+
"gender",
|
|
17
|
+
"birthday",
|
|
18
|
+
"phone",
|
|
19
|
+
"email",
|
|
20
|
+
"region",
|
|
21
|
+
"bio",
|
|
22
|
+
"source",
|
|
23
|
+
"status",
|
|
24
|
+
"is_verified",
|
|
25
|
+
"vip_level",
|
|
26
|
+
"login_fail_count",
|
|
27
|
+
"lock_until",
|
|
28
|
+
"last_login_at",
|
|
29
|
+
"last_login_ip",
|
|
30
|
+
"registered_at",
|
|
31
|
+
"remark",
|
|
32
|
+
"created_at",
|
|
33
|
+
"updated_at",
|
|
34
|
+
"deleted_at",
|
|
35
|
+
];
|
|
8
36
|
export class UserRepository {
|
|
9
37
|
async findById(id) {
|
|
10
38
|
return (await knex(UserT)
|
|
@@ -34,7 +62,7 @@ export class UserRepository {
|
|
|
34
62
|
.whereNull("deleted_at")
|
|
35
63
|
.update({ deleted_at: knex.fn.now() });
|
|
36
64
|
}
|
|
37
|
-
async list(page, size, keyword, status, source, isVerified) {
|
|
65
|
+
async list(page, size, keyword, status, source, isVerified, sortBy, sortOrder) {
|
|
38
66
|
let query = knex(UserT).whereNull("deleted_at");
|
|
39
67
|
let countQuery = knex(UserT).whereNull("deleted_at");
|
|
40
68
|
if (keyword) {
|
|
@@ -60,8 +88,7 @@ export class UserRepository {
|
|
|
60
88
|
query = query.where("is_verified", isVerified ? 1 : 0);
|
|
61
89
|
countQuery = countQuery.where("is_verified", isVerified ? 1 : 0);
|
|
62
90
|
}
|
|
63
|
-
const items = (await query
|
|
64
|
-
.orderBy("id", "desc")
|
|
91
|
+
const items = (await applySort(query, sortBy, sortOrder, USER_SORTABLE_COLUMNS, [["id", "desc"]])
|
|
65
92
|
.offset((page - 1) * size)
|
|
66
93
|
.limit(size));
|
|
67
94
|
const totalRow = (await countQuery.count({ c: "*" }).first());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/user/repository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/user/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import type { UpdateUserBody, UserUpdateProfileBody } from "./schema.js";
|
|
|
5
5
|
export declare class UserService {
|
|
6
6
|
repo: UserRepository;
|
|
7
7
|
getUserId(userId: number): Promise<User>;
|
|
8
|
-
listUsers(page: number, size: number, keyword: string | null, status: number | null, source: string | null, isVerified: boolean | null): Promise<{
|
|
8
|
+
listUsers(page: number, size: number, keyword: string | null, status: number | null, source: string | null, isVerified: boolean | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
9
9
|
items: User[];
|
|
10
10
|
total: number;
|
|
11
11
|
}>;
|
|
@@ -36,8 +36,8 @@ export class UserService {
|
|
|
36
36
|
}
|
|
37
37
|
return user;
|
|
38
38
|
}
|
|
39
|
-
async listUsers(page, size, keyword, status, source, isVerified) {
|
|
40
|
-
return this.repo.list(page, size, keyword, status, source, isVerified);
|
|
39
|
+
async listUsers(page, size, keyword, status, source, isVerified, sortBy, sortOrder) {
|
|
40
|
+
return this.repo.list(page, size, keyword, status, source, isVerified, sortBy, sortOrder);
|
|
41
41
|
}
|
|
42
42
|
async updateUser(userId, data) {
|
|
43
43
|
await this.getUserId(userId);
|