From 910defe18b21bcdf5a7ee4be56f932df28d07852 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 01:03:37 +0800
Subject: [PATCH] update

---
 panel_task.py              | 40 +++++++++++++++++++-------------------
 web/admin/task/__init__.py |  2 +-
 web/utils/task.py          |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/panel_task.py b/panel_task.py
index da7f96d7b..2ee2a3f6a 100755
--- a/panel_task.py
+++ b/panel_task.py
@@ -320,32 +320,32 @@ def setDaemon(t):
     return t
 
 def run():
-    # # 系统监控
-    # sysTask = threading.Thread(target=systemTask)
-    # sysTask = setDaemon(sysTask)
-    # sysTask.start()
+    # 系统监控
+    sysTask = threading.Thread(target=systemTask)
+    sysTask = setDaemon(sysTask)
+    sysTask.start()
 
-    # # PHP 502错误检查线程
-    # php502 = threading.Thread(target=check502Task)
-    # php502 = setDaemon(php502)
-    # php502.start()
+    # PHP 502错误检查线程
+    php502 = threading.Thread(target=check502Task)
+    php502 = setDaemon(php502)
+    php502.start()
 
-    # # OpenResty Restart At Once Start
-    # oraos = threading.Thread(target=openrestyRestartAtOnce)
-    # oraos = setDaemon(oraos)
-    # oraos.start()
+    # OpenResty Restart At Once Start
+    oraos = threading.Thread(target=openrestyRestartAtOnce)
+    oraos = setDaemon(oraos)
+    oraos.start()
 
 
-    # # OpenResty Auto Restart Start
-    # oar = threading.Thread(target=openrestyAutoRestart)
-    # oar = setDaemon(oar)
-    # oar.start()
+    # OpenResty Auto Restart Start
+    oar = threading.Thread(target=openrestyAutoRestart)
+    oar = setDaemon(oar)
+    oar.start()
 
 
-    # # Panel Restart Start
-    # rps = threading.Thread(target=restartPanelService)
-    # rps = setDaemon(rps)
-    # rps.start()
+    # Panel Restart Start
+    rps = threading.Thread(target=restartPanelService)
+    rps = setDaemon(rps)
+    rps.start()
 
     # 面板后台任务
     startPanelTask()
diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index e06404184..64cd42ad1 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -35,7 +35,7 @@ def list():
     p = request.form.get('p', '1')
     limit = request.form.get('limit', '10').strip()
     search = request.form.get('search', '').strip()
-    return MwTasks.getTaskList(int(p), int(limit))
+    return MwTasks.getTaskPage(int(p), int(limit))
 
 @blueprint.route('/get_exec_log', endpoint='get_exec_log', methods=['POST'])
 @panel_login_required
diff --git a/web/utils/task.py b/web/utils/task.py
index a069aa963..a6ddbd990 100644
--- a/web/utils/task.py
+++ b/web/utils/task.py
@@ -15,8 +15,8 @@ import time
 import core.mw as mw
 import thisdb
 
-def getTaskList(page=1,size=10):
-    info = thisdb.getTaskList(page=page, size=size)
+def getTaskPage(page=1,size=10):
+    info = thisdb.getTaskPage(page=page, size=size)
 
     rdata = {}
     rdata['data'] = info['list']