refactor(rest-api):角色与用户数据

applications/api/users/profile.py

@@ -10,45 +10,74 @@ from applications.models import User
 from . import users_api
 
 
-@users_api.resource('/avatar')
-class Avatar(Resource):
+@users_api.resource('/user/<int:user_id>/status')
+class UserStatus(Resource):
+    def put(self, user_id):
+        # 启用或者禁用用户 enable disable
+
+        parser = reqparse.RequestParser()
+        parser.add_argument('userId', type=int, required=True, dest='user_id')
+        parser.add_argument('operate', type=int, required=True, dest='operate', choices=[0, 1])
+
+        res = parser.parse_args()
+
+        if res.operate == 1:
+            user = User.query.get(user_id)
+            user.enable = res.operate
+            message = success_api(msg="启动成功")
+        else:
+            user = User.query.filter_by(id=res.user_id).update({"enable": res.operate})
+            message = success_api(msg="禁用成功")
+        if user:
+            db.session.commit()
+        else:
+            return fail_api(msg="出错啦")
+        return message
+
+
+@users_api.resource('/user/<int:user_id>/avatar')
+class UserAvatar(Resource):
     """修改头像"""
 
-    def put(self):
+    def put(self, user_id):
         url = request.json.get("avatar").get("src")
-        ret = User.query.filter_by(id=current_user.id).update({"avatar": url})
+        ret = User.query.get(user_id)
+        ret.avatar = url
         db.session.commit()
         if not ret:
             return fail_api(msg="出错啦")
         return success_api(msg="修改成功")
 
 
-@users_api.resource('/updateInfo')
-class ProfileInfo(Resource):
+@users_api.resource('/user/<int:user_id>/info')
+class UserInfo(Resource):
 
     @login_required
-    def put(self):
+    def put(self, user_id):
         parser = reqparse.RequestParser()
-        parser.add_argument('realname', type=str, dest='real_name')
+        parser.add_argument('realName', type=str, dest='real_name')
+        parser.add_argument('username', type=str)
         parser.add_argument('remark', type=str)
         parser.add_argument('details', type=str)
 
         res = parser.parse_args()
 
-        ret = User.query.filter_by(
-            id=current_user.id).update({"realname": res.real_name,
-                                        "remark": res.details})
+        ret = User.query.get(user_id)
+        ret.username = res.username
+        ret.realname = res.real_name
+        ret.remark = res.details
+        db.session.commit()
         if not ret:
             return fail_api(msg="出错啦")
         return success_api(msg="更新成功")
 
 
-@users_api.resource('/editPassword')
-class EditPassword(Resource):
+@users_api.resource('/user/<int:user_id>/password')
+class UserPassword(Resource):
     """前用户密码"""
 
     @login_required
-    def put(self):
+    def put(self, user_id):
         parser = reqparse.RequestParser()
         parser.add_argument('oldPassword', type=str, required=True, help='旧密码不得为空')
         parser.add_argument('newPassword', type=str, required=True, help='新密码不得为空')
@@ -60,11 +89,12 @@ class EditPassword(Resource):
             return fail_api(msg='确认密码不一致')
 
         """ 修改当前用户密码 """
-        is_right = current_user.validate_password(res.oldPassword)
+        user = User.query.get(user_id)
+        is_right = user.validate_password(res.oldPassword)
         if not is_right:
             return jsonify(success=False, msg="旧密码错误")
-        current_user.set_password(res.newPassword)
-        db.session.add(current_user)
+        user.set_password(res.newPassword)
+        db.session.add(user)
         db.session.commit()
 
         return jsonify(success=True, msg="更改成功")

applications/api/users/user.py

@@ -59,131 +59,10 @@ def update_user_role(_id, roles_list):
     db.session.commit()
 
 
-@users_api.resource('/add')
-class Users(Resource):
+@users_api.resource('/users')
+class UserUsers(Resource):
     """用户列表数据操作"""
 
