使用flask-restful实现数据校验与序列化3

applications/view/company/users/profile.py

@@ -1,18 +1,21 @@
 # 个人中心
-from flask import render_template, request, make_response
+from flask import render_template, request, make_response, jsonify
 from flask_login import login_required, current_user
-from flask_restful import Resource
+from flask_restful import Resource, reqparse
+from sqlalchemy import desc
+
 from applications.common.utils.http import fail_api, success_api
 from applications.extensions import db
-from applications.models import User
-from applications.view.company.users import users_bp, user_api, user_curd
+from applications.models import User, AdminLog
+from applications.view.company.users import users_bp, user_api
 
 
 @users_bp.get('/center')
 @login_required
 def center():
     user_info = current_user
-    user_logs = user_curd.get_current_user_logs()
+    user_logs = AdminLog.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
+        desc(AdminLog.create_time)).limit(10)
     return render_template('admin/user/profile.html', user_info=user_info, user_logs=user_logs)
 
 
@@ -36,8 +39,18 @@ class Avatar(Resource):
 @users_bp.put('/updateInfo')
 @login_required
 def update_info():
-    res_json = request.json
-    if not user_curd.update_current_user_info(req_json=res_json):
+
+    parser = reqparse.RequestParser()
+    parser.add_argument('realname', type=str, dest='real_name')
+    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})
+    if not ret:
         return fail_api(msg="出错啦")
     return success_api(msg="更新成功")
 
@@ -52,5 +65,22 @@ class EditPassword(Resource):
 
     @login_required
     def put(self):
-        res_json = request.json
-        return user_curd.edit_password(res_json=res_json)
+        parser = reqparse.RequestParser()
+        parser.add_argument('oldPassword', type=str, required=True, help='旧密码不得为空')
+        parser.add_argument('newPassword', type=str, required=True, help='新密码不得为空')
+        parser.add_argument('confirmPassword', type=str, required=True, help='确认密码不能为空')
+
+        res = parser.parse_args()
+
+        if res.newPassword != res.confirmPassword:
+            return fail_api(msg='确认密码不一致')
+
+        """ 修改当前用户密码 """
+        is_right = current_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)
+        db.session.commit()
+
+        return jsonify(success=True, msg="更改成功")