refactor(api-logging):暂时删除权限校验与日志记录

applications/api/rights/department.py

@@ -3,14 +3,12 @@ from flask_restful import Resource
 from flask_restful import marshal, reqparse
 
 from applications.common.utils.http import success_api, fail_api
-from applications.common.utils.rights import authorize
 from applications.extensions import db
 from applications.models import CompanyDepartment, CompanyUser
 
 
 class DepartmentsResource(Resource):
 
-    @authorize("admin:dept:main", log=True)
     def get(self):
         dept_data = CompanyDepartment.query.order_by(CompanyDepartment.sort).all()
         # TODO dtree 需要返回状态信息
@@ -21,7 +19,6 @@ class DepartmentsResource(Resource):
         print(dept_data)
         return jsonify(res)
 
-    @authorize("admin:dept:add", log=True)
     def post(self):
         parser = reqparse.RequestParser()
         parser.add_argument('address', type=str)
@@ -52,7 +49,6 @@ class DepartmentsResource(Resource):
 
 
 class DepartmentResource(Resource):
-    @authorize("admin:dept:edit", log=True)
     def get(self, dept_id):
         dept = CompanyDepartment.query.filter_by(id=dept_id).first()
         dept_data = {
@@ -65,10 +61,8 @@ class DepartmentResource(Resource):
             'sort': dept.sort,
             'address': dept.address,
         }
-        # return make_response(render_template('department/edit.html', dept=dept))
         return dict(success=True, message='ok', dept=dept_data)
 
-    @authorize("admin:dept:edit", log=True)
     def put(self, dept_id):
         parser = reqparse.RequestParser()
         parser.add_argument('address', type=str)
@@ -95,7 +89,6 @@ class DepartmentResource(Resource):
         db.session.commit()
         return success_api(message="更新成功")
 
-    @authorize("admin:dept:remove", log=True)
     def delete(self, dept_id):
         ret = CompanyDepartment.query.filter_by(id=dept_id).delete()
         CompanyUser.query.filter_by(dept_id=dept_id).update({"dept_id": None})
@@ -106,7 +99,6 @@ class DepartmentResource(Resource):
 
 
 class DeptEnableResource(Resource):
-    @authorize("admin:dept:edit", log=True)
     def put(self, dept_id):
         d = CompanyDepartment.query.get(dept_id)
         if d:

applications/api/rights/rights.py

@@ -2,11 +2,10 @@ import copy
 from collections import OrderedDict
 
 from flask import request, jsonify, current_app
-from flask_login import current_user, login_required
+from flask_login import current_user
 from flask_restful import Resource, reqparse, marshal
 
 from applications.common.utils.http import success_api, fail_api
-from applications.common.utils.rights import authorize
 from applications.extensions import db
 from applications.models import RightsPower, RightsRole
 
@@ -153,7 +152,6 @@ parser_power.add_argument('sort', type=int, dest='sort')
 
 
 class RightRightsResource(Resource):
-    @authorize("admin:power:main", log=True)
     def get(self):
         """获取选择父节点"""
 
@@ -167,7 +165,6 @@ class RightRightsResource(Resource):
         }
         return res
 
-    @authorize("admin:power:remove", log=True)
     def delete(self):
         ids = request.form.getlist('ids[]')
         batch_remove_power(ids)
@@ -176,7 +173,6 @@ class RightRightsResource(Resource):
 
 class RightPowerResource(Resource):
 
-    @authorize("admin:power:add", log=True)
     def post(self, power_id):
         res = parser_power.parse_args()
         power = RightsPower(
@@ -199,7 +195,6 @@ class RightPowerResource(Resource):
 
         return success_api(message="成功")
 
-    @authorize("admin:power:remove", log=True)
     def delete(self, power_id):
         # 删除权限（目前没有判断父节点自动删除子节点）
         power = RightsPower.query.filter_by(id=power_id).first()
@@ -218,7 +213,6 @@ class RightPowerResource(Resource):
         else:
             return fail_api(message="删除失败")
 
-    @authorize("admin:power:edit", log=True)
     def put(self, power_id):
 
         res = parser_power.parse_args()
@@ -241,7 +235,6 @@ class RightPowerResource(Resource):
 
 
 class RightPowerEnableResource(Resource):
-    @authorize("admin:power:edit", log=True)
     def put(self, right_id):
 
         power = RightsPower.query.get(right_id)
@@ -255,13 +248,11 @@ class RightPowerEnableResource(Resource):
 
 
 class AdminConfigsResource(Resource):
-    @login_required
     def get(self):
         return get_render_config()
 
 
 class AdminMenuResource(Resource):
-    @login_required
     def get(self):
         menu_tree = make_menu_tree()
         return jsonify(menu_tree)

applications/api/rights/roles.py

@@ -1,8 +1,6 @@
-from flask_login import login_required
 from flask_restful import Resource, reqparse, marshal
 
 from applications.common.utils.http import table_api, success_api, fail_api
-from applications.common.utils.rights import authorize
 from applications.extensions import db
 from applications.models import RightsPower, RightsRole, CompanyUser
 
@@ -37,7 +35,6 @@ def batch_remove_role(role_ids):
 
 class RoleRolesResource(Resource):
     # 表格数据
-    @authorize("admin:role:main", log=True)
     def get(self):
         parser = reqparse.RequestParser(bundle_errors=True)
         parser.add_argument('page', type=int, default=1)
@@ -66,8 +63,6 @@ class RoleRolesResource(Resource):
                                  'total': paginate.total}
                          , code=0)
 
-    @authorize("admin:role:remove", log=True)
-    @login_required
     def delete(self):
         parser = reqparse.RequestParser()
         parser.add_argument('ids[]', action='append', dest='ids')
@@ -80,7 +75,6 @@ class RoleRolesResource(Resource):
 
 class RoleRoleResource(Resource):
 
-    @authorize("admin:role:add", log=True)
     def post(self, role_id):
         parser = reqparse.RequestParser()
         parser.add_argument('details', type=str)
@@ -103,7 +97,6 @@ class RoleRoleResource(Resource):
         return success_api(message="成功")
 
     # 更新角色
-    @authorize("admin:role:edit", log=True)
     def put(self, role_id):
         parser = reqparse.RequestParser()
         parser.add_argument('roleId', dest='role_id', type=int)
@@ -133,7 +126,6 @@ class RoleRoleResource(Resource):
 class RoleEnableResource(Resource):
     """启用用户"""
 
-    @authorize("admin:role:edit", log=True)
     def put(self, role_id):
         ret = RightsRole.query.get(role_id)
         ret.enable = not ret.enable
@@ -147,7 +139,6 @@ class RoleEnableResource(Resource):
 
 class RolePowerResource(Resource):
 
-    @authorize("admin:role:main", log=True)
     def get(self, role_id):
         # 获取角色权限
         role = RightsRole.query.filter_by(id=role_id).first()
@@ -166,7 +157,6 @@ class RolePowerResource(Resource):
         }
 
     # 保存角色权限
-    @authorize("admin:role:edit", log=True)
     def put(self, role_id):
         parser = reqparse.RequestParser()
         parser.add_argument('powerIds', dest='power_ids')
@@ -190,7 +180,6 @@ class RolePowerResource(Resource):
         return success_api(message="授权成功")
 
     # 角色删除
-    @authorize("admin:role:remove", log=True)
     def delete(self, role_id):
         print(role_id)
         res = remove_role(role_id)