From 6d091211bb062b4fd83a660a7c08dd7e8257582c Mon Sep 17 00:00:00 2001 From: SummonHIM <2239760702@qq.com> Date: Tue, 6 Dec 2022 19:46:14 +0800 Subject: [PATCH 1/2] fix qrcode signup regex --- handlers/attachGroupMessageHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handlers/attachGroupMessageHandler.ts b/handlers/attachGroupMessageHandler.ts index a525bce..94aef8e 100644 --- a/handlers/attachGroupMessageHandler.ts +++ b/handlers/attachGroupMessageHandler.ts @@ -29,7 +29,7 @@ export default (bot: Client) => bot.on('message.group', async data => { const dec = await decodeQrCode(buf) let message = '二维码解码：\n' + dec + '\n' //解析签到参数 - const REGEX_ENC = /SIGNIN:.*aid=(\d+)&.*&enc=([\dA-F]+)/ + const REGEX_ENC = /e\?.*id=(\d+)&.*&enc=([\dA-F]+)/ if (REGEX_ENC.test(dec)) { const exec = REGEX_ENC.exec(dec) message += `aid: ${exec[1]}\nenc: ${exec[2]}\n正在执行签到...` From 7d85fbe4700ffdd4753f1de993b3e79048ff96b6 Mon Sep 17 00:00:00 2001 From: SummonHIM <2239760702@qq.com> Date: Wed, 7 Dec 2022 20:38:34 +0800 Subject: [PATCH 2/2] multi rule regex --- handlers/attachGroupMessageHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handlers/attachGroupMessageHandler.ts b/handlers/attachGroupMessageHandler.ts index 94aef8e..d73c256 100644 --- a/handlers/attachGroupMessageHandler.ts +++ b/handlers/attachGroupMessageHandler.ts @@ -29,7 +29,7 @@ export default (bot: Client) => bot.on('message.group', async data => { const dec = await decodeQrCode(buf) let message = '二维码解码：\n' + dec + '\n' //解析签到参数 - const REGEX_ENC = /e\?.*id=(\d+)&.*&enc=([\dA-F]+)/ + const REGEX_ENC = /(SIGNIN:|e\?).*(aid=|id=)(\d+)(&.*)?&enc=([\dA-F]+)/ if (REGEX_ENC.test(dec)) { const exec = REGEX_ENC.exec(dec) message += `aid: ${exec[1]}\nenc: ${exec[2]}\n正在执行签到...`