update

web/admin/__init__.py

@@ -114,6 +114,7 @@ def inject_global_variables():
     if mw.isDebugMode():
         ver = ver + str(time.time())
 
+    # print(ver)
     config = {
         'version': ver,
         'title' : '面板',

web/admin/system/__init__.py

@@ -17,7 +17,7 @@ import utils.system as sys
 
 blueprint = Blueprint('system', __name__, url_prefix='/system', template_folder='../../templates')
 
-# 取系统的统计信息
+# 获取系统的统计信息
 @blueprint.route('/system_total', endpoint='system_total')
 def system_total():
     data = sys.getMemInfo()
@@ -29,7 +29,7 @@ def system_total():
     data['version'] = '0.0.1'
     return data
 
-# 取系统的网络流量信息
+# 获取系统的网络流量信息
 @blueprint.route('/network', endpoint='network')
 def network():
     stat = {}
@@ -40,12 +40,71 @@ def network():
     stat['network'] = sys.stats().network()
     return stat
 
-# 取系统的磁盘信息
+# 获取系统的磁盘信息
 @blueprint.route('/disk_info', endpoint='disk_info')
 def disk_info():
     data = sys.getDiskInfo()
     return data
 
+# 获取系统的负载统计信息
+@blueprint.route('/get_load_average', endpoint='get_load_average', methods=['GET'])
+def get_load_average():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    data = mw.M('load_average').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?", (start, end,))\
+        .field('id,pro,one,five,fifteen,addtime')\
+        .order('id asc').select()
+    # return self.toAddtime(data)
+    # print(data)
+    return data
+
+# 获取系统的磁盘IO统计信息
+@blueprint.route('/get_disk_io', endpoint='get_disk_io', methods=['GET'])
+def get_disk_io():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    data = mw.M('diskio').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?", (start, end))\
+        .field('id,read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime')\
+        .order('id asc').select()
+    return data
+
+# 获取系统的CPU/IO统计信息
+@blueprint.route('/get_cpu_io', endpoint='get_cpu_io', methods=['GET'])
+def get_cpu_io():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    data = mw.M('cpuio').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?",(start, end))\
+        .field('id,pro,mem,addtime')\
+        .order('id asc').select()
+    # return self.toAddtime(data)
+    # print(data)
+    return data
+
+
+# 获取系统网络IO统计信息
+@blueprint.route('/get_network_io', endpoint='get_network_io', methods=['GET'])
+def get_network_io():
+    start = request.args.get('start', '')
+    end = request.args.get('end', '')
+    data = mw.M('network').dbPos(mw.getPanelDataDir(),'system')\
+        .where("addtime>=? AND addtime<=?", (start, end))\
+        .field('id,up,down,total_up,total_down,down_packets,up_packets,addtime')\
+        .order('id asc').select()
+    # return self.toAddtime(data)
+    # print(data)
+    return data
+
+# 获取系统网络IO统计信息
+@blueprint.route('/set_control', endpoint='set_control', methods=['POST'])
+def set_control():
+    stype = request.form.get('type', '')
+    day = request.form.get('day', '')
+    return mw.returnData(True, "设置成功!")
+
+
 # 升级检测
 @blueprint.route('/update_server', endpoint='update_server')
 def update_server():

web/core/db.py

@@ -33,7 +33,7 @@ class Sql():
     __OPT_PARAM = ()            # where值
 
     def __init__(self):
-        self.__DB_FILE = 'data/default.db'
+        self.__DB_FILE = '../data/default.db'
 
     def __getConn(self):
         # 取数据库对象

web/core/mw.py

@@ -491,6 +491,11 @@ def writeDbLog(stype, msg, args=(), uid=1):
         return False
 
 
+def M(table):
+    import core.db as db
+    sql = db.Sql()
+    return sql.table(table)
+
 # ---------------------------------------------------------------------------------
 # 打印相关 START
 # ---------------------------------------------------------------------------------