@reglow/reglow 0.4.1 → 0.5.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 +51 -0
- 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.js +1 -1
- package/dist/reglow/core/payment.d.ts +16 -1
- package/dist/reglow/core/payment.js +25 -6
- package/dist/reglow/core/payment.js.map +1 -1
- package/dist/reglow/core/wechat.d.ts +11 -0
- package/dist/reglow/core/wechat.js +149 -0
- package/dist/reglow/core/wechat.js.map +1 -0
- package/dist/reglow/modules/agreement/controller.js +47 -14
- 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/article/controller.js +46 -13
- 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/dept/controller.js +1 -1
- 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 +26 -8
- 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/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/payment/schema.js +6 -2
- package/dist/reglow/modules/payment/schema.js.map +1 -1
- package/dist/reglow/modules/photo/controller.js +46 -13
- package/dist/reglow/modules/photo/controller.js.map +1 -1
- 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/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 +54 -15
- 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/modules/wechat/controller.d.ts +6 -0
- package/dist/reglow/modules/wechat/controller.js +41 -0
- package/dist/reglow/modules/wechat/controller.js.map +1 -0
- package/dist/reglow/modules/wechat/router.d.ts +10 -0
- package/dist/reglow/modules/wechat/router.js +8 -0
- package/dist/reglow/modules/wechat/router.js.map +1 -0
- package/dist/reglow/modules/wechat/schema.d.ts +14 -0
- package/dist/reglow/modules/wechat/schema.js +23 -0
- package/dist/reglow/modules/wechat/schema.js.map +1 -0
- package/package.json +3 -2
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 微信基础能力(小程序登录 / access_token / 小程序码)
|
|
3
|
+
*
|
|
4
|
+
* 统一封装微信开放平台基础接口,供各业务模块复用:
|
|
5
|
+
* - jscode2session: 小程序 wx.login 的 code 换取 openid
|
|
6
|
+
* - getMiniappAccessToken: 小程序 access_token(进程内单点缓存)
|
|
7
|
+
* - getMiniappQrcode: 生成小程序码(返回 data:image/png;base64,...)
|
|
8
|
+
*
|
|
9
|
+
* access_token 是应用级单例资源:微信侧对同一 appid 下发新 token 会使旧 token 失效,
|
|
10
|
+
* 各业务模块若各自获取会互相顶掉并触发随机 40001/40014,因此统一由本模块集中缓存,
|
|
11
|
+
* 并配合同 appid 的并发锁(模块级 Map)保证并发刷新只发一次请求。
|
|
12
|
+
*
|
|
13
|
+
* 配置项(sys_setting,group=payment):wechat_mini_app_id / wechat_mini_app_secret
|
|
14
|
+
* 对应 backend-python 的 reglow/core/wechat.py
|
|
15
|
+
*/
|
|
16
|
+
const JSCODE2SESSION_URL = "https://api.weixin.qq.com/sns/jscode2session";
|
|
17
|
+
const ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token";
|
|
18
|
+
const WXACODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit";
|
|
19
|
+
// access_token 缓存:appid -> { token, expireAt }
|
|
20
|
+
const tokenCache = new Map();
|
|
21
|
+
// 按 appid 加锁(进行中的 Promise),避免并发刷新互相顶掉
|
|
22
|
+
const tokenLocks = new Map();
|
|
23
|
+
/** 从支付配置中读取小程序 AppID / AppSecret */
|
|
24
|
+
export function getMiniappConfig(config) {
|
|
25
|
+
const appid = config["wechat_mini_app_id"] || "";
|
|
26
|
+
const secret = config["wechat_mini_app_secret"] || "";
|
|
27
|
+
if (!appid || !secret) {
|
|
28
|
+
throw new Error("微信小程序未配置:请在支付设置中填写小程序 AppID 与小程序 AppSecret");
|
|
29
|
+
}
|
|
30
|
+
return { appid, secret };
|
|
31
|
+
}
|
|
32
|
+
/** 小程序 wx.login 的 code 换取 openid */
|
|
33
|
+
export async function jscode2session(config, code) {
|
|
34
|
+
if (!code)
|
|
35
|
+
throw new Error("缺少微信小程序登录 code");
|
|
36
|
+
const { appid, secret } = getMiniappConfig(config);
|
|
37
|
+
const params = new URLSearchParams({
|
|
38
|
+
appid,
|
|
39
|
+
secret,
|
|
40
|
+
js_code: code,
|
|
41
|
+
grant_type: "authorization_code",
|
|
42
|
+
});
|
|
43
|
+
let data;
|
|
44
|
+
try {
|
|
45
|
+
const resp = await fetch(`${JSCODE2SESSION_URL}?${params.toString()}`, {
|
|
46
|
+
signal: AbortSignal.timeout(15000),
|
|
47
|
+
});
|
|
48
|
+
data = (await resp.json());
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
console.warn(`微信小程序登录请求失败: ${e.message}`);
|
|
52
|
+
throw new Error(`微信登录失败: ${e.message}`);
|
|
53
|
+
}
|
|
54
|
+
const openid = String(data["openid"] || "");
|
|
55
|
+
if (!openid) {
|
|
56
|
+
console.warn(`微信小程序登录失败: ${JSON.stringify(data)}`);
|
|
57
|
+
throw new Error(`微信登录失败: ${data["errmsg"] || "未知错误"}`);
|
|
58
|
+
}
|
|
59
|
+
return openid;
|
|
60
|
+
}
|
|
61
|
+
/** 获取小程序 access_token(进程内单点缓存,提前 5 分钟过期) */
|
|
62
|
+
export async function getMiniappAccessToken(config) {
|
|
63
|
+
const { appid, secret } = getMiniappConfig(config);
|
|
64
|
+
const cached = tokenCache.get(appid);
|
|
65
|
+
if (cached && cached.expireAt > Date.now())
|
|
66
|
+
return cached.token;
|
|
67
|
+
// 同一 appid 已有进行中的请求:直接复用,保证并发只发一次
|
|
68
|
+
const inflight = tokenLocks.get(appid);
|
|
69
|
+
if (inflight)
|
|
70
|
+
return inflight;
|
|
71
|
+
const task = (async () => {
|
|
72
|
+
try {
|
|
73
|
+
// 双检:等锁期间可能已被其它调用刷新
|
|
74
|
+
const rechecked = tokenCache.get(appid);
|
|
75
|
+
if (rechecked && rechecked.expireAt > Date.now())
|
|
76
|
+
return rechecked.token;
|
|
77
|
+
const params = new URLSearchParams({
|
|
78
|
+
grant_type: "client_credential",
|
|
79
|
+
appid,
|
|
80
|
+
secret,
|
|
81
|
+
});
|
|
82
|
+
let data;
|
|
83
|
+
try {
|
|
84
|
+
const resp = await fetch(`${ACCESS_TOKEN_URL}?${params.toString()}`, {
|
|
85
|
+
signal: AbortSignal.timeout(15000),
|
|
86
|
+
});
|
|
87
|
+
data = (await resp.json());
|
|
88
|
+
}
|
|
89
|
+
catch (e) {
|
|
90
|
+
console.warn(`获取微信 access_token 失败: ${e.message}`);
|
|
91
|
+
throw new Error(`获取微信 access_token 失败: ${e.message}`);
|
|
92
|
+
}
|
|
93
|
+
const token = String(data["access_token"] || "");
|
|
94
|
+
if (!token) {
|
|
95
|
+
console.warn(`获取微信 access_token 失败: ${JSON.stringify(data)}`);
|
|
96
|
+
throw new Error(`获取微信 access_token 失败: ${data["errmsg"] || "未知错误"}`);
|
|
97
|
+
}
|
|
98
|
+
const expiresIn = Number(data["expires_in"] ?? 7200);
|
|
99
|
+
tokenCache.set(appid, {
|
|
100
|
+
token,
|
|
101
|
+
expireAt: Date.now() + Math.max(expiresIn - 300, 60) * 1000,
|
|
102
|
+
});
|
|
103
|
+
return token;
|
|
104
|
+
}
|
|
105
|
+
finally {
|
|
106
|
+
tokenLocks.delete(appid);
|
|
107
|
+
}
|
|
108
|
+
})();
|
|
109
|
+
tokenLocks.set(appid, task);
|
|
110
|
+
return task;
|
|
111
|
+
}
|
|
112
|
+
/** 生成小程序码,返回 data:image/png;base64,...(scene 上限 32 字符) */
|
|
113
|
+
export async function getMiniappQrcode(config, scene, page = "pages/index/index") {
|
|
114
|
+
const token = await getMiniappAccessToken(config);
|
|
115
|
+
const payload = {
|
|
116
|
+
scene: scene.slice(0, 32),
|
|
117
|
+
page,
|
|
118
|
+
check_path: false,
|
|
119
|
+
width: 430,
|
|
120
|
+
};
|
|
121
|
+
let resp;
|
|
122
|
+
try {
|
|
123
|
+
resp = await fetch(`${WXACODE_URL}?access_token=${encodeURIComponent(token)}`, {
|
|
124
|
+
method: "POST",
|
|
125
|
+
headers: { "Content-Type": "application/json" },
|
|
126
|
+
body: JSON.stringify(payload),
|
|
127
|
+
signal: AbortSignal.timeout(20000),
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
catch (e) {
|
|
131
|
+
console.warn(`生成小程序码请求失败: ${e.message}`);
|
|
132
|
+
throw new Error(`生成小程序码失败: ${e.message}`);
|
|
133
|
+
}
|
|
134
|
+
if (!(resp.headers.get("content-type") || "").includes("image")) {
|
|
135
|
+
let msg = "生成小程序码失败";
|
|
136
|
+
try {
|
|
137
|
+
const err = (await resp.json());
|
|
138
|
+
msg = String(err["errmsg"] ?? msg);
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
/* 非 JSON 响应,保留默认错误信息 */
|
|
142
|
+
}
|
|
143
|
+
console.warn(`生成小程序码失败: ${msg}`);
|
|
144
|
+
throw new Error(`生成小程序码失败: ${msg}`);
|
|
145
|
+
}
|
|
146
|
+
const buf = Buffer.from(await resp.arrayBuffer());
|
|
147
|
+
return "data:image/png;base64," + buf.toString("base64");
|
|
148
|
+
}
|
|
149
|
+
//# sourceMappingURL=wechat.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wechat.js","sourceRoot":"","sources":["../../../reglow/core/wechat.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,14 +66,17 @@ function toHistoryListItemDto(h, userCount = 0) {
|
|
|
66
66
|
export async function agreementRoutes(fastify, _opts) {
|
|
67
67
|
const service = new AgreementService();
|
|
68
68
|
// 协议列表
|
|
69
|
-
fastify.get("/", {
|
|
69
|
+
fastify.get("/", {
|
|
70
|
+
schema: { summary: "协议列表" },
|
|
71
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
72
|
+
}, async (request) => {
|
|
70
73
|
const query = request.query;
|
|
71
74
|
const page = Math.max(1, int(query.page, 1));
|
|
72
75
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
73
76
|
const keyword = query.keyword || null;
|
|
74
77
|
const type = query.type || null;
|
|
75
78
|
const status = intOrNull(query.status);
|
|
76
|
-
const { items, total } = await service.listAgreements(page, size, keyword, type, status);
|
|
79
|
+
const { items, total } = await service.listAgreements(page, size, keyword, type, status, query.sort_by || null, query.sort_order || null);
|
|
77
80
|
const resultItems = [];
|
|
78
81
|
for (const item of items) {
|
|
79
82
|
const pv = item.published_version || item.version || "0.0.0";
|
|
@@ -91,13 +94,16 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
91
94
|
return ApiResponse.success(toAgreementDto(obj), "创建成功(草稿)");
|
|
92
95
|
});
|
|
93
96
|
// 历史记录(全部发布记录)
|
|
94
|
-
fastify.get("/history/list", {
|
|
97
|
+
fastify.get("/history/list", {
|
|
98
|
+
schema: { summary: "历史记录(全部发布记录)" },
|
|
99
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
100
|
+
}, async (request) => {
|
|
95
101
|
const query = request.query;
|
|
96
102
|
const page = Math.max(1, int(query.page, 1));
|
|
97
103
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
98
104
|
const keyword = query.keyword || null;
|
|
99
105
|
const type = query.type || null;
|
|
100
|
-
const { items, total } = await service.listHistory(page, size, keyword, type, false);
|
|
106
|
+
const { items, total } = await service.listHistory(page, size, keyword, type, false, query.sort_by || null, query.sort_order || null);
|
|
101
107
|
const resultItems = [];
|
|
102
108
|
for (const item of items) {
|
|
103
109
|
const userCount = await service.repo.countUserAgreement(item.code, item.version);
|
|
@@ -106,12 +112,15 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
106
112
|
return ApiResponse.success(new PageData(resultItems, total, page, size));
|
|
107
113
|
});
|
|
108
114
|
// 历史协议归档(旧版本)
|
|
109
|
-
fastify.get("/history/archive", {
|
|
115
|
+
fastify.get("/history/archive", {
|
|
116
|
+
schema: { summary: "历史协议归档(旧版本)" },
|
|
117
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
118
|
+
}, async (request) => {
|
|
110
119
|
const query = request.query;
|
|
111
120
|
const page = Math.max(1, int(query.page, 1));
|
|
112
121
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
113
122
|
const keyword = query.keyword || null;
|
|
114
|
-
const { items, total } = await service.listHistory(page, size, keyword, null, true);
|
|
123
|
+
const { items, total } = await service.listHistory(page, size, keyword, null, true, query.sort_by || null, query.sort_order || null);
|
|
115
124
|
const resultItems = [];
|
|
116
125
|
for (const item of items) {
|
|
117
126
|
const userCount = await service.repo.countUserAgreement(item.code, item.version);
|
|
@@ -120,7 +129,10 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
120
129
|
return ApiResponse.success(new PageData(resultItems, total, page, size));
|
|
121
130
|
});
|
|
122
131
|
// 历史协议详情
|
|
123
|
-
fastify.get("/history/:history_id", {
|
|
132
|
+
fastify.get("/history/:history_id", {
|
|
133
|
+
schema: { summary: "历史协议详情" },
|
|
134
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
135
|
+
}, async (request) => {
|
|
124
136
|
const id = int(request.params.history_id, 0);
|
|
125
137
|
const { item, userIds } = await service.getHistoryDetail(id);
|
|
126
138
|
const userCount = userIds.length;
|
|
@@ -138,25 +150,37 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
138
150
|
}, ["created_at", "updated_at"]));
|
|
139
151
|
});
|
|
140
152
|
// 提醒历史版本用户
|
|
141
|
-
fastify.post("/history/:history_id/notify", {
|
|
153
|
+
fastify.post("/history/:history_id/notify", {
|
|
154
|
+
schema: { summary: "提醒历史版本用户" },
|
|
155
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
156
|
+
}, async (request) => {
|
|
142
157
|
const id = int(request.params.history_id, 0);
|
|
143
158
|
const count = await service.notifyHistoryUsers(id);
|
|
144
159
|
return ApiResponse.success(null, `已向 ${count} 位用户发送协议更新提醒`);
|
|
145
160
|
});
|
|
146
161
|
// 删除历史协议
|
|
147
|
-
fastify.delete("/history/:history_id", {
|
|
162
|
+
fastify.delete("/history/:history_id", {
|
|
163
|
+
schema: { summary: "删除历史协议" },
|
|
164
|
+
preHandler: [fastify.requirePermission("system:agreement:delete")],
|
|
165
|
+
}, async (request) => {
|
|
148
166
|
const id = int(request.params.history_id, 0);
|
|
149
167
|
await service.deleteHistory(id);
|
|
150
168
|
return ApiResponse.success(null, "删除成功");
|
|
151
169
|
});
|
|
152
170
|
// 作废历史协议
|
|
153
|
-
fastify.post("/history/:history_id/void", {
|
|
171
|
+
fastify.post("/history/:history_id/void", {
|
|
172
|
+
schema: { summary: "作废历史协议" },
|
|
173
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
174
|
+
}, async (request) => {
|
|
154
175
|
const id = int(request.params.history_id, 0);
|
|
155
176
|
await service.voidHistory(id);
|
|
156
177
|
return ApiResponse.success(null, "已作废");
|
|
157
178
|
});
|
|
158
179
|
// 协议详情
|
|
159
|
-
fastify.get("/:agreement_id", {
|
|
180
|
+
fastify.get("/:agreement_id", {
|
|
181
|
+
schema: { summary: "协议详情" },
|
|
182
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
183
|
+
}, async (request) => {
|
|
160
184
|
const id = int(request.params.agreement_id, 0);
|
|
161
185
|
return ApiResponse.success(toAgreementDto(await service.getAgreement(id)));
|
|
162
186
|
});
|
|
@@ -170,7 +194,10 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
170
194
|
return ApiResponse.success(toAgreementDto(obj), "保存成功(草稿)");
|
|
171
195
|
});
|
|
172
196
|
// 删除协议
|
|
173
|
-
fastify.delete("/:agreement_id", {
|
|
197
|
+
fastify.delete("/:agreement_id", {
|
|
198
|
+
schema: { summary: "删除协议" },
|
|
199
|
+
preHandler: [fastify.requirePermission("system:agreement:delete")],
|
|
200
|
+
}, async (request) => {
|
|
174
201
|
const id = int(request.params.agreement_id, 0);
|
|
175
202
|
const msg = await service.deleteAgreement(id);
|
|
176
203
|
return ApiResponse.success(null, msg);
|
|
@@ -186,13 +213,19 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
186
213
|
return ApiResponse.success(toAgreementDto(obj), "发布成功");
|
|
187
214
|
});
|
|
188
215
|
// 撤销草稿
|
|
189
|
-
fastify.post("/:agreement_id/revert", {
|
|
216
|
+
fastify.post("/:agreement_id/revert", {
|
|
217
|
+
schema: { summary: "撤销草稿" },
|
|
218
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
219
|
+
}, async (request) => {
|
|
190
220
|
const id = int(request.params.agreement_id, 0);
|
|
191
221
|
const msg = await service.revertAgreement(id);
|
|
192
222
|
return ApiResponse.success(null, msg);
|
|
193
223
|
});
|
|
194
224
|
// 作废协议
|
|
195
|
-
fastify.post("/:agreement_id/void", {
|
|
225
|
+
fastify.post("/:agreement_id/void", {
|
|
226
|
+
schema: { summary: "作废协议" },
|
|
227
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
228
|
+
}, async (request) => {
|
|
196
229
|
const id = int(request.params.agreement_id, 0);
|
|
197
230
|
const msg = await service.voidAgreement(id);
|
|
198
231
|
return ApiResponse.success(null, msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/agreement/controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/agreement/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import type { Agreement, AgreementHistory, UserAgreement } from "../../core/entities.js";
|
|
2
|
+
/** sys_agreement 表可排序列白名单(自有列,无敏感列) */
|
|
3
|
+
export declare const AGREEMENT_SORTABLE_COLUMNS: readonly string[];
|
|
4
|
+
/** sys_agreement_history 表可排序列白名单(自有列,无敏感列) */
|
|
5
|
+
export declare const AGREEMENT_HISTORY_SORTABLE_COLUMNS: readonly string[];
|
|
2
6
|
export declare class AgreementRepository {
|
|
3
7
|
findById(id: number): Promise<Agreement | undefined>;
|
|
4
8
|
findByCode(code: string, excludeStatus?: number): Promise<Agreement | undefined>;
|
|
5
|
-
listAgreements(page: number, size: number, keyword: string | null, type: string | null, status: number | null): Promise<{
|
|
9
|
+
listAgreements(page: number, size: number, keyword: string | null, type: string | null, status: number | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
6
10
|
items: Agreement[];
|
|
7
11
|
total: number;
|
|
8
12
|
}>;
|
|
@@ -15,7 +19,7 @@ export declare class AgreementRepository {
|
|
|
15
19
|
createHistory(data: Record<string, unknown>): Promise<AgreementHistory>;
|
|
16
20
|
findHistoryById(id: number): Promise<AgreementHistory | undefined>;
|
|
17
21
|
findLatestHistoryByCode(code: string): Promise<AgreementHistory | undefined>;
|
|
18
|
-
listHistory(page: number, size: number, keyword: string | null, type: string | null, onlyArchive: boolean): Promise<{
|
|
22
|
+
listHistory(page: number, size: number, keyword: string | null, type: string | null, onlyArchive: boolean, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
19
23
|
items: AgreementHistory[];
|
|
20
24
|
total: number;
|
|
21
25
|
}>;
|
|
@@ -4,9 +4,40 @@
|
|
|
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 A = ModelRegistry.get("Agreement");
|
|
8
9
|
const AH = ModelRegistry.get("AgreementHistory");
|
|
9
10
|
const UA = ModelRegistry.get("UserAgreement");
|
|
11
|
+
/** sys_agreement 表可排序列白名单(自有列,无敏感列) */
|
|
12
|
+
export const AGREEMENT_SORTABLE_COLUMNS = [
|
|
13
|
+
"id",
|
|
14
|
+
"title",
|
|
15
|
+
"code",
|
|
16
|
+
"type",
|
|
17
|
+
"content",
|
|
18
|
+
"version",
|
|
19
|
+
"status",
|
|
20
|
+
"sort",
|
|
21
|
+
"is_published",
|
|
22
|
+
"published_at",
|
|
23
|
+
"published_version",
|
|
24
|
+
"created_at",
|
|
25
|
+
"updated_at",
|
|
26
|
+
];
|
|
27
|
+
/** sys_agreement_history 表可排序列白名单(自有列,无敏感列) */
|
|
28
|
+
export const AGREEMENT_HISTORY_SORTABLE_COLUMNS = [
|
|
29
|
+
"id",
|
|
30
|
+
"agreement_id",
|
|
31
|
+
"code",
|
|
32
|
+
"title",
|
|
33
|
+
"type",
|
|
34
|
+
"content",
|
|
35
|
+
"version",
|
|
36
|
+
"status",
|
|
37
|
+
"is_latest",
|
|
38
|
+
"created_at",
|
|
39
|
+
"updated_at",
|
|
40
|
+
];
|
|
10
41
|
export class AgreementRepository {
|
|
11
42
|
// ── Agreement ──
|
|
12
43
|
async findById(id) {
|
|
@@ -18,7 +49,7 @@ export class AgreementRepository {
|
|
|
18
49
|
q = q.whereNot("status", excludeStatus);
|
|
19
50
|
return (await q.first());
|
|
20
51
|
}
|
|
21
|
-
async listAgreements(page, size, keyword, type, status) {
|
|
52
|
+
async listAgreements(page, size, keyword, type, status, sortBy, sortOrder) {
|
|
22
53
|
let query = knex(A);
|
|
23
54
|
let countQuery = knex(A);
|
|
24
55
|
if (keyword) {
|
|
@@ -34,13 +65,17 @@ export class AgreementRepository {
|
|
|
34
65
|
query = query.where("status", status);
|
|
35
66
|
countQuery = countQuery.where("status", status);
|
|
36
67
|
}
|
|
37
|
-
const items = (await query
|
|
38
|
-
|
|
39
|
-
|
|
68
|
+
const items = (await applySort(query, sortBy, sortOrder, AGREEMENT_SORTABLE_COLUMNS, [
|
|
69
|
+
["sort", "asc"],
|
|
70
|
+
["id", "desc"],
|
|
71
|
+
])
|
|
40
72
|
.offset((page - 1) * size)
|
|
41
73
|
.limit(size));
|
|
42
74
|
const totalRow = await countQuery.count({ c: "*" }).first();
|
|
43
|
-
return {
|
|
75
|
+
return {
|
|
76
|
+
items,
|
|
77
|
+
total: Number(totalRow.c) || 0,
|
|
78
|
+
};
|
|
44
79
|
}
|
|
45
80
|
async create(data) {
|
|
46
81
|
const [id] = await knex(A).insert(data);
|
|
@@ -91,7 +126,7 @@ export class AgreementRepository {
|
|
|
91
126
|
.limit(1)
|
|
92
127
|
.first());
|
|
93
128
|
}
|
|
94
|
-
async listHistory(page, size, keyword, type, onlyArchive) {
|
|
129
|
+
async listHistory(page, size, keyword, type, onlyArchive, sortBy, sortOrder) {
|
|
95
130
|
let query = knex(AH);
|
|
96
131
|
let countQuery = knex(AH);
|
|
97
132
|
if (onlyArchive) {
|
|
@@ -107,12 +142,14 @@ export class AgreementRepository {
|
|
|
107
142
|
query = query.where("type", type);
|
|
108
143
|
countQuery = countQuery.where("type", type);
|
|
109
144
|
}
|
|
110
|
-
const items = (await query
|
|
111
|
-
.orderBy("created_at", "desc")
|
|
145
|
+
const items = (await applySort(query, sortBy, sortOrder, AGREEMENT_HISTORY_SORTABLE_COLUMNS, [["created_at", "desc"]])
|
|
112
146
|
.offset((page - 1) * size)
|
|
113
147
|
.limit(size));
|
|
114
148
|
const totalRow = await countQuery.count({ c: "*" }).first();
|
|
115
|
-
return {
|
|
149
|
+
return {
|
|
150
|
+
items,
|
|
151
|
+
total: Number(totalRow.c) || 0,
|
|
152
|
+
};
|
|
116
153
|
}
|
|
117
154
|
async deleteHistory(id) {
|
|
118
155
|
await knex(AH).where("id", id).del();
|
|
@@ -121,7 +158,10 @@ export class AgreementRepository {
|
|
|
121
158
|
await knex(AH).where("code", code).where("status", 1).update({ status });
|
|
122
159
|
}
|
|
123
160
|
async updateHistoryStatusByCodeVersion(code, version, status) {
|
|
124
|
-
await knex(AH)
|
|
161
|
+
await knex(AH)
|
|
162
|
+
.where("code", code)
|
|
163
|
+
.where("version", version)
|
|
164
|
+
.update({ status });
|
|
125
165
|
}
|
|
126
166
|
// ── UserAgreement ──
|
|
127
167
|
async countUserAgreement(code, version) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/agreement/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/agreement/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export interface DiffLine {
|
|
|
8
8
|
export declare class AgreementService {
|
|
9
9
|
repo: AgreementRepository;
|
|
10
10
|
getAgreement(agreementId: number): Promise<Agreement>;
|
|
11
|
-
listAgreements(page: number, size: number, keyword: string | null, type: string | null, status: number | null): Promise<{
|
|
11
|
+
listAgreements(page: number, size: number, keyword: string | null, type: string | null, status: number | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
12
12
|
items: Agreement[];
|
|
13
13
|
total: number;
|
|
14
14
|
}>;
|
|
@@ -18,7 +18,7 @@ export declare class AgreementService {
|
|
|
18
18
|
deleteAgreement(id: number): Promise<string>;
|
|
19
19
|
revertAgreement(id: number): Promise<string>;
|
|
20
20
|
voidAgreement(id: number): Promise<string>;
|
|
21
|
-
listHistory(page: number, size: number, keyword: string | null, type: string | null, onlyArchive: boolean): Promise<{
|
|
21
|
+
listHistory(page: number, size: number, keyword: string | null, type: string | null, onlyArchive: boolean, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
22
22
|
items: AgreementHistory[];
|
|
23
23
|
total: number;
|
|
24
24
|
}>;
|
|
@@ -86,8 +86,8 @@ export class AgreementService {
|
|
|
86
86
|
throw new AppException(ErrorCode.AGREEMENT_NOT_FOUND, "协议不存在", 404);
|
|
87
87
|
return obj;
|
|
88
88
|
}
|
|
89
|
-
async listAgreements(page, size, keyword, type, status) {
|
|
90
|
-
return this.repo.listAgreements(page, size, keyword, type, status);
|
|
89
|
+
async listAgreements(page, size, keyword, type, status, sortBy, sortOrder) {
|
|
90
|
+
return this.repo.listAgreements(page, size, keyword, type, status, sortBy, sortOrder);
|
|
91
91
|
}
|
|
92
92
|
async createAgreement(data) {
|
|
93
93
|
const existing = await this.repo.findByCode(data.code, 3);
|
|
@@ -250,8 +250,8 @@ export class AgreementService {
|
|
|
250
250
|
return "已作废";
|
|
251
251
|
}
|
|
252
252
|
// ── 历史记录 ──
|
|
253
|
-
async listHistory(page, size, keyword, type, onlyArchive) {
|
|
254
|
-
return this.repo.listHistory(page, size, keyword, type, onlyArchive);
|
|
253
|
+
async listHistory(page, size, keyword, type, onlyArchive, sortBy, sortOrder) {
|
|
254
|
+
return this.repo.listHistory(page, size, keyword, type, onlyArchive, sortBy, sortOrder);
|
|
255
255
|
}
|
|
256
256
|
async getHistoryDetail(historyId) {
|
|
257
257
|
const obj = await this.repo.findHistoryById(historyId);
|