-    # @authorize("admin:user:add", log=True)
-    # def get(self):
-    #     roles = Role.query.all()
-    #     return make_response(render_template('users/add.html', roles=roles))
-
-    @authorize("admin:user:add", log=True)
-    def post(self):
-        """新建单个用户"""
-        parser = reqparse.RequestParser()
-        parser.add_argument("roleIds", type=str, dest='role_ids')
-        parser.add_argument("username", type=str, required=True, help="用户名不能为空")
-        parser.add_argument("realName", type=str, required=True, help="真实姓名不能为空", dest='real_name')
-        parser.add_argument("password", type=str, required=True, help="密码不得为空")
-
-        res = parser.parse_args()
-
-        role_ids = res.role_ids.split(',')
-
-        if is_user_exists(res.username):
-            return fail_api(msg="用户已经存在")
-
-        user = User()
-        user.username = res.username
-        user.realname = res.real_name
-        user.set_password(res.password)
-        db.session.add(user)
-        db.session.commit()
-
-        """ 增加用户角色 """
-        user = User.query.filter_by(id=user.id).first()
-        roles = Role.query.filter(Role.id.in_(role_ids)).all()
-        for r in roles:
-            user.role.append(r)
-        db.session.commit()
-
-        return success_api(msg="增加成功", code=0)
-
-
-@users_api.resource('/<user_id>')
-class CURDUser(Resource):
-    """修改用户数据"""
-
-    # @authorize("admin:user:edit", log=True)
-    # def get(self, user_id):
-    #     #  获取编辑用户信息
-    #     user = User.query.filter_by(id=user_id).first()
-    #     roles = Role.query.all()
-    #     checked_roles = []
-    #     for r in user.role:
-    #         checked_roles.append(r.id)
-    #     return make_response(
-    #         render_template('users/edit_users.html', user=user, roles=roles, checked_roles=checked_roles))
-
-    @authorize("admin:user:remove", log=True)
-    def delete(self, user_id):
-        # 删除用户
-        res = delete_by_id(user_id)
-        if not res:
-            return fail_api(msg="删除失败")
-        return success_api(msg="删除成功")
-
-    @authorize("admin:user:edit", log=True)
-    def put(self, user_id):
-        parser = reqparse.RequestParser()
-        parser.add_argument('roleIds', type=str, dest='role_ids')
-        parser.add_argument('userId', type=str, dest='user_id')
-        parser.add_argument('username', type=str)
-        parser.add_argument('realName', type=str, dest='real_name')
-        parser.add_argument('deptId', type=str, dest='dept_id')
-
-        res = parser.parse_args()
-        role_ids = res.role_ids.split(',')
-
-        # 更新用户数据
-        User.query.filter_by(id=user_id).update({'username': res.username,
-                                                 'realname': res.real_name,
-                                                 'dept_id': res.dept_id})
-        db.session.commit()
-
-        update_user_role(user_id, role_ids)
-
-        return success_api(msg="更新成功")
-
-
-@users_api.resource('/batchRemove')
-class UserBatchRemove(Resource):
-    """批量删除"""
-
-    @authorize("admin:user:remove", log=True)
-    def delete(self):
-        ids = request.form.getlist('ids[]')
-        batch_remove(ids)
-        return success_api(msg="批量删除成功")
-
-
-@users_api.resource('/enable')
-class UserEnable(Resource):
-    def put(self):
-        # 启用或者禁用用户 enable disable
-
-        parser = reqparse.RequestParser()
-        parser.add_argument('userId', type=int, required=True, dest='user_id')
-        parser.add_argument('operate', type=int, required=True, dest='operate', choices=[0, 1])
-
-        res = parser.parse_args()
-
-        if res.operate == 1:
-            user = User.query.filter_by(id=res.user_id).update({"enable": res.operate})
-            message = success_api(msg="启动成功")
-        else:
-            user = User.query.filter_by(id=res.user_id).update({"enable": res.operate})
-            message = success_api(msg="禁用成功")
-        if user:
-            db.session.commit()
-        else:
-            return fail_api(msg="出错啦")
-        return message
-
-
-@users_api.resource('/data')
-class UsersData(Resource):
     @authorize("admin:user:main", log=True)
     def get(self):
         parser = reqparse.RequestParser()
