Skip to content

Commit dfbabc1

Browse files
wu-clanwu-clan
committed
Update the length style of the model columns
1 parent f4b1c43 commit dfbabc1

File tree

15 files changed

+70
-70
lines changed

15 files changed

+70
-70
lines changed

‎backend/app/admin/model/data_rule.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ class DataRule(Base):
1919
__tablename__ = 'sys_data_rule'
2020

2121
id: Mapped[id_key] = mapped_column(init=False)
22-
name: Mapped[str] = mapped_column(sa.String(500), unique=True, comment='名称')
23-
model: Mapped[str] = mapped_column(sa.String(50), comment='SQLA 模型名，对应 DATA_PERMISSION_MODELS 键名')
24-
column: Mapped[str] = mapped_column(sa.String(20), comment='模型字段名')
22+
name: Mapped[str] = mapped_column(sa.String(512), unique=True, comment='名称')
23+
model: Mapped[str] = mapped_column(sa.String(64), comment='SQLA 模型名，对应 DATA_PERMISSION_MODELS 键名')
24+
column: Mapped[str] = mapped_column(sa.String(32), comment='模型字段名')
2525
operator: Mapped[int] = mapped_column(comment='运算符（0：and、1：or）')
2626
expression: Mapped[int] = mapped_column(
2727
comment='表达式（0：==、1：!=、2：>、3：>=、4：<、5：<=、6：in、7：not_in）',
2828
)
29-
value: Mapped[str] = mapped_column(sa.String(255), comment='规则值')
29+
value: Mapped[str] = mapped_column(sa.String(256), comment='规则值')
3030

3131
# 数据范围规则多对多
3232
scopes: Mapped[list[DataScope]] = relationship(init=False, secondary=sys_data_scope_rule, back_populates='rules')

‎backend/app/admin/model/data_scope.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DataScope(Base):
1919
__tablename__ = 'sys_data_scope'
2020

2121
id: Mapped[id_key] = mapped_column(init=False)
22-
name: Mapped[str] = mapped_column(sa.String(50), unique=True, comment='名称')
22+
name: Mapped[str] = mapped_column(sa.String(64), unique=True, comment='名称')
2323
status: Mapped[int] = mapped_column(default=1, comment='状态（0停用 1正常）')
2424

2525
# 数据范围规则多对多

‎backend/app/admin/model/dept.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ class Dept(Base):
1818
__tablename__ = 'sys_dept'
1919

2020
id: Mapped[id_key] = mapped_column(init=False)
21-
name: Mapped[str] = mapped_column(sa.String(50), comment='部门名称')
21+
name: Mapped[str] = mapped_column(sa.String(64), comment='部门名称')
2222
sort: Mapped[int] = mapped_column(default=0, comment='排序')
23-
leader: Mapped[str | None] = mapped_column(sa.String(20), default=None, comment='负责人')
23+
leader: Mapped[str | None] = mapped_column(sa.String(32), default=None, comment='负责人')
2424
phone: Mapped[str | None] = mapped_column(sa.String(11), default=None, comment='手机')
25-
email: Mapped[str | None] = mapped_column(sa.String(50), default=None, comment='邮箱')
25+
email: Mapped[str | None] = mapped_column(sa.String(64), default=None, comment='邮箱')
2626
status: Mapped[int] = mapped_column(default=1, comment='部门状态(0停用 1正常)')
2727
del_flag: Mapped[bool] = mapped_column(default=False, comment='删除标志（0删除 1存在）')
2828

‎backend/app/admin/model/login_log.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ class LoginLog(DataClassBase):
1414
__tablename__ = 'sys_login_log'
1515

