diff --git a/package.json b/package.json index 1806eb05..c326649e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "1.0.0", + "version": "1.0.1", "scripts": { "watch:dev": "vite --mode development", "watch:prod": "vite --mode production", diff --git a/script/napcat-utf8.bat b/script/napcat-utf8.bat index d2b358c7..ddee7f54 100644 --- a/script/napcat-utf8.bat +++ b/script/napcat-utf8.bat @@ -2,21 +2,17 @@ setlocal enabledelayedexpansion chcp 65001 :loop_read -for /f "tokens=3" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do ( - set "RetString=%%a" +for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do ( + set "RetString=%%b" goto :napcat_boot ) -goto :loop_read - :napcat_boot for %%a in ("!RetString!") do ( set "pathWithoutUninstall=%%~dpa" - set "fileName=%%~na" - set "extension=%%~xa" ) set "QQPath=!pathWithoutUninstall!QQ.exe" set ELECTRON_RUN_AS_NODE=1 echo !QQPath! -!QQPath! ./napcat.cjs %* +"!QQPath!" ./napcat.cjs %* diff --git a/script/napcat.bat b/script/napcat.bat index c3b4f403..77306064 100644 --- a/script/napcat.bat +++ b/script/napcat.bat @@ -1,22 +1,17 @@ @echo off setlocal enabledelayedexpansion - :loop_read -for /f "tokens=3" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do ( - set "RetString=%%a" +for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do ( + set "RetString=%%b" goto :napcat_boot ) -goto :loop_read - :napcat_boot for %%a in ("!RetString!") do ( set "pathWithoutUninstall=%%~dpa" - set "fileName=%%~na" - set "extension=%%~xa" ) set "QQPath=!pathWithoutUninstall!QQ.exe" set ELECTRON_RUN_AS_NODE=1 echo !QQPath! -!QQPath! ./napcat.cjs %* +"!QQPath!" ./napcat.cjs %* diff --git a/src/onebot11/index.ts b/src/onebot11/index.ts index c0c86de7..6a8a7b4c 100644 --- a/src/onebot11/index.ts +++ b/src/onebot11/index.ts @@ -24,11 +24,13 @@ checkVersion().then((remoteVersion: string) => { for (const k of [0, 1, 2]) { if (parseInt(remoteVersionList[k]) > parseInt(localVersionList[k])) { console.log('检测到更新,请前往 https://github.com/NapNeko/NapCatQQ 下载 NapCatQQ V', remoteVersion); + return; } else if (parseInt(remoteVersionList[k]) < parseInt(localVersionList[k])) { break; } } console.log('当前已是最新版本,版本:', localVersion); + return; }); new NapCatOnebot11(); napCatCore.addLoginSuccessCallback(() => {