From a14c4b566e820422fe3bbe3aaf08ebe0ddb23cbc Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Mon, 9 Dec 2024 00:05:34 +0800 Subject: [PATCH] update --- web/admin/system/system.py | 2 +- web/utils/system/main.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/web/admin/system/system.py b/web/admin/system/system.py index febe77bcc..e51256639 100644 --- a/web/admin/system/system.py +++ b/web/admin/system/system.py @@ -107,7 +107,7 @@ def restart(): @blueprint.route('/restart_server', endpoint='restart_server', methods=['POST']) @panel_login_required def restart_server(): - mw.restartMw() + mw.restartServer() return mw.returnData(True, '面板已重启!') # 设置 diff --git a/web/utils/system/main.py b/web/utils/system/main.py index 8ef66d4e5..4528829f0 100644 --- a/web/utils/system/main.py +++ b/web/utils/system/main.py @@ -17,6 +17,22 @@ import psutil import core.mw as mw +from threading import Thread +from time import sleep + +def mw_async(f): + def wrapper(*args, **kwargs): + thr = Thread(target=f, args=args, kwargs=kwargs) + thr.start() + return wrapper + +@mw_async +def restartServer(): + if not mw.isRestart(): + return mw.returnData(False, '请等待所有安装任务完成再执行!') + mw.execShell("sync && init 6 &") + return mw.returnData(True, '命令发送成功!') + def getEnvInfo(): data = {} data['status'] = True