mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-25 13:51:04 +00:00
zhangtao
60e6452255
refactor(前端): 统一表单搜索组件样式和布局 style: 优化表格和卡片样式，调整高度和间距 fix(上传): 修复文件上传组件name属性缺失问题 perf(IP定位): 优化IP定位逻辑，增加内网IP判断和重试机制 docs: 更新密码修改成功后的提示信息 chore: 清理无用代码和注释 ``` 这个提交消息包含了多个方面的改进： 1. 新增功能(feat)：为用户表添加了avatar字段 2. 重构(refactor)：统一了前端表单搜索组件的样式和布局 3. 样式优化(style)：调整了表格和卡片的样式 4. 问题修复(fix)：修复了文件上传组件name属性缺失的问题 5. 性能优化(perf)：改进了IP定位服务的逻辑 6. 文档更新(docs)：修改了密码修改成功后的提示信息 7. 杂项(chore)：清理了无用的代码和注释 消息遵循了提交规范，每个部分都简明扼要地描述了变更内容。
120 lines
3.8 KiB
Python
120 lines
3.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from datetime import datetime
|
|
from sqlalchemy import Boolean, Column, String, Integer, DateTime, ForeignKey, Text
|
|
from sqlalchemy.orm import relationship
|
|
from typing import Optional, List
|
|
|
|
from app.core.base_model import ModelBase
|
|
|
|
|
|
class UserRolesModel(ModelBase):
|
|
"""
|
|
用户角色关联表
|
|
"""
|
|
__tablename__ = "system_user_roles"
|
|
__table_args__ = ({'comment': '用户角色关联表'})
|
|
|
|
user_id = Column(
|
|
Integer,
|
|
ForeignKey("system_users.id", ondelete="CASCADE", onupdate="CASCADE"),
|
|
primary_key=True,
|
|
comment="用户ID",
|
|
index=True
|
|
)
|
|
role_id = Column(
|
|
Integer,
|
|
ForeignKey("system_role.id", ondelete="CASCADE", onupdate="CASCADE"),
|
|
primary_key=True,
|
|
comment="角色ID",
|
|
index=True
|
|
)
|
|
|
|
class UserPositionsModel(ModelBase):
|
|
"""
|
|
用户岗位关联表
|
|
"""
|
|
__tablename__ = "system_user_positions"
|
|
__table_args__ = ({'comment': '用户岗位关联表'})
|
|
|
|
user_id = Column(
|
|
Integer,
|
|
ForeignKey("system_users.id", ondelete="CASCADE", onupdate="CASCADE"),
|
|
primary_key=True,
|
|
comment="用户ID",
|
|
index=True
|
|
)
|
|
position_id = Column(
|
|
Integer,
|
|
ForeignKey("system_position.id", ondelete="CASCADE", onupdate="CASCADE"),
|
|
primary_key=True,
|
|
comment="岗位ID",
|
|
index=True
|
|
)
|
|
|
|
class UserModel(ModelBase):
|
|
"""
|
|
用户表 - 存储系统用户基本信息
|
|
"""
|
|
__tablename__ = "system_users"
|
|
__table_args__ = ({'comment': '用户表'})
|
|
|
|
# 基础字段
|
|
id = Column(Integer, primary_key=True, autoincrement=True, comment='主键ID')
|
|
username = Column(String(150), nullable=False, unique=True, comment="用户名/登录账号")
|
|
password = Column(String(128), nullable=False, comment="密码")
|
|
name = Column(String(40), nullable=False, comment="姓名")
|
|
|
|
# 联系信息
|
|
mobile = Column(String(20), nullable=True, comment="手机号")
|
|
email = Column(String(255), nullable=True, comment="邮箱")
|
|
|
|
# 个人信息
|
|
gender = Column(String(20), default=2, nullable=True, comment="性别(0:男 1:女 2:未知)")
|
|
avatar = Column(String(255), nullable=True, comment="头像地址")
|
|
|
|
# 账号状态
|
|
available = Column(Boolean, default=True, nullable=False, comment="是否启用(True:启用 False:禁用)")
|
|
is_superuser = Column(Boolean, default=False, nullable=False, comment="是否为超级管理员")
|
|
last_login = Column(DateTime, nullable=True, comment="最后登录时间")
|
|
|
|
# 组织信息
|
|
dept_id = Column(
|
|
Integer,
|
|
ForeignKey('system_dept.id', ondelete="SET NULL", onupdate="CASCADE"),
|
|
nullable=True, index=True, comment="部门ID"
|
|
)
|
|
dept = relationship(
|
|
'DeptModel',
|
|
primaryjoin="UserModel.dept_id == DeptModel.id",
|
|
lazy="select",
|
|
uselist=False)
|
|
roles = relationship(
|
|
"RoleModel",
|
|
secondary=UserRolesModel.__tablename__,
|
|
lazy="joined",
|
|
uselist=True)
|
|
positions = relationship(
|
|
"PositionModel",
|
|
secondary=UserPositionsModel.__tablename__,
|
|
lazy="joined",
|
|
uselist=True)
|
|
|
|
# 审计字段
|
|
description = Column(Text, nullable=True, comment="备注说明")
|
|
created_at = Column(DateTime, default=datetime.now, comment='创建时间')
|
|
updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='更新时间')
|
|
creator_id = Column(
|
|
Integer,
|
|
ForeignKey("system_users.id", ondelete="SET NULL", onupdate="CASCADE"),
|
|
nullable=True,
|
|
index=True,
|
|
comment="创建人ID"
|
|
)
|
|
creator = relationship(
|
|
"UserModel",
|
|
remote_side=[id],
|
|
foreign_keys=[creator_id],
|
|
lazy="selectin",
|
|
uselist=False
|
|
) |