From d6113a8f0ac838444f431f7deec31167b6cb080a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Mon, 13 May 2024 12:35:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E4=BD=86=E4=BB=8D=E7=84=B6=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?= =?UTF-8?q?reboot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/utils/reboot.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/common/utils/reboot.ts b/src/common/utils/reboot.ts index 5d55c122..7e4b6dad 100644 --- a/src/common/utils/reboot.ts +++ b/src/common/utils/reboot.ts @@ -1,18 +1,22 @@ import { exit } from "process"; import { resolve } from "path"; +import { promisify } from "node:util"; import { writeFile, writeFileSync } from "fs"; import { exec } from "node:child_process"; +let execAsync = promisify(exec); export async function rebootWithQuickLogin(uin: string) { let batScript = resolve(__dirname, './napcat.bat'); let batUtf8Script = resolve(__dirname, './napcat-utf8.bat'); let bashScript = resolve(__dirname, './napcat.sh'); if (process.platform === 'win32') { - exec(`timeout /t 5 /nobreak & ${batUtf8Script} -q ${uin}`); + console.log(process.platform); + let result = await execAsync(`timeout /t 5 /nobreak & ${batUtf8Script} -q ${uin}`); + console.log(result); } else if (process.platform === 'linux') { - exec(`timeout 5 & ${bashScript} -q ${uin}`); + await execAsync(`timeout 5 & ${bashScript} -q ${uin}`); // 启动bash执行脚本 } - exit(0); + //exit(0); } export async function rebootWithNormolLogin() { let batScript = resolve(__dirname, './napcat.bat');