'wip(logging):调整日志记录方式'

applications/view/logs_view.py

@@ -4,26 +4,26 @@ from flask_restful import marshal
 from applications.common.serialization import log_fields
 
 from applications.common.utils.http import table_api
-from applications.common.utils.rights import authorize
-from applications.models import AdminLog
+from applications.common.utils.rights import authorize, permission_required
+from applications.models import LoggingModel
 
 logs_bp = Blueprint('logs', __name__, url_prefix='/logs')
 
 
 @logs_bp.get('/')
-@authorize("admin:log:main")
+@permission_required("admin:log:main")
 def index():
     return render_template('admin/logs_temp/main.html')
 
 
 @logs_bp.get('/login_log')
-@authorize("admin:log:main")
+@permission_required("admin:log:main")
 def login_log():
     page = request.args.get('page', type=int)
     limit = request.args.get('limit', type=int)
-    log_paginate = AdminLog.query.filter_by(
+    log_paginate = LoggingModel.query.filter_by(
         url='/api/v1/passport/login').order_by(
-        desc(AdminLog.create_at)).paginate(
+        desc(LoggingModel.create_at)).paginate(
         page=page, per_page=limit, error_out=False)
     data = marshal(log_paginate.items, log_fields)
 
@@ -31,13 +31,13 @@ def login_log():
 
 
 @logs_bp.get('/access_log')
-@authorize("admin:log:main")
+@permission_required("admin:log:main")
 def operate_log():
     page = request.args.get('page', type=int)
     limit = request.args.get('limit', type=int)
-    log_paginate = AdminLog.query.filter(
-        AdminLog.url != '/api/v1/passport/login').order_by(
-        desc(AdminLog.create_at)).paginate(
+    log_paginate = LoggingModel.query.filter(
+        LoggingModel.url != '/api/v1/passport/login').order_by(
+        desc(LoggingModel.create_at)).paginate(
         page=page, per_page=limit, error_out=False)
     data = marshal(log_paginate.items, log_fields)
     return table_api(data=data, count=log_paginate.total, code=0)