diff --git a/pear_admin/apis/department.py b/pear_admin/apis/department.py index e1a9064..6270479 100644 --- a/pear_admin/apis/department.py +++ b/pear_admin/apis/department.py @@ -33,7 +33,7 @@ def department_list(): return { "code": 0, - "message": "获取部门数据成功", + "msg": "获取部门数据成功", "data": [item.json() for item in pages.items], "count": pages.total, } @@ -46,7 +46,7 @@ def create_department(): del data["id"] department = DepartmentORM(**data) department.save() - return {"code": 0, "message": "新增部门成功"} + return {"code": 0, "msg": "新增部门成功"} @department_api.put("/department/") @@ -58,11 +58,11 @@ def change_department(rid): for key, value in data.items(): setattr(department_obj, key, value) department_obj.save() - return {"code": 0, "message": "修改部门成功"} + return {"code": 0, "msg": "修改部门成功"} @department_api.delete("/department/") def del_department(rid): department_obj = DepartmentORM.query.get(rid) department_obj.delete() - return {"code": 0, "message": "删除删除成功"} + return {"code": 0, "msg": "删除删除成功"} diff --git a/pear_admin/apis/passport.py b/pear_admin/apis/passport.py index 5280f6a..2a828d7 100644 --- a/pear_admin/apis/passport.py +++ b/pear_admin/apis/passport.py @@ -34,7 +34,7 @@ def login_in(): response = make_response( { "code": 0, - "message": "登录成功", + "msg": "登录成功", "access_token": access_token, "refresh_token": refresh_token, } diff --git a/pear_admin/apis/rights.py b/pear_admin/apis/rights.py index cd08c4f..ea02e31 100644 --- a/pear_admin/apis/rights.py +++ b/pear_admin/apis/rights.py @@ -63,8 +63,8 @@ def rights_list(): data["children"].append(child_data) data["isParent"] = True ret.append(data) - return {"code": 0, "message": "请求权限数据成功", "count": pages.total, "data": ret} - return {"code": 0, "message": "请求权限数据成功,"} + return {"code": 0, "msg": "请求权限数据成功", "count": pages.total, "data": ret} + return {"code": 0, "msg": "请求权限数据成功,"} @rights_api.post("/rights") @@ -77,7 +77,7 @@ def create_rights(): data["sort"] = int(data["sort"]) rights_obj = RightsORM(**data) rights_obj.save() - return {"code": 0, "message": "新增权限数据成功"} + return {"code": 0, "msg": "新增权限数据成功"} @rights_api.put("/rights/") @@ -90,7 +90,7 @@ def change_rights(rid): for key, value in data.items(): setattr(rights_obj, key, value) rights_obj.save() - return {"code": 0, "message": "修改权限数据成功"} + return {"code": 0, "msg": "修改权限数据成功"} @rights_api.delete("/rights/") @@ -98,4 +98,4 @@ def change_rights(rid): def delete_rights(rid): rights_obj = RightsORM.query.get(rid) rights_obj.delete() - return {"code": 0, "message": "删除权限数据成功"} + return {"code": 0, "msg": "删除权限数据成功"} diff --git a/pear_admin/apis/role.py b/pear_admin/apis/role.py index 08a9319..ddb1596 100644 --- a/pear_admin/apis/role.py +++ b/pear_admin/apis/role.py @@ -17,7 +17,7 @@ def role_list(): return { "code": 0, - "message": "获取角色数据成功", + "msg": "获取角色数据成功", "data": [item.json() for item in pages.items], "count": pages.total, } @@ -30,7 +30,7 @@ def create_role(): del data["id"] role = RoleORM(**data) role.save() - return {"code": 0, "message": "新增角色成功"} + return {"code": 0, "msg": "新增角色成功"} @role_api.put("/role/") @@ -42,14 +42,14 @@ def change_role(rid): for key, value in data.items(): setattr(role_obj, key, value) role_obj.save() - return {"code": 0, "message": "修改角色权限成功"} + return {"code": 0, "msg": "修改角色权限成功"} @role_api.delete("/role/") def del_role(rid): role_obj = RoleORM.query.get(rid) role_obj.delete() - return {"code": 0, "message": "删除角色成功"} + return {"code": 0, "msg": "删除角色成功"} @role_api.get("/role/role_rights/") @@ -61,7 +61,7 @@ def role_rights(rid): return { "code": 0, - "message": "返回角色权限数据成功", + "msg": "返回角色权限数据成功", "data": own_rights_list, } @@ -79,4 +79,4 @@ def change_role_rights(rid): ).all() role.rights_list = [r[0] for r in rights_obj_list] role.save() - return {"code": 0, "message": "授权成功"} + return {"code": 0, "msg": "授权成功"} diff --git a/pear_admin/apis/user.py b/pear_admin/apis/user.py index dd6702f..abb20b0 100644 --- a/pear_admin/apis/user.py +++ b/pear_admin/apis/user.py @@ -20,7 +20,7 @@ def user_list(): return { "code": 0, - "message": "获取用户数据成功", + "msg": "获取用户数据成功", "data": [item.json() for item in pages.items], "count": pages.total, } @@ -37,7 +37,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, "message": "新增用户成功"} + return {"code": 0, "msg": "新增用户成功"} @user_api.put("/user/") @@ -51,14 +51,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, "message": "修改用户信息成功"} + return {"code": 0, "msg": "修改用户信息成功"} @user_api.delete("/user/") def del_user(rid): user_obj = UserORM.query.get(rid) user_obj.delete() - return {"code": 0, "message": "删除用户成功"} + return {"code": 0, "msg": "删除用户成功"} @user_api.get("/user/user_role/") @@ -71,7 +71,7 @@ def get_user_role(uid): return { "code": 0, - "message": "返回角色权限数据成功", + "msg": "返回角色权限数据成功", "data": wn_role_list, } @@ -89,7 +89,7 @@ def change_user_role(rid): ).all() user.role_list = [r[0] for r in role_obj_list] user.save() - return {"code": 0, "message": "授权成功"} + return {"code": 0, "msg": "授权成功"} @user_api.get("/user/profile") diff --git a/templates/system/role/index.html b/templates/system/role/index.html index fa846a6..f2d9ee1 100644 --- a/templates/system/role/index.html +++ b/templates/system/role/index.html @@ -327,11 +327,11 @@ type: "put", success: function (result) { if (result.code === 0) { - layer.msg(result.message, { icon: 1, time: 1000 }, function () { + layer.msg(result.msg, { icon: 1, time: 1000 }, function () { layer.closeAll(); }); } else { - layer.msg(result.message, { icon: 2, time: 1000 }); + layer.msg(result.msg, { icon: 2, time: 1000 }); } }, }); diff --git a/templates/system/user/index.html b/templates/system/user/index.html index fba89fb..71d0943 100644 --- a/templates/system/user/index.html +++ b/templates/system/user/index.html @@ -350,11 +350,11 @@ type: "put", success: function (result) { if (result.code === 0) { - layer.msg(result.message, { icon: 1, time: 1000 }, function () { + layer.msg(result.msg, { icon: 1, time: 1000 }, function () { layer.closeAll(); }); } else { - layer.msg(result.message, { icon: 2, time: 1000 }); + layer.msg(result.msg, { icon: 2, time: 1000 }); } }, }); diff --git a/templates/view/index.html b/templates/view/index.html index 6d1ab00..42a9938 100644 --- a/templates/view/index.html +++ b/templates/view/index.html @@ -120,20 +120,6 @@ var admin = layui.admin; var popup = layui.popup; - // 请求后端,严重是否已经登录 - fetch("/api/v1/user/profile", { - method: "GET", - headers: { - Authorization: "Bearer " + localStorage.getItem("access_token"), - }, - }) - .then((res) => res.json()) - .then(function (data) { - if (data.code !== 0) { - location.href = "/view/login.html"; - } - }); - // 给 pear-admin-layui 的默认 ajax 请求添加权限 $.ajaxSetup({ headers: { @@ -141,6 +127,17 @@ }, }); + // 请求后端,严重是否已经登录 + $.ajax({ + type: "GET", + url: "/api/v1/user/profile", + success: function (data) { + if (data.code !== 0) { + location.href = "/view/login.html"; + } + }, + }); + admin.setConfigurationPath("/static/config/pear.config.json"); admin.render(); diff --git a/templates/view/login.html b/templates/view/login.html index 1f95cff..fd2fe49 100644 --- a/templates/view/login.html +++ b/templates/view/login.html @@ -137,7 +137,7 @@ }, error: function (XMLHttpRequest, textStatus, errorThrown) { btn.stop(function () { - popup.failure(XMLHttpRequest.responseJSON.message); + popup.failure(XMLHttpRequest.responseJSON.msg); }); }, }); diff --git a/templates/view/register.html b/templates/view/register.html index ba616c3..a72dc44 100644 --- a/templates/view/register.html +++ b/templates/view/register.html @@ -159,7 +159,7 @@ }, error: function (XMLHttpRequest, textStatus, errorThrown) { btn.stop(function () { - popup.failure(XMLHttpRequest.responseJSON.message); + popup.failure(XMLHttpRequest.responseJSON.msg); }); }, });