refactor(backend): 统一返回的数据格式
This commit is contained in:
+8
-21
@@ -4,6 +4,7 @@ from flask import Blueprint, request
|
||||
from flask_jwt_extended import current_user, jwt_required
|
||||
from flask_sqlalchemy.pagination import Pagination
|
||||
|
||||
from pear_admin.common.utils.responses import JsonResponse
|
||||
from pear_admin.extensions import db
|
||||
from pear_admin.orms import RoleORM, UserORM
|
||||
|
||||
@@ -18,12 +19,7 @@ def user_list():
|
||||
|
||||
pages: Pagination = db.paginate(q, page=page, per_page=per_page)
|
||||
|
||||
return {
|
||||
"code": 0,
|
||||
"msg": "获取用户数据成功",
|
||||
"data": [item.json() for item in pages.items],
|
||||
"count": pages.total,
|
||||
}
|
||||
return JsonResponse().set_table(pages).set_msg("获取用户数据成功").ok()
|
||||
|
||||
|
||||
@user_api.post("/user")
|
||||
@@ -37,7 +33,7 @@ def create_user():
|
||||
role.create_at = datetime.strptime(create_at, "%Y-%m-%d %H:%M:%S")
|
||||
role.password = "123456"
|
||||
role.save()
|
||||
return {"code": 0, "msg": "新增用户成功"}
|
||||
return JsonResponse().set_msg("新增用户成功").ok()
|
||||
|
||||
|
||||
@user_api.put("/user/<int:uid>")
|
||||
@@ -51,14 +47,14 @@ def change_user(uid):
|
||||
value = datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
|
||||
setattr(user_obj, key, value)
|
||||
user_obj.save()
|
||||
return {"code": 0, "msg": "修改用户信息成功"}
|
||||
return JsonResponse().set_msg("修改用户信息成功").ok()
|
||||
|
||||
|
||||
@user_api.delete("/user/<int:rid>")
|
||||
def del_user(rid):
|
||||
user_obj = UserORM.query.get(rid)
|
||||
user_obj.delete()
|
||||
return {"code": 0, "msg": "删除用户成功"}
|
||||
return JsonResponse().set_msg("删除用户成功").ok()
|
||||
|
||||
|
||||
@user_api.get("/user/user_role/<int:uid>")
|
||||
@@ -68,12 +64,7 @@ def get_user_role(uid):
|
||||
).scalar()
|
||||
|
||||
wn_role_list = [r.id for r in user.role_list]
|
||||
|
||||
return {
|
||||
"code": 0,
|
||||
"msg": "返回角色权限数据成功",
|
||||
"data": wn_role_list,
|
||||
}
|
||||
return JsonResponse().set_body(wn_role_list).set_msg("返回角色权限数据成功").ok()
|
||||
|
||||
|
||||
@user_api.put("/user/user_role/<int:rid>")
|
||||
@@ -89,14 +80,10 @@ def change_user_role(rid):
|
||||
).all()
|
||||
user.role_list = [r[0] for r in role_obj_list]
|
||||
user.save()
|
||||
return {"code": 0, "msg": "授权成功"}
|
||||
return JsonResponse().set_msg("授权成功").ok()
|
||||
|
||||
|
||||
@user_api.get("/user/profile")
|
||||
@jwt_required()
|
||||
def user_profile():
|
||||
return {
|
||||
"code": 0,
|
||||
"msg": "获取个人数据成功",
|
||||
"data": current_user.json(),
|
||||
}
|
||||
return JsonResponse().set_body(current_user.json()).set_msg("获取个人数据成功").ok()
|
||||
|
||||
Reference in New Issue
Block a user