refactor(backend): 统一返回的数据格式
This commit is contained in:
+7
-16
@@ -1,6 +1,7 @@
|
||||
from flask import Blueprint, request
|
||||
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 RightsORM, RoleORM
|
||||
|
||||
@@ -14,13 +15,7 @@ def role_list():
|
||||
q = db.select(RoleORM)
|
||||
|
||||
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()
|
||||
|
||||
|
||||
@role_api.post("/role")
|
||||
@@ -30,7 +25,7 @@ def create_role():
|
||||
del data["id"]
|
||||
role = RoleORM(**data)
|
||||
role.save()
|
||||
return {"code": 0, "msg": "新增角色成功"}
|
||||
return JsonResponse().set_msg("新增角色成功").ok()
|
||||
|
||||
|
||||
@role_api.put("/role/<int:rid>")
|
||||
@@ -42,14 +37,14 @@ def change_role(rid):
|
||||
for key, value in data.items():
|
||||
setattr(role_obj, key, value)
|
||||
role_obj.save()
|
||||
return {"code": 0, "msg": "修改角色权限成功"}
|
||||
return JsonResponse().set_msg("修改角色权限成功").ok()
|
||||
|
||||
|
||||
@role_api.delete("/role/<int:rid>")
|
||||
def del_role(rid):
|
||||
role_obj = RoleORM.query.get(rid)
|
||||
role_obj.delete()
|
||||
return {"code": 0, "msg": "删除角色成功"}
|
||||
return JsonResponse().set_msg("删除角色成功").ok()
|
||||
|
||||
|
||||
@role_api.get("/role/role_rights/<int:rid>")
|
||||
@@ -59,11 +54,7 @@ def role_rights(rid):
|
||||
).scalar()
|
||||
own_rights_list = [r.id for r in role.rights_list]
|
||||
|
||||
return {
|
||||
"code": 0,
|
||||
"msg": "返回角色权限数据成功",
|
||||
"data": own_rights_list,
|
||||
}
|
||||
return JsonResponse().set_body(own_rights_list).set_msg("删除角色成功").ok()
|
||||
|
||||
|
||||
@role_api.put("/role/role_rights/<int:rid>")
|
||||
@@ -79,4 +70,4 @@ def change_role_rights(rid):
|
||||
).all()
|
||||
role.rights_list = [r[0] for r in rights_obj_list]
|
||||
role.save()
|
||||
return {"code": 0, "msg": "授权成功"}
|
||||
return JsonResponse().set_msg("授权成功").ok()
|
||||
|
||||
Reference in New Issue
Block a user