update to 6.8.37

task.py

@@ -15,9 +15,6 @@
 import sys
 import os
 import logging
-import datetime
-import threading
-
 from json import dumps, loads
 from psutil import Process, pids, cpu_count, cpu_percent, net_io_counters, disk_io_counters, virtual_memory
 os.environ['BT_TASK'] = '1'
@@ -26,6 +23,11 @@ sys.path.insert(0, "/www/server/panel/class/")
 import time
 import public
 import db
+import threading
+import panelTask
+import process_task
+task_obj = panelTask.bt_task()
+task_obj.not_web = True
 global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
 pre = 0
 timeoutCount = 0
@@ -34,6 +36,7 @@ oldEdate = None
 logPath = '/tmp/panelExec.log'
 isTask = '/tmp/panelTask.pl'
 python_bin = None
+thread_dict = {}
 
 def get_python_bin():
     global python_bin
@@ -45,7 +48,26 @@ def get_python_bin():
         return bin_file
     python_bin = bin_file2
     return bin_file2
-
+def WriteFile(filename,s_body,mode='w+'):
+    """
+    写入文件内容
+    @filename 文件名
+    @s_body 欲写入的内容
+    return bool 若文件不存在则尝试自动创建
+    """
+    try:
+        fp = open(filename, mode)
+        fp.write(s_body)
+        fp.close()
+        return True
+    except:
+        try:
+            fp = open(filename, mode,encoding="utf-8")
+            fp.write(s_body)
+            fp.close()
+            return True
+        except:
+            return False
 
 def ReadFile(filename, mode='r'):
     """
@@ -85,8 +107,6 @@ def DownloadHook(count, blockSize, totalSize):
     pre = pre1
 
 # 写输出日志
-
-
 def WriteLogs(logMsg):
     try:
         global logPath
@@ -116,57 +136,61 @@ def ExecShell(cmdstring, cwd=None, timeout=None, shell=True, symbol = '&>'):
 
 # 任务队列
 def startTask():
-    global isTask
-    try:
-        while True:
-            try:
-                if os.path.exists(isTask):
-                    with db.Sql() as sql:
-                        sql.table('tasks').where(
-                            "status=?", ('-1',)).setField('status', '0')
-                        taskArr = sql.table('tasks').where("status=?", ('0',)).field(
-                            'id,type,execstr').order("id asc").select()
-                        for value in taskArr:
-                            start = int(time.time())
-                            if not sql.table('tasks').where("id=?", (value['id'],)).count():
-                                continue
-                            sql.table('tasks').where("id=?", (value['id'],)).save(
-                                'status,start', ('-1', start))
-                            if value['type'] == 'download':
-                                argv = value['execstr'].split('|bt|')
-                                DownloadFile(argv[0], argv[1])
-                            elif value['type'] == 'execshell':
-                                ExecShell(value['execstr'])
-                                ExecShell("echo '|-Successify ---Script execution completed---'",symbol=">>")
-                            end = int(time.time())
-                            sql.table('tasks').where("id=?", (value['id'],)).save(
-                                'status,end', ('1', end))
-                            if(sql.table('tasks').where("status=?", ('0')).count() < 1):
-                                if os.path.exists(isTask):
-                                    os.remove(isTask)
-                                #ExecShell('rm -f ' + isTask)
-                        sql.close()
-                        taskArr = None
-            except:
-                pass
-            siteEdate()
-            time.sleep(2)
-    except Exception as ex:
-        logging.info(ex)
-        time.sleep(60)
-        startTask()
+    global isTask,logPath,thread_dict
+    tip_file = '/dev/shm/.panelTask.pl'
+    n = 0
+    while 1:
+        try:
+            if os.path.exists(isTask):
+                with db.Sql() as sql:
+                    sql.table('tasks').where(
+                        "status=?", ('-1',)).setField('status', '0')
+                    taskArr = sql.table('tasks').where("status=?", ('0',)).field('id,type,execstr').order("id asc").select()
+                    for value in taskArr:
+                        start = int(time.time())
+                        if not sql.table('tasks').where("id=?", (value['id'],)).count():
+                            public.writeFile(tip_file, str(int(time.time())))
+                            continue
+                        sql.table('tasks').where("id=?", (value['id'],)).save('status,start', ('-1', start))
+                        if value['type'] == 'download':
+                            argv = value['execstr'].split('|bt|')
+                            DownloadFile(argv[0], argv[1])
+                        elif value['type'] == 'execshell':
+                            ExecShell(value['execstr'])
+                        end = int(time.time())
+                        sql.table('tasks').where("id=?", (value['id'],)).save('status,end', ('1', end))
+                        if(sql.table('tasks').where("status=?", ('0')).count() < 1):
+                            if os.path.exists(isTask):
+                                os.remove(isTask)
+                    sql.close()
+                    taskArr = None
+            public.writeFile(tip_file, str(int(time.time())))
+
+            # 线程检查
+            n+=1
+            if n > 60:
+                run_thread()
+                n = 0
+        except:
+            pass
+        time.sleep(2)
+
+
 
 # 网站到期处理
-
-
 def siteEdate():
     global oldEdate
     try:
-        if not oldEdate: oldEdate = ReadFile('{}/data/edate.pl'.format(base_path))
-        if not oldEdate: oldEdate = '0000-00-00'
+        if not oldEdate:
+            oldEdate = ReadFile('/www/server/panel/data/edate.pl')
+        if not oldEdate:
+            oldEdate = '0000-00-00'
         mEdate = time.strftime('%Y-%m-%d', time.localtime())
-        if oldEdate == mEdate: return False
-        os.system(get_python_bin() + " {}/script/site_task.py > /dev/null".format(base_path))
+        if oldEdate == mEdate:
+            return False
+        oldEdate = mEdate
+        os.system("nohup " + get_python_bin() + " /www/server/panel/script/site_task.py > /dev/null 2>&1 &")
+
     except Exception as ex:
         logging.info(ex)
         pass
@@ -190,6 +214,7 @@ def systemTask():
         filename = '{}/data/control.conf'.format(base_path)
         with db.Sql() as sql:
             sql = sql.dbfile('system')
+
             csql = '''CREATE TABLE IF NOT EXISTS `load_average` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `pro` REAL,
@@ -198,7 +223,42 @@ def systemTask():
   `fifteen` REAL,
   `addtime` INTEGER
 )'''
+
+            network_sql = '''CREATE TABLE IF NOT EXISTS `network` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `up` INTEGER,
+  `down` INTEGER,
+  `total_up` INTEGER,
+  `total_down` INTEGER,
+  `down_packets` INTEGER,
+  `up_packets` INTEGER,
+  `addtime` INTEGER
+)'''
+
+            cpuio_sql = '''CREATE TABLE IF NOT EXISTS `cpuio` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pro` INTEGER,
+  `mem` INTEGER,
+  `addtime` INTEGER
+)'''
+
+            diskio_sql = '''CREATE TABLE IF NOT EXISTS `diskio` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `read_count` INTEGER,
+  `write_count` INTEGER,
+  `read_bytes` INTEGER,
+  `write_bytes` INTEGER,
+  `read_time` INTEGER,
+  `write_time` INTEGER,
+  `addtime` INTEGER
+)'''
+
+
             sql.execute(csql, ())
+            sql.execute(network_sql, ())
+            sql.execute(cpuio_sql, ())
+            sql.execute(diskio_sql, ())
+
             sql.close()
 
         count = 0
@@ -206,6 +266,15 @@ def systemTask():
         diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
         network_up = {}
         network_down = {}
+        cycle = 60
+        # try:
+        #     from panelDaily import panelDaily
+        #     panelDaily().check_databases()
+        # except Exception as e:
+        #     logging.info(e)
+
+        proc_task_obj = process_task.process_task()
+
         while True:
             if not os.path.exists(filename):
                 time.sleep(10)
@@ -220,17 +289,14 @@ def systemTask():
             except:
                 day = 30
 
-            tmp = {}
+
+            addtime = int(time.time())
+            deltime = addtime - (day * 86400)
             # 取当前CPU Io
-            tmp['used'] = cpu_percent(interval=1)
-
-            if not cpuInfo:
-                tmp['mem'] = GetMemUsed()
-                cpuInfo = tmp
-
-            if cpuInfo['used'] < tmp['used']:
-                tmp['mem'] = GetMemUsed()
-                cpuInfo = tmp
+            tmp = {}
+            tmp['used'] = proc_task_obj.get_monitor_list(addtime)
+            tmp['mem'] = GetMemUsed()
+            cpuInfo = tmp
 
             # 取当前网络Io
             networkIo_list = net_io_counters(pernic=True)
@@ -251,95 +317,133 @@ def systemTask():
                 tmp['upTotal'] += networkIo[0]
                 tmp['downTotal'] += networkIo[1]
                 tmp['downPackets'][k] = round(
-                    float((networkIo[1] - network_down[k]) / 1024)/5, 2)
+                    float((networkIo[1] - network_down[k]) / 1024)/cycle, 2)
                 tmp['upPackets'][k] = round(
-                    float((networkIo[0] - network_up[k]) / 1024)/5, 2)
+                    float((networkIo[0] - network_up[k]) / 1024)/cycle, 2)
                 tmp['up'] += tmp['upPackets'][k]
                 tmp['down'] += tmp['downPackets'][k]
 
                 network_up[k] = networkIo[0]
                 network_down[k] = networkIo[1]
 
-            if not networkInfo:
-                networkInfo = tmp
-            if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']):
-                networkInfo = tmp
+            # if not networkInfo:
+            #     networkInfo = tmp
+            # if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']):
+            networkInfo = tmp
 
             # 取磁盘Io
             disk_ios = True
             try:
                 if os.path.exists('/proc/diskstats'):
                     diskio_2 = disk_io_counters()
+
                     if not diskio_1:
                         diskio_1 = diskio_2
                     tmp = {}
-                    tmp['read_count'] = diskio_2.read_count - diskio_1.read_count
-                    tmp['write_count'] = diskio_2.write_count - diskio_1.write_count
-                    tmp['read_bytes'] = diskio_2.read_bytes - diskio_1.read_bytes
-                    tmp['write_bytes'] = diskio_2.write_bytes - diskio_1.write_bytes
-                    tmp['read_time'] = diskio_2.read_time - diskio_1.read_time
-                    tmp['write_time'] = diskio_2.write_time - diskio_1.write_time
+                    tmp['read_count'] = int((diskio_2.read_count - diskio_1.read_count) / cycle)
+                    tmp['write_count'] = int((diskio_2.write_count - diskio_1.write_count) / cycle)
+                    tmp['read_bytes'] = int((diskio_2.read_bytes - diskio_1.read_bytes) / cycle)
+                    tmp['write_bytes'] = int((diskio_2.write_bytes -  diskio_1.write_bytes) / cycle)
+                    tmp['read_time'] = int((diskio_2.read_time - diskio_1.read_time) / cycle)
+                    tmp['write_time'] = int((diskio_2.write_time - diskio_1.write_time) / cycle)
 
                     if not diskInfo:
                         diskInfo = tmp
-                    else:
-                        diskInfo['read_count'] += tmp['read_count']
-                        diskInfo['write_count'] += tmp['write_count']
-                        diskInfo['read_bytes'] += tmp['read_bytes']
-                        diskInfo['write_bytes'] += tmp['write_bytes']
-                        diskInfo['read_time'] += tmp['read_time']
-                        diskInfo['write_time'] += tmp['write_time']
 
+                    # if (tmp['read_bytes'] + tmp['write_bytes']) > (diskInfo['read_bytes'] + diskInfo['write_bytes']):
+                    diskInfo['read_count'] = tmp['read_count']
+                    diskInfo['write_count'] = tmp['write_count']
+                    diskInfo['read_bytes'] = tmp['read_bytes']
+                    diskInfo['write_bytes'] = tmp['write_bytes']
+                    diskInfo['read_time'] = tmp['read_time']
+                    diskInfo['write_time'] = tmp['write_time']
+
+                    # logging.info(['read: ',tmp['read_bytes'] / 1024 / 1024,'write: ',tmp['write_bytes'] / 1024 / 1024])
                     diskio_1 = diskio_2
             except:
                 logging.info(public.get_error_info())
                 disk_ios = False
 
-            # print diskInfo
+            try:
+                sql = db.Sql().dbfile('system')
+                data = (cpuInfo['used'], cpuInfo['mem'], addtime)
+                #
+                sql.table('cpuio').add('pro,mem,addtime', data)
+                sql.table('cpuio').where("addtime<?", (deltime,)).delete()
+                data = (networkInfo['up'], networkInfo['down'], networkInfo['upTotal'], networkInfo['downTotal'], dumps(networkInfo['downPackets']), dumps(networkInfo['upPackets']), addtime)
+                sql.table('network').add('up,down,total_up,total_down,down_packets,up_packets,addtime', data)
+                sql.table('network').where("addtime<?", (deltime,)).delete()
+                # logging.info(diskInfo)
+                if os.path.exists('/proc/diskstats') and disk_ios:
+                    data = (diskInfo['read_count'], diskInfo['write_count'], diskInfo['read_bytes'],diskInfo['write_bytes'], diskInfo['read_time'], diskInfo['write_time'], addtime)
+                    sql.table('diskio').add('read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime', data)
+                    sql.table('diskio').where("addtime<?", (deltime,)).delete()
 
-            if count >= 12:
-                try:
-                    sql = db.Sql().dbfile('system')
-                    addtime = int(time.time())
-                    deltime = addtime - (day * 86400)
+                # LoadAverage
+                load_average = GetLoadAverage()
+                lpro = round(
+                    (load_average['one'] / load_average['max']) * 100, 2)
+                if lpro > 100:
+                    lpro = 100
+                sql.table('load_average').add('pro,one,five,fifteen,addtime', (lpro, load_average['one'], load_average['five'], load_average['fifteen'], addtime))
+                sql.table('load_average').where("addtime<?", (deltime,)).delete()
+                sql.close()
 
-                    data = (cpuInfo['used'],cpuInfo['mem'],addtime)
-                    sql.table('cpuio').add('pro,mem,addtime',data)
-                    sql.table('cpuio').where("addtime<?",(deltime,)).delete()
-                    data = (networkInfo['up'],networkInfo['down'],networkInfo['upTotal'],networkInfo['downTotal'],dumps(networkInfo['downPackets']),dumps(networkInfo['upPackets']),addtime)
-                    sql.table('network').add('up,down,total_up,total_down,down_packets,up_packets,addtime',data)
-                    sql.table('network').where("addtime<?",(deltime,)).delete()
-                    if os.path.exists('/proc/diskstats') and disk_ios:
-                        data = (diskInfo['read_count'],diskInfo['write_count'],diskInfo['read_bytes'],diskInfo['write_bytes'],diskInfo['read_time'],diskInfo['write_time'],addtime)
-                        sql.table('diskio').add('read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime',data)
-                        sql.table('diskio').where("addtime<?",(deltime,)).delete()
+                lpro = None
+                load_average = None
+                cpuInfo = None
+                networkInfo = None
+                diskInfo = None
+                data = None
+                count = 0
+                reloadNum += 1
+                if reloadNum > 1440:
+                    reloadNum = 0
 
-                    #LoadAverage
-                    load_average = GetLoadAverage()
-                    lpro = round((load_average['one'] / load_average['max']) * 100, 2)
-                    if lpro > 100: lpro = 100
-                    sql.table('load_average').add('pro,one,five,fifteen,addtime', (
-                    lpro, load_average['one'], load_average['five'], load_average['fifteen'], addtime))
-                    sql.close()
 
-                    lpro = None
-                    load_average = None
-                    cpuInfo = None
-                    networkInfo = None
-                    diskInfo = None
-                    data = None
-                    count = 0
-                    reloadNum += 1
-                    if reloadNum > 1440:
-                        reloadNum = 0
-                except Exception as ex:
-                    logging.info(str(ex))
+
+                # 日报数据收集
+                # if os.path.exists("/www/server/panel/data/start_daily.pl"):
+                #     try:
+                #         from panelDaily import panelDaily
+                #         pd = panelDaily()
+                #         t_now = time.localtime()
+                #         yesterday  = time.localtime(time.mktime((
+                #             t_now.tm_year, t_now.tm_mon, t_now.tm_mday-1,
+                #             0,0,0,0,0,0
+                #         )))
+                #         yes_time_key = pd.get_time_key(yesterday)
+                #         con = ReadFile("/www/server/panel/data/store_app_usage.pl")
+                #         # logging.info(str(con))
+                #         store = False
+                #         if con:
+                #             if con != str(yes_time_key):
+                #                 store = True
+                #         else:
+                #             store = True
+                #
+                #         if store:
+                #             date_str = str(yes_time_key)
+                #             daily_data = pd.get_daily_data_local(date_str)
+                #             if "status" in daily_data.keys():
+                #                 if daily_data["status"]:
+                #                     score = daily_data["score"]
+                #                     if public.M("system").dbfile("system").table("daily").where("time_key=?", (yes_time_key,)).count() == 0:
+                #                         public.M("system").dbfile("system").table("daily").add("time_key,evaluate,addtime", (yes_time_key, score, time.time()))
+                #                     pd.store_app_usage(yes_time_key)
+                #                     WriteFile("/www/server/panel/data/store_app_usage.pl", str(yes_time_key), "w")
+                #                 # logging.info("更新应用存储信息:"+str(yes_time_key))
+                #                 pd.check_server()
+                #     except Exception as e:
+                #         logging.info("存储应用空间信息错误:"+str(e))
+            except Exception as ex:
+                logging.info(str(ex))
             del(tmp)
-            time.sleep(5)
+            time.sleep(cycle)
             count += 1
     except Exception as ex:
         logging.info(ex)
-        time.sleep(30)
+        time.sleep(cycle)
         systemTask()
 
 
@@ -347,9 +451,10 @@ def systemTask():
 def GetMemUsed():
     try:
         mem = virtual_memory()
-        memInfo = {'memTotal': mem.total / 1024 / 1024, 'memFree': mem.free / 1024 / 1024,
-                   'memBuffers': mem.buffers / 1024 / 1024, 'memCached': mem.cached / 1024 / 1024}
-        tmp = memInfo['memTotal'] - memInfo['memFree'] - memInfo['memBuffers'] - memInfo['memCached']
+        memInfo = {'memTotal': mem.total/1024/1024, 'memFree': mem.free/1024/1024,
+                   'memBuffers': mem.buffers/1024/1024, 'memCached': mem.cached/1024/1024}
+        tmp = memInfo['memTotal'] - memInfo['memFree'] - \
+            memInfo['memBuffers'] - memInfo['memCached']
         tmp1 = memInfo['memTotal'] / 100
         return (tmp / tmp1)
     except:
@@ -360,8 +465,9 @@ def GetMemUsed():
 
 def check502():
     try:
-        phpversions = ['53', '54', '55', '56','70', '71', '72', '73', '74', '80']
+        phpversions = public.get_php_versions()
         for version in phpversions:
+            if version in ['52','5.2']: continue
             php_path = '/www/server/php/' + version + '/sbin/php-fpm'
             if not os.path.exists(php_path):
                 continue
@@ -395,13 +501,17 @@ def startPHPVersion(version):
         pid = '/www/server/php/' + version + '/var/run/php-fpm.pid'
         os.system('pkill -9 php-fpm-' + version)
         time.sleep(0.5)
-        if not os.path.exists(cgi): os.system('rm -f ' + cgi)
-        if not os.path.exists(pid): os.system('rm -f ' + pid)
+        if os.path.exists(cgi):
+            os.remove(cgi)
+        if os.path.exists(pid):
+            os.remove(pid)
         os.system(fpm + ' start')
-        if checkPHPVersion(version): return True
-
+        if checkPHPVersion(version):
+            return True
         # 检查是否正确启动
-        if os.path.exists(cgi): return True
+        if os.path.exists(cgi):
+            return True
+        return False
     except Exception as ex:
         logging.info(ex)
         return True
@@ -412,6 +522,10 @@ def checkPHPVersion(version):
     try:
         cgi_file = '/tmp/php-cgi-{}.sock'.format(version)
         if os.path.exists(cgi_file):
+            init_file = '/etc/init.d/php-fpm-{}'.format(version)
+            if os.path.exists(init_file):
+                init_body = public.ReadFile(init_file)
+                if not init_body: return True
             uri = "/phpfpm_"+version+"_status?json"
             result = public.request_php(version, uri, '')
             loads(result)
@@ -425,9 +539,11 @@ def checkPHPVersion(version):
 def check502Task():
     try:
         while True:
+            public.auto_backup_panel()
             check502()
             sess_expire()
             mysql_quota_check()
+            siteEdate()
             time.sleep(600)
     except Exception as ex:
         logging.info(ex)
@@ -436,7 +552,7 @@ def check502Task():
 
 # MySQL配额检查
 def mysql_quota_check():
-    os.system(get_python_bin() +" /www/server/panel/script/mysql_quota.py > /dev/null")
+    os.system("nohup " + get_python_bin() +" /www/server/panel/script/mysql_quota.py > /dev/null 2>&1 &")
 
 # session过期处理
 def sess_expire():
@@ -469,50 +585,58 @@ def check_panel_ssl():
         while True:
             lets_info = ReadFile("{}/ssl/lets.info".format(base_path))
             if not lets_info:
-                time.sleep(600)
+                time.sleep(3600)
                 continue
             os.system(get_python_bin() + " {}/script/panel_ssl_task.py > /dev/null".format(base_path))
-            time.sleep(60)
+            time.sleep(3600)
     except Exception as e:
         public.writeFile("/tmp/panelSSL.pl", str(e), "a+")
 
-# 监控面板状态
-def panel_status():
-    time.sleep(1)
-    panel_pid = get_panel_pid()
-    while True:
-        time.sleep(5)
-        if not panel_pid: panel_pid = get_panel_pid()
-        if not panel_pid: service_panel('start')
+# 面板进程守护
+def daemon_panel():
+    cycle = 10
+    panel_pid_file = "{}/logs/panel.pid".format(public.get_panel_path())
+    while 1:
+        time.sleep(cycle)
 
-        try:
-            f = Process(panel_pid).cmdline()[-1]
-            if f.find('runserver') == -1 and f.find('BT-Panel') == -1:
-                service_panel('start')
-                time.sleep(3)
-                panel_pid = get_panel_pid()
-                continue
-        except:
+        # 检查pid文件是否存在
+        if not os.path.exists(panel_pid_file):
+            continue
+
+        # 读取pid文件
+        panel_pid = public.readFile(panel_pid_file)
+        if not panel_pid:
+            service_panel('start')
+            continue
+
+        # 检查进程是否存在
+        comm_file = "/proc/{}/comm".format(panel_pid)
+        if not os.path.exists(comm_file):
+            service_panel('start')
+            continue
+
+        # 是否为面板进程
+        comm = public.readFile(comm_file)
+        if comm.find('BT-Panel') == -1:
             service_panel('start')
-            time.sleep(3)
-            panel_pid = get_panel_pid()
             continue
 
 
+
+
 def update_panel():
-    os.system("curl https://download.bt.cn/install/update6_en.sh|bash &")
+    os.system("curl -k https://node.aapanel.com/install/update6_en.sh|bash &")
 
 
 def service_panel(action='reload'):
     if not os.path.exists('{}/init.sh'.format(base_path)):
         update_panel()
     else:
-        os.system("bash {}/init.sh {} &".format(base_path, action))
+        os.system("nohup bash /www/server/panel/init.sh {} > /dev/null 2>&1 &".format(action))
+    logging.info("Panel Service: {}".format(action))
 
 
 # 重启面板服务
-
-
 def restart_panel_service():
     rtips = '{}/data/restart.pl'.format(base_path)
     reload_tips = '{}/data/reload.pl'.format(base_path)
@@ -526,19 +650,21 @@ def restart_panel_service():
         time.sleep(1)
 
 # 取面板pid
-
-
 def get_panel_pid():
-    pid = ReadFile('{}/logs/panel.pid'.format(base_path))
-    if pid: return int(pid)
-    for pid in pids():
-        try:
-            p = Process(pid)
-            n = p.cmdline()[-1]
-            if n.find('runserver') != -1 or n.find('BT-Panel') != -1:
-                return pid
-        except:
-            pass
+    try:
+        pid = ReadFile('/www/server/panel/logs/panel.pid')
+        if pid:
+            return int(pid)
+        for pid in pids():
+            try:
+                p = Process(pid)
+                n = p.cmdline()[-1]
+                if n.find('runserver') != -1 or n.find('BT-Panel') != -1:
+                    return pid
+            except:
+                pass
+    except:
+        pass
     return None
 
 
@@ -568,45 +694,140 @@ def HttpGet(url, timeout=6, headers={}):
 
 # 定时任务去检测邮件信息
 def send_mail_time():
-    p_reload = '{}/data/send_to_user.pl'.format(base_path)
-    if not os.path.exists('{}/data'.format(base_path)):
-        return
     while True:
         try:
-            if os.path.exists(p_reload):
-                os.system(get_python_bin() + " {}/script/mail_task.py > /dev/null".format(base_path))
-                os.remove(p_reload)
-            time.sleep(60)
-        except:
+            os.system("nohup " + get_python_bin() +" /www/server/panel/script/mail_task.py > /dev/null 2>&1 &")
             time.sleep(180)
+        except:
+            time.sleep(360)
             send_mail_time()
 
-# 检查面板文件完整性
-def check_files_panel():
+#5个小时更新一次更新软件列表
+def update_software_list():
+    while True:
+        try:
+            import panelPlugin
+            panelPlugin.panelPlugin().get_cloud_list_status(None)
+            time.sleep(18000)
+        except:
+            time.sleep(1800)
+            update_software_list()
+
+# 面板消息提醒
+def check_panel_msg():
     python_bin = get_python_bin()
     while True:
-        time.sleep(600)
-        try:
-            result = loads(
-                os.popen('{} {}/script/check_files.py'.format(python_bin,base_path)).read()
-                )
-        except:
-            logging.info(public.get_error_info())
-            continue
-        if result in ['0']:
-            continue
+        os.system('nohup {} /www/server/panel/script/check_msg.py > /dev/null 2>&1 &'.format(python_bin))
+        time.sleep(3600)
 
-        if type(result) != list:
-            continue
-        class_path = '{}/class/'.format(base_path)
-        for i in result:
-            cf = class_path + i['name']
-            if not os.path.exists(cf):
+# 面板推送消息
+def push_msg():
+    python_bin = get_python_bin()
+    while True:
+        time.sleep(60)
+        os.system('nohup {} /www/server/panel/script/push_msg.py > /dev/null 2>&1 &'.format(python_bin))
+
+def JavaProDaemons():
+    '''
+        @name Java 项目守护进程
+        @author lkq@bt.cn
+        @time 2022-07-19
+        @param None
+    '''
+    if public.M('sites').where('project_type=?',('Java')).count()>=1:
+        project_info=public.M('sites').where('project_type=?',('Java')).select()
+        for i in project_info:
+            try:
+                import json
+                i['project_config'] = json.loads(i['project_config'])
+                #判断项目是否设置了守护进程
+                if  i['project_config']['java_type']!='springboot':continue
+                if 'auth' in i['project_config'] and i['project_config']['auth']==1 or i['project_config']['auth']=='1':
+                    print("Java",i['name'])
+                    from projectModel import javaModel
+                    java = javaModel.main()
+                    if java.get_project_run_state(project_name=i['name']):
+                        continue
+                    else:
+                        #如果项目是在后台停止的，那么就不再启动
+                        if  os.path.exists("/var/tmp/springboot/vhost/pids/{}.pid".format(i['name'])):
+                            get=public.dict_obj()
+                            get.project_name=i['name']
+                            java.start_project(get)
+                            public.WriteLog('守护进程','Java项目[{}]已经被守护进程启动'.format(i['name']))
+            except:
                 continue
-            if public.FileMd5(cf) == i['md5']:
-                continue
-            public.writeFile(cf, i['body'])
-            os.system("bash {}/init.sh reload &".format(base_path))
+
+def ProLog():
+    path_list=["/www/server/go_project/vhost/logs","/var/tmp/springboot/vhost/logs/"]
+    try:
+        for i2 in path_list:
+            if os.path.exists(i2):
+                for dir in os.listdir(i2):
+                    dir = os.path.join(i2, dir)
+                    # 判断当前目录是否为文件夹
+                    if os.path.isfile(dir):
+                        if dir.endswith(".log"):
+                            #文件大于500M的时候则清空文件
+                            if os.stat(dir).st_size >200000000:
+                                public.ExecShell("echo ''>{}".format(dir))
+    except:
+        pass
+
+def ProDadmons():
+    '''
+        @name 项目守护进程
+        @author
+    '''
+    n = 30
+    while 1:
+        n += 1
+        if n >= 30:
+            n = 1
+            ProLog()
+        time.sleep(120)
+        try:
+            JavaProDaemons()
+        except:
+            pass
+
+def process_task_thread():
+    '''
+        @name 进程监控
+        @auther hwliang
+    '''
+
+
+    # 进程流量监控，如果文件：/www/server/panel/data/is_net_task.pl 或 /www/server/panel/data/control.conf不存在，则不监控进程流量
+    net_task_obj = process_task.process_network_total()
+    net_task_obj.start()
+
+def run_thread():
+    global thread_dict,task_obj
+    tkeys = thread_dict.keys()
+
+    thread_list = {
+        "start_task": task_obj.start_task,
+        "systemTask": systemTask,
+        "check502Task": check502Task,
+        "daemon_panel": daemon_panel,
+        "restart_panel_service": restart_panel_service,
+        "check_panel_ssl": check_panel_ssl,
+        "update_software_list": update_software_list,
+        "send_mail_time": send_mail_time,
+        "check_panel_msg": check_panel_msg,
+        "push_msg": push_msg,
+        "ProDadmons":ProDadmons,
+        "process_task_thread":process_task_thread
+    }
+
+    for skey in thread_list.keys():
+        if not skey in tkeys or not thread_dict[skey].is_alive():
+            thread_dict[skey] = threading.Thread(target=thread_list[skey])
+            thread_dict[skey].setDaemon(True)
+            thread_dict[skey].start()
+
+
 
 def func():
     os.system(get_python_bin() + " {}/script/scan_log.py > /dev/null".format(base_path))
@@ -652,52 +873,14 @@ def main():
     sys.stdout.flush()
     sys.stderr.flush()
     task_log_file = 'logs/task.log'
-
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s [%(levelname)s]: %(message)s',
-                        datefmt='%Y-%m-%d %H:%M:%S', filename=task_log_file, filemode='a+')
-    logging.info('Service started')
-
-    t = threading.Thread(target=systemTask)
-    t.setDaemon(True)
-    t.start()
-
-    p = threading.Thread(target=check502Task)
-    p.setDaemon(True)
-    p.start()
-
-    pl = threading.Thread(target=panel_status)
-    pl.setDaemon(True)
-    pl.start()
-
-    p = threading.Thread(target=restart_panel_service)
-    p.setDaemon(True)
-    p.start()
-
-    p = threading.Thread(target=check_panel_ssl)
-    p.setDaemon(True)
-    p.start()
-
-    p = threading.Thread(target=send_mail_time)
-    p.setDaemon(True)
-    p.start()
-
-    # p = threading.Thread(target=check_files_panel)
-    # p.setDaemon(True)
-    # p.start()
-    import panelTask
-    task_obj = panelTask.bt_task()
-    task_obj.not_web = True
-    p = threading.Thread(target=task_obj.start_task)
-    p.setDaemon(True)
-    p.start()
-
-    # p = threading.Thread(target=check_panel_msg)
-    # p.setDaemon(True)
-    # p.start()
-    p = threading.Thread(target=scan_log_site)
-    p.setDaemon(True)
-    p.start()
-
+    try:
+        logging.basicConfig(level=logging.INFO, format='%(asctime)s [%(levelname)s]: %(message)s',
+                            datefmt='%Y-%m-%d %H:%M:%S', filename=task_log_file, filemode='a+')
+    except Exception as ex:
+        print(ex)
+    logging.info('Service Up')
+    time.sleep(5)
+    run_thread()
     startTask()