@@ -220,3 +99,112 @@ class UsersData(Resource):
         } for item in paginate.items]
 
         return table_api(data=user_data, count=paginate.total, code=0)
+
+    @authorize("admin:user:add", log=True)
+    def post(self):
+        """新建单个用户"""
+        parser = reqparse.RequestParser()
+        parser.add_argument("roleIds", type=str, dest='role_ids')
+        parser.add_argument("username", type=str, required=True, help="用户名不能为空")
+        parser.add_argument("realName", type=str, required=True, help="真实姓名不能为空", dest='real_name')
+        parser.add_argument("password", type=str, required=True, help="密码不得为空")
+
+        res = parser.parse_args()
+
+        role_ids = res.role_ids.split(',')
+
+        if is_user_exists(res.username):
+            return fail_api(msg="用户已经存在")
+
+        user = User()
+        user.username = res.username
+        user.realname = res.real_name
+        user.set_password(res.password)
+        db.session.add(user)
+        db.session.commit()
+
+        """ 增加用户角色 """
+        user = User.query.filter_by(id=user.id).first()
+        roles = Role.query.filter(Role.id.in_(role_ids)).all()
+        for r in roles:
+            user.role.append(r)
+        db.session.commit()
+
+        return success_api(msg="增加成功", code=0)
+
+    @authorize("admin:user:remove", log=True)
+    def delete(self):
+        """批量删除"""
+        ids = request.form.getlist('ids[]')
+        batch_remove(ids)
+        return success_api(msg="批量删除成功")
+
+
+@users_api.resource('/user/<int:user_id>')
+class UserUser(Resource):
+    """修改用户数据"""
+
+    @authorize("admin:user:add", log=True)
+    def post(self, user_id):
+        """新建单个用户"""
+        parser = reqparse.RequestParser()
+        parser.add_argument("roleIds", type=str, dest='role_ids')
+        parser.add_argument("username", type=str, required=True, help="用户名不能为空")
+        parser.add_argument("realName", type=str, required=True, help="真实姓名不能为空", dest='real_name')
+        parser.add_argument("password", type=str, required=True, help="密码不得为空")
+
+        res = parser.parse_args()
+
+        role_ids = res.role_ids.split(',')
+
+        if is_user_exists(res.username):
+            return fail_api(msg="用户已经存在")
+
+        user = User()
+        user.username = res.username
+        user.realname = res.real_name
+        user.set_password(res.password)
+        db.session.add(user)
+        db.session.commit()
+
+        """ 增加用户角色 """
+        user = User.query.filter_by(id=user.id).first()
+        roles = Role.query.filter(Role.id.in_(role_ids)).all()
+        for r in roles:
+            user.role.append(r)
+        db.session.commit()
+
+        return success_api(msg="增加成功", code=0)
+
+    @authorize("admin:user:remove", log=True)
+    def delete(self, user_id):
+        # 删除用户
+        res = delete_by_id(user_id)
+        if not res:
+            return fail_api(msg="删除失败")
+        return success_api(msg="删除成功")
+
+
+@users_api.resource('/user/<int:user_id>/role')
+class UserRole(Resource):
+    @authorize("admin:user:edit", log=True)
+    def put(self, user_id):
+        parser = reqparse.RequestParser()
+        parser.add_argument('roleIds', type=str, dest='role_ids')
+        parser.add_argument('userId', type=str, dest='user_id')
+        parser.add_argument('username', type=str)
+        parser.add_argument('realName', type=str, dest='real_name')
+        parser.add_argument('deptId', type=str, dest='dept_id')
+
+        res = parser.parse_args()
+        role_ids = res.role_ids.split(',')
+
+        # 更新用户数据
+        User.query.filter_by(id=user_id).update({'username': res.username,
+                                                 'realname': res.real_name,
+                                                 'dept_id': res.dept_id})
+        db.session.commit()
+
+        update_user_role(user_id, role_ids)
+
+        return success_api(msg="更新成功")