wip(semantic):数据æapi接口改为集中式

applications/api/users/__init__.py

@@ -1,7 +1,16 @@
 from flask_restful import Api
 
-from applications.api import api_bp
+from .profile import UserStatus, UserAvatar, UserInfo, UserPassword
+from .user import UserUsers, UserUser, UserRole
 
-users_api = Api(api_bp, prefix='/users')
 
-from . import user, profile
+def register_users_api(api_bp):
+    users_api = Api(api_bp, prefix='/users')
+
+    users_api.add_resource(UserInfo, '/user/<int:user_id>/info')
+    users_api.add_resource(UserStatus, '/user/<int:user_id>/status')
+    users_api.add_resource(UserAvatar, '/user/<int:user_id>/avatar')
+    users_api.add_resource(UserPassword, '/user/<int:user_id>/password')
+    users_api.add_resource(UserUsers, '/users')
+    users_api.add_resource(UserUser, '/user/<int:user_id>')
+    users_api.add_resource(UserRole, '/user/<int:user_id>/role')

applications/api/users/profile.py

@@ -1,16 +1,13 @@
 # 个人中心
 from flask import request, jsonify
-from flask_login import login_required, current_user
+from flask_login import login_required
 from flask_restful import Resource, reqparse
 
 from applications.common.utils.http import fail_api, success_api
 from applications.extensions import db
 from applications.models import CompanyUser
 
-from . import users_api
 
-
-@users_api.resource('/user/<int:user_id>/status')
 class UserStatus(Resource):
     def put(self, user_id):
         # 启用或者禁用用户 enable disable
@@ -35,7 +32,6 @@ class UserStatus(Resource):
         return message
 
 
-@users_api.resource('/user/<int:user_id>/avatar')
 class UserAvatar(Resource):
     """修改头像"""
 
@@ -49,7 +45,6 @@ class UserAvatar(Resource):
         return success_api(msg="修改成功")
 
 
-@users_api.resource('/user/<int:user_id>/info')
 class UserInfo(Resource):
 
     @login_required
@@ -72,7 +67,6 @@ class UserInfo(Resource):
         return success_api(msg="更新成功")
 
 
-@users_api.resource('/user/<int:user_id>/password')
 class UserPassword(Resource):
     """前用户密码"""
 

applications/api/users/user.py

@@ -1,15 +1,13 @@
 from flask import request
-
-from flask_restful import Resource, reqparse
 from flask_login import current_user
+from flask_restful import Resource, reqparse
 from sqlalchemy import desc
 
-from applications.extensions import db
 from applications.common.utils.http import fail_api, success_api, table_api
 from applications.common.utils.rights import authorize
-from applications.models import CompanyUser, RightsRole, CompanyDepartment
+from applications.extensions import db
 from applications.models import AdminLog
-from . import users_api
+from applications.models import CompanyUser, RightsRole, CompanyDepartment
 
 
 def get_current_user_logs():
@@ -59,7 +57,6 @@ def update_user_role(_id, roles_list):
     db.session.commit()
 
 
-@users_api.resource('/users')
 class UserUsers(Resource):
     """用户列表数据操作"""
 
@@ -140,7 +137,6 @@ class UserUsers(Resource):
         return success_api(msg="批量删除成功")
 
 
-@users_api.resource('/user/<int:user_id>')
 class UserUser(Resource):
     """修改用户数据"""
 
@@ -185,7 +181,6 @@ class UserUser(Resource):
         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):
@@ -201,8 +196,8 @@ class UserRole(Resource):
 
         # 更新用户数据
         CompanyUser.query.filter_by(id=user_id).update({'username': res.username,
-                                                 'realname': res.real_name,
-                                                 'dept_id': res.dept_id})
+                                                        'realname': res.real_name,
+                                                        'dept_id': res.dept_id})
         db.session.commit()
 
         update_user_role(user_id, role_ids)