flask-restful依赖替换完成

applications/view/admin/logs.py

@@ -1,10 +1,11 @@
 from flask import Blueprint, request, render_template
 from sqlalchemy import desc
+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, LogSchema
-from applications.common.curd import model_to_dicts
+from applications.models import AdminLog
 
 admin_log = Blueprint('logs', __name__, url_prefix='/logs')
 
@@ -24,7 +25,7 @@ def login_log():
         url='/passport/login').order_by(
         desc(AdminLog.create_time)).paginate(
         page=page, per_page=limit, error_out=False)
-    data = model_to_dicts(Schema=LogSchema, model=log_paginate.items)
+    data = marshal(log_paginate.items, log_fields)
 
     return table_api(data=data, count=log_paginate.total)
 
@@ -34,10 +35,9 @@ def login_log():
 def operate_log():
     page = request.args.get('page', type=int)
     limit = request.args.get('limit', type=int)
-    log = AdminLog.query.filter(
+    log_paginate = AdminLog.query.filter(
         AdminLog.url != '/passport/login').order_by(
         desc(AdminLog.create_time)).paginate(
         page=page, per_page=limit, error_out=False)
-    count = AdminLog.query.filter(AdminLog.url != '/admin/login').count()
-    data = model_to_dicts(Schema=LogSchema, model=log.items)
-    return table_api(data=data, count=count)
+    data = marshal(log_paginate.items, log_fields)
+    return table_api(data=data, count=log_paginate.total)