- 修复前端路由守卫:未登录时不显示提示,直接跳转登录页 - 修复API拦截器:401错误不显示提示,直接跳转 - 增强验证码显示:图片尺寸从120x40增加到200x80 - 增大验证码字体:从28号增加到48号 - 优化验证码字符:排除易混淆的0和1 - 减少干扰线:从5条减少到3条,添加背景色优化 - 增强登录API日志:添加详细的调试日志 - 增强验证码生成和验证日志 - 优化异常处理和错误追踪 影响文件: - src/router/index.ts - src/api/request.ts - app/services/auth_service.py - app/api/v1/auth.py - app/schemas/user.py 测试状态: - 前端构建通过 - 后端语法检查通过 - 验证码显示效果优化完成 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
132 lines
5.6 KiB
Python
132 lines
5.6 KiB
Python
"""
|
|
用户相关数据模型
|
|
"""
|
|
from datetime import datetime
|
|
from sqlalchemy import Column, BigInteger, String, Boolean, DateTime, Integer, ForeignKey, Text, Index
|
|
from sqlalchemy.orm import relationship
|
|
from app.db.base import Base
|
|
|
|
|
|
class User(Base):
|
|
"""用户表"""
|
|
|
|
__tablename__ = "users"
|
|
|
|
id = Column(BigInteger, primary_key=True, index=True)
|
|
username = Column(String(50), unique=True, nullable=False, index=True)
|
|
password_hash = Column(String(255), nullable=False, comment="bcrypt哈希")
|
|
real_name = Column(String(100), nullable=False)
|
|
email = Column(String(255), unique=True, nullable=True)
|
|
phone = Column(String(20), nullable=True)
|
|
avatar_url = Column(String(500), nullable=True)
|
|
status = Column(String(20), default="active", nullable=False, comment="active, disabled, locked")
|
|
is_admin = Column(Boolean, default=False, nullable=False)
|
|
last_login_at = Column(DateTime, nullable=True)
|
|
login_fail_count = Column(Integer, default=0, nullable=False)
|
|
locked_until = Column(DateTime, nullable=True)
|
|
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
|
|
created_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
updated_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
deleted_at = Column(DateTime, nullable=True)
|
|
deleted_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
|
|
# 关系
|
|
created_by_user = relationship("User", remote_side=[id], foreign_keys=[created_by])
|
|
updated_by_user = relationship("User", remote_side=[id], foreign_keys=[updated_by])
|
|
deleted_by_user = relationship("User", remote_side=[id], foreign_keys=[deleted_by])
|
|
|
|
def __repr__(self):
|
|
return f"<User(id={self.id}, username={self.username}, real_name={self.real_name})>"
|
|
|
|
|
|
class Role(Base):
|
|
"""角色表"""
|
|
|
|
__tablename__ = "roles"
|
|
|
|
id = Column(BigInteger, primary_key=True, index=True)
|
|
role_name = Column(String(50), unique=True, nullable=False)
|
|
role_code = Column(String(50), unique=True, nullable=False)
|
|
description = Column(Text, nullable=True)
|
|
status = Column(String(20), default="active", nullable=False, comment="active, disabled")
|
|
sort_order = Column(Integer, default=0, nullable=False)
|
|
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
|
|
created_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
updated_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
deleted_at = Column(DateTime, nullable=True)
|
|
deleted_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
|
|
# 关系
|
|
created_user = relationship("User", foreign_keys=[created_by])
|
|
updated_user = relationship("User", foreign_keys=[updated_by])
|
|
deleted_user = relationship("User", foreign_keys=[deleted_by])
|
|
|
|
def __repr__(self):
|
|
return f"<Role(id={self.id}, role_code={self.role_code}, role_name={self.role_name})>"
|
|
|
|
|
|
class UserRole(Base):
|
|
"""用户角色关联表"""
|
|
|
|
__tablename__ = "user_roles"
|
|
|
|
id = Column(BigInteger, primary_key=True, index=True)
|
|
user_id = Column(BigInteger, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
|
|
role_id = Column(BigInteger, ForeignKey("roles.id", ondelete="CASCADE"), nullable=False)
|
|
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
|
created_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
|
|
# 关系
|
|
user = relationship("User", foreign_keys=[user_id])
|
|
role = relationship("Role", foreign_keys=[role_id])
|
|
created_user = relationship("User", foreign_keys=[created_by])
|
|
|
|
# 索引
|
|
__table_args__ = (
|
|
Index("idx_user_roles_user", "user_id"),
|
|
Index("idx_user_roles_role", "role_id"),
|
|
)
|
|
|
|
|
|
class Permission(Base):
|
|
"""权限表"""
|
|
|
|
__tablename__ = "permissions"
|
|
|
|
id = Column(BigInteger, primary_key=True, index=True)
|
|
permission_name = Column(String(100), unique=True, nullable=False)
|
|
permission_code = Column(String(100), unique=True, nullable=False)
|
|
module = Column(String(50), nullable=False, comment="模块: asset, device_type, org, user, system")
|
|
resource = Column(String(50), nullable=True, comment="资源: asset, device_type, organization")
|
|
action = Column(String(50), nullable=True, comment="操作: create, read, update, delete, export, import")
|
|
description = Column(Text, nullable=True)
|
|
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
|
|
|
def __repr__(self):
|
|
return f"<Permission(id={self.id}, permission_code={self.permission_code}, permission_name={self.permission_name})>"
|
|
|
|
|
|
class RolePermission(Base):
|
|
"""角色权限关联表"""
|
|
|
|
__tablename__ = "role_permissions"
|
|
|
|
id = Column(BigInteger, primary_key=True, index=True)
|
|
role_id = Column(BigInteger, ForeignKey("roles.id", ondelete="CASCADE"), nullable=False)
|
|
permission_id = Column(BigInteger, ForeignKey("permissions.id", ondelete="CASCADE"), nullable=False)
|
|
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
|
created_by = Column(BigInteger, ForeignKey("users.id"), nullable=True)
|
|
|
|
# 关系
|
|
role = relationship("Role", foreign_keys=[role_id])
|
|
permission = relationship("Permission", foreign_keys=[permission_id])
|
|
created_user = relationship("User", foreign_keys=[created_by])
|
|
|
|
# 索引
|
|
__table_args__ = (
|
|
Index("idx_role_permissions_role", "role_id"),
|
|
Index("idx_role_permissions_permission", "permission_id"),
|
|
)
|