1616
id: Mapped[id_key] = mapped_column(init=False)
17-
user_uuid: Mapped[str] = mapped_column(sa.String(50), comment='用户UUID')
18-
username: Mapped[str] = mapped_column(sa.String(20), comment='用户名')
17+
user_uuid: Mapped[str] = mapped_column(sa.String(64), comment='用户UUID')
18+
username: Mapped[str] = mapped_column(sa.String(32), comment='用户名')
1919
status: Mapped[int] = mapped_column(insert_default=0, comment='登录状态(0失败 1成功)')
20-
ip: Mapped[str] = mapped_column(sa.String(50), comment='登录IP地址')
21-
country: Mapped[str | None] = mapped_column(sa.String(50), comment='国家')
22-
region: Mapped[str | None] = mapped_column(sa.String(50), comment='地区')
23-
city: Mapped[str | None] = mapped_column(sa.String(50), comment='城市')
24-
user_agent: Mapped[str] = mapped_column(sa.String(255), comment='请求头')
25-
os: Mapped[str | None] = mapped_column(sa.String(50), comment='操作系统')
26-
browser: Mapped[str | None] = mapped_column(sa.String(50), comment='浏览器')
27-
device: Mapped[str | None] = mapped_column(sa.String(50), comment='设备')
20+
ip: Mapped[str] = mapped_column(sa.String(64), comment='登录IP地址')
21+
country: Mapped[str | None] = mapped_column(sa.String(64), comment='国家')
22+
region: Mapped[str | None] = mapped_column(sa.String(64), comment='地区')
23+
city: Mapped[str | None] = mapped_column(sa.String(64), comment='城市')
24+
user_agent: Mapped[str] = mapped_column(sa.String(256), comment='请求头')
25+
os: Mapped[str | None] = mapped_column(sa.String(64), comment='操作系统')
26+
browser: Mapped[str | None] = mapped_column(sa.String(64), comment='浏览器')
27+
device: Mapped[str | None] = mapped_column(sa.String(64), comment='设备')
2828
msg: Mapped[str] = mapped_column(UniversalText, comment='提示消息')
2929
login_time: Mapped[datetime] = mapped_column(TimeZone, comment='登录时间')
3030
created_time: Mapped[datetime] = mapped_column(

‎backend/app/admin/model/menu.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ class Menu(Base):
1919
__tablename__ = 'sys_menu'
2020

2121
id: Mapped[id_key] = mapped_column(init=False)
22-
title: Mapped[str] = mapped_column(sa.String(50), comment='菜单标题')
23-
name: Mapped[str] = mapped_column(sa.String(50), comment='菜单名称')
22+
title: Mapped[str] = mapped_column(sa.String(64), comment='菜单标题')
23+
name: Mapped[str] = mapped_column(sa.String(64), comment='菜单名称')
2424
path: Mapped[str | None] = mapped_column(sa.String(200), comment='路由地址')
2525
sort: Mapped[int] = mapped_column(default=0, comment='排序')
26-
icon: Mapped[str | None] = mapped_column(sa.String(100), default=None, comment='菜单图标')
26+
icon: Mapped[str | None] = mapped_column(sa.String(128), default=None, comment='菜单图标')
2727
type: Mapped[int] = mapped_column(default=0, comment='菜单类型（0目录 1菜单 2按钮 3内嵌 4外链）')
28-
component: Mapped[str | None] = mapped_column(sa.String(255), default=None, comment='组件路径')
29-
perms: Mapped[str | None] = mapped_column(sa.String(100), default=None, comment='权限标识')
28+
component: Mapped[str | None] = mapped_column(sa.String(256), default=None, comment='组件路径')
29+
perms: Mapped[str | None] = mapped_column(sa.String(128), default=None, comment='权限标识')
3030
status: Mapped[int] = mapped_column(default=1, comment='菜单状态（0停用 1正常）')
3131
display: Mapped[int] = mapped_column(default=1, comment='是否显示（0否 1是）')
3232
cache: Mapped[int] = mapped_column(default=1, comment='是否缓存（0否 1是）')

‎backend/app/admin/model/opera_log.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ class OperaLog(DataClassBase):
1515

1616
id: Mapped[id_key] = mapped_column(init=False)
1717
trace_id: Mapped[str] = mapped_column(sa.String(32), comment='请求跟踪 ID')
18-
username: Mapped[str | None] = mapped_column(sa.String(20), comment='用户名')
19-
method: Mapped[str] = mapped_column(sa.String(20), comment='请求类型')
20-
title: Mapped[str] = mapped_column(sa.String(255), comment='操作模块')
21-
path: Mapped[str] = mapped_column(sa.String(500), comment='请求路径')
22-
ip: Mapped[str] = mapped_column(sa.String(50), comment='IP地址')
23-
country: Mapped[str | None] = mapped_column(sa.String(50), comment='国家')
24-
region: Mapped[str | None] = mapped_column(sa.String(50), comment='地区')
25-
city: Mapped[str | None] = mapped_column(sa.String(50), comment='城市')
26-
user_agent: Mapped[str] = mapped_column(sa.String(255), comment='请求头')
27-
os: Mapped[str | None] = mapped_column(sa.String(50), comment='操作系统')
28-
browser: Mapped[str | None] = mapped_column(sa.String(50), comment='浏览器')
29-
device: Mapped[str | None] = mapped_column(sa.String(50), comment='设备')
18+
username: Mapped[str | None] = mapped_column(sa.String(32), comment='用户名')
19+
method: Mapped[str] = mapped_column(sa.String(32), comment='请求类型')
20+
title: Mapped[str] = mapped_column(sa.String(256), comment='操作模块')
21+
path: Mapped[str] = mapped_column(sa.String(512), comment='请求路径')
22+
ip: Mapped[str] = mapped_column(sa.String(64), comment='IP地址')
23+
country: Mapped[str | None] = mapped_column(sa.String(64), comment='国家')
24+
region: Mapped[str | None] = mapped_column(sa.String(64), comment='地区')
25+
city: Mapped[str | None] = mapped_column(sa.String(64), comment='城市')
26+
user_agent: Mapped[str] = mapped_column(sa.String(512), comment='请求头')
27+
os: Mapped[str | None] = mapped_column(sa.String(64), comment='操作系统')
28+
browser: Mapped[str | None] = mapped_column(sa.String(64), comment='浏览器')
29+
device: Mapped[str | None] = mapped_column(sa.String(64), comment='设备')
3030
args: Mapped[str | None] = mapped_column(sa.JSON(), comment='请求参数')
3131
status: Mapped[int] = mapped_column(comment='操作状态（0异常 1正常）')
32-
code: Mapped[str] = mapped_column(sa.String(20), insert_default='200', comment='操作状态码')
32+
code: Mapped[str] = mapped_column(sa.String(32), insert_default='200', comment='操作状态码')
3333
msg: Mapped[str | None] = mapped_column(UniversalText, comment='提示消息')
3434
cost_time: Mapped[float] = mapped_column(insert_default=0.0, comment='请求耗时（ms）')
3535
opera_time: Mapped[datetime] = mapped_column(TimeZone, comment='操作时间')

‎backend/app/admin/model/role.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Role(Base):
1919
__tablename__ = 'sys_role'
2020

2121
id: Mapped[id_key] = mapped_column(init=False)
22-
name: Mapped[str] = mapped_column(sa.String(20), unique=True, comment='角色名称')
22+
name: Mapped[str] = mapped_column(sa.String(32), unique=True, comment='角色名称')
2323
status: Mapped[int] = mapped_column(default=1, comment='角色状态（0停用 1正常）')
2424
is_filter_scopes: Mapped[bool] = mapped_column(default=True, comment='过滤数据权限(0否 1是)')
2525
remark: Mapped[str | None] = mapped_column(UniversalText, default=None, comment='备注')

‎backend/app/admin/model/user.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ class User(Base):
2222
__tablename__ = 'sys_user'
2323

2424
id: Mapped[id_key] = mapped_column(init=False)
25-
uuid: Mapped[str] = mapped_column(sa.String(50), init=False, default_factory=uuid4_str, unique=True)
26-
username: Mapped[str] = mapped_column(sa.String(20), unique=True, index=True, comment='用户名')
27-
nickname: Mapped[str] = mapped_column(sa.String(20), comment='昵称')
28-
password: Mapped[str | None] = mapped_column(sa.String(255), comment='密码')
25+
uuid: Mapped[str] = mapped_column(sa.String(64), init=False, default_factory=uuid4_str, unique=True)
26+
username: Mapped[str] = mapped_column(sa.String(64), unique=True, index=True, comment='用户名')
27+
nickname: Mapped[str] = mapped_column(sa.String(64), comment='昵称')
28+
password: Mapped[str | None] = mapped_column(sa.String(256), comment='密码')
2929
salt: Mapped[bytes | None] = mapped_column(sa.LargeBinary(255), comment='加密盐')
30-
email: Mapped[str | None] = mapped_column(sa.String(255), default=None, unique=True, index=True, comment='邮箱')
30+
email: Mapped[str | None] = mapped_column(sa.String(256), default=None, unique=True, index=True, comment='邮箱')
3131
phone: Mapped[str | None] = mapped_column(sa.String(11), default=None, comment='手机号')
32-
avatar: Mapped[str | None] = mapped_column(sa.String(255), default=None, comment='头像')
32+
avatar: Mapped[str | None] = mapped_column(sa.String(256), default=None, comment='头像')
3333
status: Mapped[int] = mapped_column(default=1, index=True, comment='用户账号状态(0停用 1正常)')
3434
is_superuser: Mapped[bool] = mapped_column(default=False, comment='超级权限(0否 1是)')
3535
is_staff: Mapped[bool] = mapped_column(default=False, comment='后台管理登陆(0否 1是)')

‎backend/app/task/model/result.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Task(MappedBase):
2020

2121
id = sa.Column(sa.Integer, sa.Sequence('task_id_sequence'), primary_key=True, autoincrement=True)
2222
task_id = sa.Column(sa.String(155), unique=True)
23-
status = sa.Column(sa.String(50), default=states.PENDING)
23+
status = sa.Column(sa.String(64), default=states.PENDING)
2424
result = sa.Column(PickleType, nullable=True)
2525
date_done = sa.Column(
2626
sa.DateTime,

‎backend/app/task/model/scheduler.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ class TaskScheduler(Base):
2020
__tablename__ = 'task_scheduler'
2121

2222
id: Mapped[id_key] = mapped_column(init=False)
23-
name: Mapped[str] = mapped_column(sa.String(50), unique=True, comment='任务名称')
24-
task: Mapped[str] = mapped_column(sa.String(255), comment='要运行的 Celery 任务')
23+
name: Mapped[str] = mapped_column(sa.String(64), unique=True, comment='任务名称')
24+
task: Mapped[str] = mapped_column(sa.String(256), comment='要运行的 Celery 任务')
2525
args: Mapped[str | None] = mapped_column(sa.JSON(), comment='任务可接收的位置参数')
2626
kwargs: Mapped[str | None] = mapped_column(sa.JSON(), comment='任务可接收的关键字参数')
27-
queue: Mapped[str | None] = mapped_column(sa.String(255), comment='CELERY_TASK_QUEUES 中定义的队列')
28-
exchange: Mapped[str | None] = mapped_column(sa.String(255), comment='低级别 AMQP 路由的交换机')
29-
routing_key: Mapped[str | None] = mapped_column(sa.String(255), comment='低级别 AMQP 路由的路由密钥')
27+
queue: Mapped[str | None] = mapped_column(sa.String(256), comment='CELERY_TASK_QUEUES 中定义的队列')
28+
exchange: Mapped[str | None] = mapped_column(sa.String(256), comment='低级别 AMQP 路由的交换机')
29+
routing_key: Mapped[str | None] = mapped_column(sa.String(256), comment='低级别 AMQP 路由的路由密钥')
3030
start_time: Mapped[datetime | None] = mapped_column(TimeZone, comment='任务开始触发的时间')
3131
expire_time: Mapped[datetime | None] = mapped_column(TimeZone, comment='任务不再触发的截止时间')
3232
expire_seconds: Mapped[int | None] = mapped_column(comment='任务不再触发的秒数时间差')
3333
type: Mapped[int] = mapped_column(comment='调度类型（0间隔 1定时）')
3434
interval_every: Mapped[int | None] = mapped_column(comment='任务再次运行前的间隔周期数')
35-
interval_period: Mapped[str | None] = mapped_column(sa.String(255), comment='任务运行之间的周期类型')
36-
crontab: Mapped[str | None] = mapped_column(sa.String(50), default='* * * * *', comment='任务运行的 Crontab 计划')
35+
interval_period: Mapped[str | None] = mapped_column(sa.String(256), comment='任务运行之间的周期类型')
36+
crontab: Mapped[str | None] = mapped_column(sa.String(64), default='* * * * *', comment='任务运行的 Crontab 计划')
3737
one_off: Mapped[bool] = mapped_column(default=False, comment='是否仅运行一次')
3838
enabled: Mapped[bool] = mapped_column(default=True, comment='是否启用任务')
3939
total_run_count: Mapped[int] = mapped_column(default=0, comment='任务触发的总次数')

0 commit comments

Comments
 (0)