diff --git a/liteyuki/liteyuki_main/loader.py b/liteyuki/liteyuki_main/loader.py index 2333ce8..4510806 100644 --- a/liteyuki/liteyuki_main/loader.py +++ b/liteyuki/liteyuki_main/loader.py @@ -10,11 +10,10 @@ load_resources() init_log() nonebot.plugin.load_plugins("liteyuki/plugins") - # 从数据库读取已安装的插件 if not get_config("safe_mode", False): # 安全模式下,不加载插件 - nonebot.plugin.load_plugins("plugins") + installed_plugins: list[InstalledPlugin] = plugin_db.all(InstalledPlugin()) if installed_plugins: for installed_plugin in installed_plugins: @@ -22,5 +21,7 @@ if not get_config("safe_mode", False): nonebot.logger.error(f"{installed_plugin.module_name} not installed, but in loading database. please run `npm fixup` in chat to reinstall it.") else: nonebot.load_plugin(installed_plugin.module_name) + + nonebot.plugin.load_plugins("plugins") else: nonebot.logger.info("Safe mode is on, no plugin loaded.") diff --git a/liteyuki/resources/templates/js/status.js b/liteyuki/resources/templates/js/status.js index 4bf5a17..6d59c7c 100644 --- a/liteyuki/resources/templates/js/status.js +++ b/liteyuki/resources/templates/js/status.js @@ -189,6 +189,7 @@ function main() { `${localData['free']} ${convertSize(swapData['free'])}`, `${localData['total']} ${convertSize(swapData['total'])}` ] + console.log(cpuTagArray, memTagArray, swapTagArray) } diff --git a/liteyuki/utils/__init__.py b/liteyuki/utils/__init__.py index 2dc9f15..13d7f18 100644 --- a/liteyuki/utils/__init__.py +++ b/liteyuki/utils/__init__.py @@ -30,7 +30,7 @@ def register_bot(): } try: nonebot.logger.info("Waiting for register to Liteyuki...") - resp = requests.post(url, json=data) + resp = requests.post(url, json=data, timeout=(10, 15)) if resp.status_code == 200: data = resp.json() if liteyuki_id := data.get("liteyuki_id"):