diff --git a/src/common/server/http.ts b/src/common/server/http.ts index 83a4ea6f..8e70cabe 100644 --- a/src/common/server/http.ts +++ b/src/common/server/http.ts @@ -61,12 +61,12 @@ export abstract class HttpServerBase { this.listen(port, host); } catch (e: any) { logError('HTTP服务启动失败', e.toString()); - // llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString() + // httpServerError = "HTTP服务启动失败, " + e.toString() } } stop() { - // llonebotError.httpServerError = "" + // httpServerError = "" if (this.server) { this.server.close(); this.server = null; diff --git a/src/common/utils/reboot.ts b/src/common/utils/reboot.ts index 98f7c1a6..e3e88780 100644 --- a/src/common/utils/reboot.ts +++ b/src/common/utils/reboot.ts @@ -1,15 +1,28 @@ import { exit } from "process"; import { resolve } from "path"; -async function reboot() { +import { writeFile, writeFileSync } from "fs"; +async function rebootWithQuickLogin(uin: string) { let batScript = resolve(__dirname, './napcat.bat'); let batUtf8Script = resolve(__dirname, './napcat-utf8.bat'); let bashScript = resolve(__dirname, './napcat.sh'); - //如果是win系统写出 5s延迟启动 默认batUtf8Script启动 - // 如果是linux系统写出 5s延迟启动 默认bashScript启动 if (process.platform === 'win32') { - // console.log('正在重启...'); + writeFileSync(resolve(__dirname, './reboot-utf8.bat'), ` + @echo off + timeout /t 5 /nobreak + start /b /wait %~dp0\\napcat-utf8.bat -q ${uin} + `); + // 启动cmd执行脚本 + } else if (process.platform === 'linux') { - //console.log('正在重启...'); + writeFileSync(resolve(__dirname, './reboot.sh'), ` + #!/bin/bash + timeout 5 + ./napcat-utf8.sh -q ${uin} + `); + // 启动bash执行脚本 + + + } exit(0); } \ No newline at end of file diff --git a/src/onebot11/action/types.ts b/src/onebot11/action/types.ts index cd41e98f..711f897f 100644 --- a/src/onebot11/action/types.ts +++ b/src/onebot11/action/types.ts @@ -14,7 +14,10 @@ export interface InvalidCheckResult { } export enum ActionName { - // llonebot + // 以下为扩展napcat扩展 + GetRobotUinRange = 'get_robot_uin_range', + SetOnlineStatus = 'set_online_status', + GetFriendsWithCategory = 'get_friends_with_category', GetGroupIgnoreAddRequest = 'get_group_ignore_add_request', SetQQAvatar = 'set_qq_avatar', GetConfig = 'get_config', @@ -54,10 +57,6 @@ export enum ActionName { GetRecord = 'get_record', CleanCache = 'clean_cache', GetCookies = 'get_cookies', - // 以下为扩展napcat扩展 - GetRobotUinRange = 'get_robot_uin_range', - SetOnlineStatus = 'set_online_status', - GetFriendsWithCategory = 'get_friends_with_category', // 以下为go-cqhttp api GoCQHTTP_SendGroupNotice = '_send_group_notice', GoCQHTTP_GetEssenceMsg = 'get_essence_msg_list', diff --git a/src/onebot11/main.ts b/src/onebot11/main.ts index 1f54686c..db49751d 100644 --- a/src/onebot11/main.ts +++ b/src/onebot11/main.ts @@ -205,7 +205,7 @@ export class NapCatOnebot11 { try { notify.time = Date.now(); const notifyTime = parseInt(notify.seq) / 1000 / 1000; - // log(`群通知时间${notifyTime}`, `LLOneBot启动时间${this.bootTime}`); + // log(`群通知时间${notifyTime}`, `启动时间${this.bootTime}`); if (notifyTime < this.bootTime) { continue; }