|
|
|
|
@ -54,7 +54,7 @@ def register():
|
|
|
|
|
username = data.get('username')
|
|
|
|
|
password = data.get('password')
|
|
|
|
|
email = data.get('email')
|
|
|
|
|
code = data.get('code')
|
|
|
|
|
# code = data.get('code')
|
|
|
|
|
# 验证输入
|
|
|
|
|
if not username or not password or not email:
|
|
|
|
|
return jsonify({'error': '用户名、密码和邮箱不能为空'}), 400
|
|
|
|
|
@ -73,8 +73,8 @@ def register():
|
|
|
|
|
return jsonify({'error': '该邮箱已被注册,同一邮箱只能注册一次'}), 400
|
|
|
|
|
|
|
|
|
|
# 验证验证码
|
|
|
|
|
if not code or not verify_code(email, code, purpose='register'):
|
|
|
|
|
return jsonify({'error': '验证码无效或已过期'}), 400
|
|
|
|
|
# if not code or not verify_code(email, code, purpose='register'):
|
|
|
|
|
# return jsonify({'error': '验证码无效或已过期'}), 400
|
|
|
|
|
|
|
|
|
|
# 创建用户(默认为普通用户,role_id=3)
|
|
|
|
|
user = User(username=username, email=email, role_id=3)
|
|
|
|
|
@ -168,7 +168,7 @@ def change_email(current_user_id):
|
|
|
|
|
user = User.query.filter_by(current_user_id)
|
|
|
|
|
data = request.get_json()
|
|
|
|
|
new_email = data.get('new_email')
|
|
|
|
|
code = data.get('code')
|
|
|
|
|
# code = data.get('code')
|
|
|
|
|
|
|
|
|
|
if not new_email:
|
|
|
|
|
return jsonify({'error': '新邮箱不能为空'}), 400
|
|
|
|
|
@ -176,8 +176,8 @@ def change_email(current_user_id):
|
|
|
|
|
if not User.query.filter(new_email).first():
|
|
|
|
|
return jsonify({'error':'该邮箱已被使用'}), 400
|
|
|
|
|
|
|
|
|
|
if not code or not verify_code(email, code, purpose='register'):
|
|
|
|
|
return jsonify({'error': '验证码无效或已过期'}), 400
|
|
|
|
|
# if not code or not verify_code(email, code, purpose='register'):
|
|
|
|
|
# return jsonify({'error': '验证码无效或已过期'}), 400
|
|
|
|
|
|
|
|
|
|
user.email = new_email
|
|
|
|
|
db.session.commit()
|
|
|
|
|
|