|
|
@ -33,7 +33,10 @@ def user_login():
|
|
|
|
def user_update_password():
|
|
|
|
def user_update_password():
|
|
|
|
old_password = request.values.get("old_password")
|
|
|
|
old_password = request.values.get("old_password")
|
|
|
|
new_password = request.values.get("new_password")
|
|
|
|
new_password = request.values.get("new_password")
|
|
|
|
|
|
|
|
new_password1 = request.values.get("new_password1")
|
|
|
|
# user_id = g.current_user.use
|
|
|
|
# user_id = g.current_user.use
|
|
|
|
|
|
|
|
if new_password != new_password1:
|
|
|
|
|
|
|
|
return jsonify(Utils.false_return(msg="两次密码不一致"))
|
|
|
|
msg_bool, msg_token = BllUser().update_password(g.current_user, old_password=old_password, new_password=new_password)
|
|
|
|
msg_bool, msg_token = BllUser().update_password(g.current_user, old_password=old_password, new_password=new_password)
|
|
|
|
if msg_bool:
|
|
|
|
if msg_bool:
|
|
|
|
return jsonify(Utils.true_return(data={"token": msg_token}))
|
|
|
|
return jsonify(Utils.true_return(data={"token": msg_token}))
|
|
|
@ -90,6 +93,18 @@ def add_user_info():
|
|
|
|
except Exception as error:
|
|
|
|
except Exception as error:
|
|
|
|
return jsonify(Utils.except_return(msg=error))
|
|
|
|
return jsonify(Utils.except_return(msg=error))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 个人资料
|
|
|
|
|
|
|
|
@user_router.route("/getinfo", methods=["GET", "POST"])
|
|
|
|
|
|
|
|
@token_auth.login_required
|
|
|
|
|
|
|
|
def get_user_info():
|
|
|
|
|
|
|
|
data = Utils.to_dict(g.current_user)
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
data.pop("password")
|
|
|
|
|
|
|
|
data.pop("role_id")
|
|
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
return jsonify(Utils.true_return(data=data))
|
|
|
|
|
|
|
|
|
|
|
|
# 修改用户
|
|
|
|
# 修改用户
|
|
|
|
@user_router.route("/update", methods=["GET", "POST"])
|
|
|
|
@user_router.route("/update", methods=["GET", "POST"])
|
|
|
|
@token_auth.login_required
|
|
|
|
@token_auth.login_required
|
|
|
|