更新layui，新增个人信息修改

applications/service/admin/user.py

@@ -2,11 +2,11 @@ from flask import jsonify
 from flask_login import current_user
 from flask_marshmallow import Marshmallow
 from marshmallow import fields
-from sqlalchemy import and_
+from sqlalchemy import and_, desc
 from sqlalchemy.sql import exists
 
 from applications.models import db
-from applications.models.admin import User, Role
+from applications.models.admin import User, Role, AdminLog
 from sqlalchemy.orm.dynamic import AppenderQuery
 
 ma = Marshmallow()
@@ -22,12 +22,7 @@ class UserSchema(ma.Schema):
     update_at = fields.DateTime()
 
 
-'''
-获取用户的sqlalchemy对象
-分页器
-'''
-
-
+# 获取用户的sqlalchemy对象分页器
 def get_user_data(page, limit, filters):
     user = User.query.filter(and_(*[getattr(User, k).like(v) for k, v in filters.items()])).paginate(page=page,
                                                                                                      per_page=limit,
@@ -36,12 +31,7 @@ def get_user_data(page, limit, filters):
     return user, count
 
 
-'''
-获取用户的dict数据
-分页器
-'''
-
-
+# 获取用户的dict数据分页器
 def get_user_data_dict(page, limit, filters):
     user, count = get_user_data(page, limit, filters)
     user_schema = UserSchema(many=True)  # 用已继承ma.ModelSchema类的自定制类生成序列化类
@@ -49,15 +39,18 @@ def get_user_data_dict(page, limit, filters):
     return output, count
 
 
-'''
-通过名称获取用户
-'''
-
-
+# 通过名称获取用户
 def get_user_by_name(username):
     return User.query.filter_by(username=username).first()
 
 
+# 获取当前用户日志
+def get_current_user_logs():
+    log = AdminLog.query.filter_by(url='/admin/login').filter_by(uid=current_user.id).order_by(
+        desc(AdminLog.create_time)).limit(10)
+    return log
+
+
 # 判断用户是否存在
 def is_user_exists(username):
     res = User.query.filter_by(username=username).count()
@@ -82,6 +75,13 @@ def add_user_role(id, roles_list):
     db.session.commit()
 
 
+# 更新用户头像
+def update_avatar(url):
+    r = User.query.filter_by(id=current_user.id).update({"avatar": url})
+    db.session.commit()
+    return r
+
+
 # 更新用户信息
 def update_user(id, username, realname):
     user = User.query.filter_by(id=id).update({'username': username, 'realname': realname})
@@ -89,6 +89,31 @@ def update_user(id, username, realname):
     return user
 
 
+# 更新当前用户信息
+def update_current_user_info(req_json):
+    r = User.query.filter_by(id=current_user.id).update(
+        {"realname": req_json.get("realName"), "remark": req_json.get("details")})
+    db.session.commit()
+    return r
+
+
+# 修改当前用户密码
+def edit_password(res_json):
+    if res_json.get("newPassword") == '':
+        return jsonify(success=False, msg="新密码不得为空")
+    if res_json.get("newPassword") != res_json.get("confirmPassword"):
+        return jsonify(success=False, msg="俩次密码不一样")
+    user = current_user
+    is_right = user.validate_password(res_json.get("oldPassword"))
+    if not is_right:
+        return jsonify(success=False, msg="旧密码错误")
+    user.set_password(res_json.get("newPassword"))
+    db.session.add(user)
+    db.session.commit()
+    return jsonify(success=True, msg="更改成功")
+
+
+# 删除用户
 def delete_by_id(id):
     user = User.query.filter_by(id=id).first()
     roles_id = []
@@ -102,7 +127,7 @@ def delete_by_id(id):
     return res
 
 
-# 启动用户
+# 启用用户
 def enable_status(id):
     enable = 1
     user = User.query.filter_by(id=id).update({"enable": enable})