代码错误更改(Claude)

pull/12/head
杨博文 5 months ago
parent 2f6a565240
commit da522ccad7

@ -8,6 +8,7 @@ from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate
from flask_jwt_extended import JWTManager
from flask_cors import CORS
from flask_mail import Mail
from config.settings import Config
# 初始化扩展

@ -61,8 +61,9 @@ def get_user_detail(user_id):
total_tasks = Task.query.filter_by(user_id=user_id).count()
# 查找用户的所有图片
user_tasks = Task.query.filter_by(user_id=user_id).all()
task_ids = [task.task_id for task in user_tasks]
total_images = Image.query.filter_by(task_id in (task_ids)).count()
task_ids = [task.tasks_id for task in user_tasks]
total_images = Image.query.filter(Image.task_id.in_(task_ids)).count() if task_ids else 0
user_dict = user.to_dict()
user_dict['stats'] = {
@ -101,11 +102,15 @@ def create_user():
if email and User.query.filter_by(email=email).first():
return jsonify({'error': '邮箱已被使用'}), 400
# 角色映射
role_map = {'admin': 1, 'vip': 2, 'normal': 3, 'user': 3}
role_id = role_map.get(role_code, 3)
# 创建用户
user = User(
username=username,
email=email,
role_id=User.role_to_id(role),
role_id=role_id,
)
user.set_password(password)
@ -200,17 +205,25 @@ def delete_user(user_id):
def get_system_stats():
"""获取系统统计信息"""
try:
from app.database import EvaluationResult
from app.database import TaskStatus
total_users = User.query.count()
active_users = User.query.filter_by(is_active = True).count()
admin_users = User.query.filter_by(role_id = 0).count()
active_users = User.query.filter_by(is_active=True).count()
admin_users = User.query.filter_by(role_id=1).count()
total_tasks = Task.query.count()
completed_tasks = Task.query.filter_by(status='completed').count()
processing_tasks = Task.query.filter_by(status='processing').count()
failed_tasks = Task.query.filter_by(status='failed').count()
waiting_tasks = Task.query.filter_by(status='waiting').count()
# 通过 TaskStatus 表查询各状态的任务数
def count_tasks_by_status(status_code):
status = TaskStatus.query.filter_by(task_status_code=status_code).first()
if status:
return Task.query.filter_by(tasks_status_id=status.task_status_id).count()
return 0
completed_tasks = count_tasks_by_status('completed')
processing_tasks = count_tasks_by_status('processing')
failed_tasks = count_tasks_by_status('failed')
waiting_tasks = count_tasks_by_status('waiting')
total_images = Image.query.count()

@ -25,7 +25,7 @@ def int_jwt_required(f):
auth_bp = Blueprint('auth', __name__)
@auth_bp.route('/code', methods=['GET'])
def send_email_verification_code(email: str = "3310207578@qq.com", purpose: str = 'register'):
def send_email_verification_code(email: str = "3310207578@qq.com", purpose: str = 'register'):
email = "3310207578@qq.com"
send_verification_code(email, purpose=purpose)
return jsonify({'message': '验证码已发送'}), 200
@ -60,15 +60,15 @@ def register():
if not code or not verify_code(email, code, purpose='register'):
return jsonify({'error': '验证码无效或已过期'}), 400
# 创建用户
user = User(username=username, email=email)
# 创建用户默认为普通用户role_id=3
user = User(username=username, email=email, role_id=3)
user.set_password(password)
db.session.add(user)
db.session.commit()
# 创建用户默认配置
user_config = UserConfig(user_id=user.id)
user_config = UserConfig(user_id=user.user_id)
db.session.add(user_config)
db.session.commit()
@ -102,7 +102,7 @@ def login():
return jsonify({'error': '账户已被禁用'}), 401
# 创建访问令牌 - 确保用户ID为字符串类型
access_token = create_access_token(identity=str(user.id))
access_token = create_access_token(identity=str(user.user_id))
return jsonify({
'message': '登录成功',
@ -163,4 +163,4 @@ def get_profile(current_user_id):
@jwt_required()
def logout():
"""用户登出客户端删除token即可"""
return jsonify({'message': '登出成功'}), 200
return jsonify({'message': '登出成功'}), 200

Loading…
Cancel
Save