refactor(api):前后端半分离

applications/view/users/__init__.py

@@ -1,52 +1,12 @@
-from flask import Blueprint, request, render_template
-from flask_restful import Api, reqparse
+from flask import Blueprint, render_template
+from flask_login import login_required, current_user
+from flask_restful import Api
+from sqlalchemy import desc
 
-from applications.common.utils.http import table_api
 from applications.common.utils.rights import authorize
-from applications.models import Role, User, Dept
+from ...models import AdminLog
 
 users_bp = Blueprint('users', __name__, url_prefix='/users')
-user_api = Api(users_bp)
-
-
-#   用户分页查询
-@users_bp.get('/data')
-@authorize("admin:user:main", log=True)
-def data():
-    parser = reqparse.RequestParser()
-    parser.add_argument('page', type=int, default=1)
-    parser.add_argument('limit', type=int, default=10)
-    parser.add_argument('realName', type=str, dest='real_name')
-    parser.add_argument('username', type=str)
-    parser.add_argument('deptId', type=int, dest='dept_id', default=0)
-
-    res = parser.parse_args()
-
-    filters = []
-
-    if res.real_name:
-        filters.append(User.realname.like('%' + res.real_name + '%'))
-    if res.username:
-        filters.append(User.username.like('%' + res.username + '%'))
-    if res.dept_id:
-        filters.append(User.dept_id == res.dept_id)
-
-    paginate = User.query.filter(*filters).paginate(page=res.page,
-                                                    per_page=res.limit,
-                                                    error_out=False)
-
-    dept_name = lambda dept_id: Dept.query.filter_by(id=dept_id).first().dept_name
-    user_data = [{
-        'id': item.id,
-        'username': item.username,
-        'realname': item.realname,
-        'enable': item.enable,
-        'create_at': item.create_at,
-        'update_at': item.update_at,
-        'dept': dept_name(item.dept_id),
-    } for item in paginate.items]
-
-    return table_api(data=user_data, count=paginate.total)
 
 
 # 用户增加
@@ -56,5 +16,14 @@ def get():
     return render_template('admin/user/main.html')
 
 
+@users_bp.get('/center')
+@login_required
+def center():
+    user_logs = AdminLog.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
+        desc(AdminLog.create_time)).limit(10)
+    return render_template('admin/user/profile.html', user_info=current_user, user_logs=user_logs)
+
+
+user_api = Api(users_bp)
 from . import profile, _utils
 from . import user_view

applications/view/users/profile.py

@@ -1,22 +1,15 @@
 # 个人中心
-from flask import render_template, request, make_response, jsonify
+from flask import request, jsonify
 from flask_login import login_required, current_user
 from flask_restful import Resource, reqparse
-from sqlalchemy import desc
 
 from applications.common.utils.http import fail_api, success_api
 from applications.extensions import db
-from applications.models import User, AdminLog
+from applications.models import User
 from applications.view.users import users_bp, user_api
 
-
-@users_bp.get('/center')
-@login_required
-def center():
-    user_info = current_user
-    user_logs = AdminLog.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
-        desc(AdminLog.create_time)).limit(10)
-    return render_template('admin/user/profile.html', user_info=user_info, user_logs=user_logs)
+# TODO 分离视图操作
+from flask import render_template, make_response
 
 
 @user_api.resource('/avatar')
@@ -39,7 +32,6 @@ class Avatar(Resource):
 @users_bp.put('/updateInfo')
 @login_required
 def update_info():
-
     parser = reqparse.RequestParser()
     parser.add_argument('realname', type=str, dest='real_name')
     parser.add_argument('remark', type=str)

applications/view/users/user_view.py

@@ -1,12 +1,15 @@
-from flask import render_template, request, make_response
+from flask import request
 from flask_restful import Resource, reqparse
 from applications.extensions import db
 
-from applications.common.utils.http import fail_api, success_api
+from applications.common.utils.http import fail_api, success_api, table_api
 from applications.common.utils.rights import authorize
-from applications.models import User, Role
+from applications.models import User, Role, Dept
 from applications.view.users import user_api, users_bp, _utils
 
+# TODO 分离视图操作
+from flask import render_template, make_response
+
 
 @user_api.resource('/add')
 class Users(Resource):
@@ -127,3 +130,42 @@ def user_enable():
     else:
         return fail_api(msg="出错啦")
     return message
+
+
+@users_bp.get('/data')
+@authorize("admin:user:main", log=True)
+def data():
+    parser = reqparse.RequestParser()
+    parser.add_argument('page', type=int, default=1)
+    parser.add_argument('limit', type=int, default=10)
+    parser.add_argument('realName', type=str, dest='real_name')
+    parser.add_argument('username', type=str)
+    parser.add_argument('deptId', type=int, dest='dept_id', default=0)
+
+    res = parser.parse_args()
+
+    filters = []
+
+    if res.real_name:
+        filters.append(User.realname.like('%' + res.real_name + '%'))
+    if res.username:
+        filters.append(User.username.like('%' + res.username + '%'))
+    if res.dept_id:
+        filters.append(User.dept_id == res.dept_id)
+
+    paginate = User.query.filter(*filters).paginate(page=res.page,
+                                                    per_page=res.limit,
+                                                    error_out=False)
+
+    dept_name = lambda dept_id: Dept.query.filter_by(id=dept_id).first().dept_name
+    user_data = [{
+        'id': item.id,
+        'username': item.username,
+        'realname': item.realname,
+        'enable': item.enable,
+        'create_at': item.create_at,
+        'update_at': item.update_at,
+        'dept': dept_name(item.dept_id),
+    } for item in paginate.items]
+
+    return table_api(data=user_data, count=paginate.total)