kris/ForcePilot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: 修复删除用户异常的问题

Browse Source
This commit is contained in:
Wenjie Zhang 2025-10-11 00:43:30 +08:00
parent af7355ce8b
commit d7e0b229c6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/routers/auth_router.py
View File

@ -7,7 +7,7 @@ from pydantic import BaseModel
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from src.storage.db.manager import db_manager from src.storage.db.manager import db_manager
from src.storage.db.models import User from src.storage.db.models import User, OperationLog
from server.utils.auth_middleware import get_admin_user, get_current_user, get_db, get_required_user from server.utils.auth_middleware import get_admin_user, get_current_user, get_db, get_required_user
from server.utils.auth_utils import AuthUtils from server.utils.auth_utils import AuthUtils
from server.utils.user_utils import generate_unique_user_id, validate_username, is_valid_phone_number from server.utils.user_utils import generate_unique_user_id, validate_username, is_valid_phone_number
@ -503,15 +503,18 @@ async def delete_user(
detail="不能删除自己的账户", detail="不能删除自己的账户",
) )
# 记录操作 deletion_detail = f"删除用户: {user.username}, ID: {user.id}, 角色: {user.role}"
log_operation(
db, current_user.id, "删除用户", f"删除用户: {user.username}, ID: {user.id}, 角色: {user.role}", request # 清理关联的操作日志，避免外键约束报错
) db.query(OperationLog).filter(OperationLog.user_id == user.id).delete(synchronize_session=False)
# 删除用户 # 删除用户
db.delete(user) db.delete(user)
db.commit() db.commit()
# 记录操作
log_operation(db, current_user.id, "删除用户", deletion_detail, request)
return {"success": True, "message": "用户已删除"} return {"success": True, "message": "用户已删除"}

2
src/storage/db/models.py
View File

@ -176,7 +176,7 @@ class User(Base):
login_locked_until = Column(DateTime, nullable=True) # 锁定到什么时候 login_locked_until = Column(DateTime, nullable=True) # 锁定到什么时候
# 关联操作日志 # 关联操作日志
operation_logs = relationship("OperationLog", back_populates="user") operation_logs = relationship("OperationLog", back_populates="user", cascade="all, delete-orphan")
def to_dict(self, include_password=False): def to_dict(self, include_password=False):
result = { result = {