From 97ddb10ff539403247c7593acc944c1ec9babd71 Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Fri, 6 Jan 2023 13:50:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20main.py=E4=B8=AD=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E5=BC=95=E7=94=A8=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 12 ++++++------ pkg/qqbot/process.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index 45576bc2..5a9866ed 100644 --- a/main.py +++ b/main.py @@ -6,12 +6,6 @@ import time import logging import sys - -import mirai.exceptions -import requests -import websockets.exceptions -from urllib3.exceptions import InsecureRequestWarning - try: import colorlog except ImportError: @@ -19,6 +13,11 @@ except ImportError: sys.exit(1) import colorlog +import requests +import websockets.exceptions +from urllib3.exceptions import InsecureRequestWarning + + sys.path.append(".") log_colors_config = { @@ -120,6 +119,7 @@ def main(first_time_init=False): if first_time_init: # 不是热重载之后的启动,则不启动新的bot线程 + import mirai.exceptions def run_bot_wrapper(): global known_exception_caught try: diff --git a/pkg/qqbot/process.py b/pkg/qqbot/process.py index 40fbecf0..59bdfe70 100644 --- a/pkg/qqbot/process.py +++ b/pkg/qqbot/process.py @@ -243,7 +243,7 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes and not config.include_image_description): reply.append(" ".join(params)) elif cmd == 'version': - reply_str = "[bot]当前版本:{}\n".format(pkg.utils.updater.get_current_version_info()) + reply_str = "[bot]当前版本:\n{}\n".format(pkg.utils.updater.get_current_version_info()) try: if pkg.utils.updater.is_new_version_available(): reply_str += "\n有新版本可用,请使用命令 !update 进行更新"