update

web/admin/logs/__init__.py

@@ -14,11 +14,9 @@ from flask import request
 
 from admin.user_login_check import panel_login_required
 
-from admin import model
-from admin.model import db, Logs
-
 import core.mw as mw
 import utils.adult_log as adult_log
+import thisdb
 
 # 日志页面
 blueprint = Blueprint('logs', __name__, url_prefix='/logs', template_folder='../../templates')
@@ -36,33 +34,18 @@ def get_log_list():
     size = request.form.get('limit', '10').strip()
     search = request.form.get('search', '').strip()
 
-    count = Logs.query.filter_by().count()
-    if search != '':
-        pagination = Logs.query.filter_by(Logs.type.like(search) or Logs.log.like(search)).paginate(page=int(p), per_page=int(size))
-    else:
-        pagination = Logs.query.filter_by().order_by(Logs.id.desc()).paginate(page=int(p), per_page=int(size))
-  
-    rows = []
-    for item in pagination.items:
-        t = {}
-        t['id'] = item.id
-        t['type'] = item.type
-        t['log'] = item.log
-        t['uid'] = item.uid
-        t['add_time'] = item.add_time
-        rows.append(t)
+    info = thisdb.getLogsList(page=int(p),size=int(size), search=search)
 
     data = {}
-    data['data'] = rows
-    data['page'] = mw.getPage({'count':count,'tojs':'getLogs','p':p})
+    data['data'] = info['list']
+    data['page'] = mw.getPage({'count':info['count'],'tojs':'getLogs','p':p,'row':size})
     return data
 
 # 日志清空
 @blueprint.route('/del_panel_logs', endpoint='del_panel_logs', methods=['POST'])
 @panel_login_required
 def del_panel_logs():
-    model.clearLog()
-    # mw.M('logs').dbPos(mw.getPanelDataDir(),'panel').where('id>?', (0,)).delete()
+    thisdb.clearLog()
     mw.writeLog('面板设置', '面板操作日志已清空!')
     return mw.returnData(True, '面板操作日志已清空!')