优化数据表结构
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
from . import response
|
||||
|
||||
from .user import User
|
||||
from .user_authn import UserAuthn
|
||||
|
||||
from .download import Download
|
||||
from .file import File
|
||||
|
||||
@@ -8,16 +8,17 @@ from loguru import logger as log
|
||||
async def migration() -> None:
|
||||
"""
|
||||
数据库迁移函数,初始化默认设置和用户组。
|
||||
|
||||
|
||||
:return: None
|
||||
"""
|
||||
|
||||
|
||||
log.info('开始进行数据库初始化...')
|
||||
|
||||
|
||||
await init_default_settings()
|
||||
await init_default_group()
|
||||
await init_default_policy()
|
||||
await init_default_user()
|
||||
|
||||
|
||||
log.info('数据库初始化结束')
|
||||
|
||||
default_settings: list[Setting] = [
|
||||
@@ -213,4 +214,31 @@ async def init_default_user() -> None:
|
||||
await admin_user.save(session)
|
||||
|
||||
log.info(f'初始管理员账号:[bold]admin[/bold]')
|
||||
log.info(f'初始管理员密码:[bold]{admin_password}[/bold]')
|
||||
log.info(f'初始管理员密码:[bold]{admin_password}[/bold]')
|
||||
|
||||
|
||||
async def init_default_policy() -> None:
|
||||
from .policy import Policy, PolicyType
|
||||
from .database import get_session
|
||||
|
||||
log.info('初始化默认存储策略...')
|
||||
|
||||
async for session in get_session():
|
||||
# 检查默认存储策略是否存在
|
||||
default_policy = await Policy.get(session, Policy.id == 1)
|
||||
|
||||
if not default_policy:
|
||||
local_policy = Policy(
|
||||
name="本地存储",
|
||||
type=PolicyType.LOCAL,
|
||||
server="./data",
|
||||
is_private=True,
|
||||
max_size=0,
|
||||
auto_rename=True,
|
||||
dir_name_rule="{date}/{randomkey16}",
|
||||
file_name_rule="{randomkey16}_{originname}",
|
||||
)
|
||||
|
||||
await local_policy.save(session)
|
||||
|
||||
log.info('已创建默认本地存储策略,存储目录:./data')
|
||||
@@ -2,28 +2,59 @@
|
||||
from typing import Optional, List, TYPE_CHECKING
|
||||
from sqlmodel import Field, Relationship, text
|
||||
from .base import TableBase
|
||||
from enum import StrEnum
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .file import File
|
||||
from .folder import Folder
|
||||
|
||||
class PolicyType(StrEnum):
|
||||
LOCAL = "local"
|
||||
S3 = "s3"
|
||||
|
||||
class Policy(TableBase, table=True):
|
||||
"""存储策略模型"""
|
||||
|
||||
name: str = Field(max_length=255, unique=True, description="策略名称")
|
||||
type: str = Field(max_length=255, description="存储类型 (e.g. 'local', 's3')")
|
||||
server: str | None = Field(default=None, max_length=255, description="服务器地址(本地策略为路径)")
|
||||
bucket_name: str | None = Field(default=None, max_length=255, description="存储桶名称")
|
||||
is_private: bool = Field(default=True, sa_column_kwargs={"server_default": text("true")}, description="是否为私有空间")
|
||||
base_url: str | None = Field(default=None, max_length=255, description="访问文件的基础URL")
|
||||
access_key: str | None = Field(default=None, description="Access Key")
|
||||
secret_key: str | None = Field(default=None, description="Secret Key")
|
||||
max_size: int = Field(default=0, sa_column_kwargs={"server_default": "0"}, description="允许上传的最大文件尺寸(字节)")
|
||||
auto_rename: bool = Field(default=False, sa_column_kwargs={"server_default": text("false")}, description="是否自动重命名")
|
||||
dir_name_rule: str | None = Field(default=None, max_length=255, description="目录命名规则")
|
||||
file_name_rule: str | None = Field(default=None, max_length=255, description="文件命名规则")
|
||||
is_origin_link_enable: bool = Field(default=False, sa_column_kwargs={"server_default": text("false")}, description="是否开启源链接访问")
|
||||
options: str | None = Field(default=None, description="其他选项 (JSON格式)")
|
||||
name: str = Field(max_length=255, unique=True)
|
||||
"""策略名称"""
|
||||
|
||||
type: PolicyType
|
||||
"""存储策略类型"""
|
||||
|
||||
server: str | None = Field(default=None, max_length=255)
|
||||
"""服务器地址(本地策略为绝对路径)"""
|
||||
|
||||
bucket_name: str | None = Field(default=None, max_length=255)
|
||||
"""存储桶名称"""
|
||||
|
||||
is_private: bool = Field(default=True, sa_column_kwargs={"server_default": text("true")})
|
||||
"""是否为私有空间"""
|
||||
|
||||
base_url: str | None = Field(default=None, max_length=255)
|
||||
"""访问文件的基础URL"""
|
||||
|
||||
access_key: str | None = Field(default=None)
|
||||
"""Access Key"""
|
||||
|
||||
secret_key: str | None = Field(default=None)
|
||||
"""Secret Key"""
|
||||
max_size: int = Field(default=0, sa_column_kwargs={"server_default": "0"})
|
||||
"""允许上传的最大文件尺寸(字节)"""
|
||||
|
||||
auto_rename: bool = Field(default=False, sa_column_kwargs={"server_default": text("false")})
|
||||
"""是否自动重命名"""
|
||||
|
||||
dir_name_rule: str | None = Field(default=None, max_length=255)
|
||||
"""目录命名规则"""
|
||||
|
||||
file_name_rule: str | None = Field(default=None, max_length=255)
|
||||
"""文件命名规则"""
|
||||
|
||||
is_origin_link_enable: bool = Field(default=False, sa_column_kwargs={"server_default": text("false")})
|
||||
"""是否开启源链接访问"""
|
||||
|
||||
options: str | None = Field(default=None)
|
||||
"""其他选项 (JSON格式)"""
|
||||
# options 示例: {"token":"","file_type":null,"mimetype":"","od_redirect":"http://127.0.0.1:8000/...","chunk_size":52428800,"s3_path_style":false}
|
||||
|
||||
# 关系
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
"""
|
||||
请求模型定义
|
||||
"""
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
from typing import Literal, Union, Optional
|
||||
from datetime import datetime, timezone
|
||||
from uuid import uuid4
|
||||
|
||||
class LoginRequest(BaseModel):
|
||||
"""
|
||||
登录请求模型
|
||||
"""
|
||||
username: str = Field(..., description="用户名或邮箱")
|
||||
password: str = Field(..., description="用户密码")
|
||||
captcha: str | None = Field(None, description="验证码")
|
||||
twoFaCode: str | None = Field(None, description="两步验证代码")
|
||||
@@ -16,6 +16,7 @@ if TYPE_CHECKING:
|
||||
from .storage_pack import StoragePack
|
||||
from .tag import Tag
|
||||
from .task import Task
|
||||
from .user_authn import UserAuthn
|
||||
from .webdav import WebDAV
|
||||
|
||||
"""
|
||||
@@ -27,6 +28,15 @@ Option 需求
|
||||
- 切换到不同存储策略是否提醒
|
||||
"""
|
||||
|
||||
class LoginRequest(BaseModel):
|
||||
"""
|
||||
登录请求模型
|
||||
"""
|
||||
username: str = Field(..., description="用户名或邮箱")
|
||||
password: str = Field(..., description="用户密码")
|
||||
captcha: str | None = Field(None, description="验证码")
|
||||
twoFaCode: str | None = Field(None, description="两步验证代码")
|
||||
|
||||
class WebAuthnInfo(BaseModel):
|
||||
"""WebAuthn 信息模型"""
|
||||
|
||||
@@ -75,8 +85,6 @@ class User(TableBase, table=True):
|
||||
options: str | None = Field(default=None)
|
||||
"""[TODO] 用户个人设置 需要更改,参考上方的需求"""
|
||||
|
||||
authn: str | None = Field(default=None)
|
||||
"""[TODO] WebAuthn 凭证,可不存,也可设置一个或多个"""
|
||||
|
||||
github_open_id: str | None = Field(default=None, unique=True, index=True)
|
||||
"""Github OpenID"""
|
||||
@@ -125,6 +133,7 @@ class User(TableBase, table=True):
|
||||
tags: list["Tag"] = Relationship(back_populates="user")
|
||||
tasks: list["Task"] = Relationship(back_populates="user")
|
||||
webdavs: list["WebDAV"] = Relationship(back_populates="user")
|
||||
authns: list["UserAuthn"] = Relationship(back_populates="user")
|
||||
|
||||
def to_public(self) -> "UserPublic":
|
||||
"""转换为公开 DTO,排除敏感字段"""
|
||||
|
||||
43
models/user_authn.py
Normal file
43
models/user_authn.py
Normal file
@@ -0,0 +1,43 @@
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from sqlalchemy import Column, Text
|
||||
from sqlmodel import Field, Relationship
|
||||
|
||||
from .base import TableBase
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .user import User
|
||||
|
||||
|
||||
class UserAuthn(TableBase, table=True):
|
||||
"""用户 WebAuthn 凭证模型,与 User 为多对一关系"""
|
||||
|
||||
__tablename__ = "user_authn"
|
||||
|
||||
credential_id: str = Field(max_length=255, unique=True, index=True)
|
||||
"""凭证 ID,Base64 编码"""
|
||||
|
||||
credential_public_key: str = Field(sa_column=Column(Text))
|
||||
"""凭证公钥,Base64 编码"""
|
||||
|
||||
sign_count: int = Field(default=0, ge=0)
|
||||
"""签名计数器,用于防重放攻击"""
|
||||
|
||||
credential_device_type: str = Field(max_length=32)
|
||||
"""凭证设备类型:'single_device' 或 'multi_device'"""
|
||||
|
||||
credential_backed_up: bool = Field(default=False)
|
||||
"""凭证是否已备份"""
|
||||
|
||||
transports: str | None = Field(default=None, max_length=255)
|
||||
"""支持的传输方式,逗号分隔,如 'usb,nfc,ble,internal'"""
|
||||
|
||||
name: str | None = Field(default=None, max_length=100)
|
||||
"""用户自定义的凭证名称,便于识别"""
|
||||
|
||||
# 外键
|
||||
user_id: int = Field(foreign_key="user.id", index=True)
|
||||
"""所属用户ID"""
|
||||
|
||||
# 关系
|
||||
user: "User" = Relationship(back_populates="authns")
|
||||
Reference in New Issue
Block a user