Merge remote-tracking branch 'origin/master'

Author: vastsa

apps/admin/services.py

@@ -8,6 +8,7 @@
 from apps.base.utils import get_expire_info, get_file_path_name
 from fastapi import HTTPException
 from core.settings import data_root
+from core.utils import hash_password, is_password_hashed
 
 
 class FileService:
@@ -76,6 +77,9 @@ async def update_config(self, data: dict):
         if admin_token is None or admin_token == "":
             raise HTTPException(status_code=400, detail="管理员密码不能为空")
 
+        if not is_password_hashed(admin_token):
+            data["admin_token"] = hash_password(admin_token)
+
         for key, value in data.items():
             if key not in settings.default_config:
                 continue

apps/admin/views.py

@@ -17,17 +17,16 @@
 from apps.base.models import FileCodes, KeyValue
 from apps.admin.dependencies import create_token
 from core.settings import settings
+from core.utils import get_now, verify_password
 
 admin_api = APIRouter(prefix="/admin", tags=["管理"])
 
 
 @admin_api.post("/login")
 async def login(data: LoginData):
-    # 验证管理员密码
-    if data.password != settings.admin_token:
+    if not verify_password(data.password, settings.admin_token):
         raise HTTPException(status_code=401, detail="密码错误")
 
-    # 生成包含管理员身份的token
     token = create_token({"is_admin": True})
     return APIResponse(detail={"token": token, "token_type": "Bearer"})
 
@@ -37,16 +36,13 @@ async def dashboard(admin: bool = Depends(admin_required)):
     all_codes = await FileCodes.all()
     all_size = str(sum([code.size for code in all_codes]))
     sys_start = await KeyValue.filter(key="sys_start").first()
-    # 获取当前日期时间
-    now = datetime.datetime.now()
+    now = await get_now()
     today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
     yesterday_start = today_start - datetime.timedelta(days=1)
     yesterday_end = today_start - datetime.timedelta(microseconds=1)
-    # 统计昨天一整天的记录数（从昨天0点到23:59:59）
     yesterday_codes = FileCodes.filter(
         created_at__gte=yesterday_start, created_at__lte=yesterday_end
     )
-    # 统计今天到现在的记录数（从今天0点到现在）
     today_codes = FileCodes.filter(created_at__gte=today_start)
     return APIResponse(
         detail={
@@ -63,21 +59,21 @@ async def dashboard(admin: bool = Depends(admin_required)):
 
 @admin_api.delete("/file/delete")
 async def file_delete(
-        data: IDData,
-        file_service: FileService = Depends(get_file_service),
-        admin: bool = Depends(admin_required),
+    data: IDData,
+    file_service: FileService = Depends(get_file_service),
+    admin: bool = Depends(admin_required),
 ):
     await file_service.delete_file(data.id)
     return APIResponse()
 
 
 @admin_api.get("/file/list")
 async def file_list(
-        page: int = 1,
-        size: int = 10,
-        keyword: str = "",
-        file_service: FileService = Depends(get_file_service),
-        admin: bool = Depends(admin_required),
+    page: int = 1,
+    size: int = 10,
+    keyword: str = "",
+    file_service: FileService = Depends(get_file_service),
+    admin: bool = Depends(admin_required),
 ):
     files, total = await file_service.list_files(page, size, keyword)
     return APIResponse(
@@ -92,17 +88,17 @@ async def file_list(
 
 @admin_api.get("/config/get")
 async def get_config(
-        config_service: ConfigService = Depends(get_config_service),
-        admin: bool = Depends(admin_required),
+    config_service: ConfigService = Depends(get_config_service),
+    admin: bool = Depends(admin_required),
 ):
     return APIResponse(detail=config_service.get_config())
 
 
 @admin_api.patch("/config/update")
 async def update_config(
-        data: dict,
-        config_service: ConfigService = Depends(get_config_service),
-        admin: bool = Depends(admin_required),
+    data: dict,
+    config_service: ConfigService = Depends(get_config_service),
+    admin: bool = Depends(admin_required),
 ):
     data.pop("themesChoices")
     await config_service.update_config(data)
@@ -111,47 +107,47 @@ async def update_config(
 
 @admin_api.get("/file/download")
 async def file_download(
-        id: int,
-        file_service: FileService = Depends(get_file_service),
-        admin: bool = Depends(admin_required),
+    id: int,
+    file_service: FileService = Depends(get_file_service),
+    admin: bool = Depends(admin_required),
 ):
     file_content = await file_service.download_file(id)
     return file_content
 
 
 @admin_api.get("/local/lists")
 async def get_local_lists(
-        local_file_service: LocalFileService = Depends(get_local_file_service),
-        admin: bool = Depends(admin_required),
+    local_file_service: LocalFileService = Depends(get_local_file_service),
+    admin: bool = Depends(admin_required),
 ):
     files = await local_file_service.list_files()
     return APIResponse(detail=files)
 
 
 @admin_api.delete("/local/delete")
 async def delete_local_file(
-        item: DeleteItem,
-        local_file_service: LocalFileService = Depends(get_local_file_service),
-        admin: bool = Depends(admin_required),
+    item: DeleteItem,
+    local_file_service: LocalFileService = Depends(get_local_file_service),
+    admin: bool = Depends(admin_required),
 ):
     result = await local_file_service.delete_file(item.filename)
     return APIResponse(detail=result)
 
 
 @admin_api.post("/local/share")
 async def share_local_file(
-        item: ShareItem,
-        file_service: FileService = Depends(get_file_service),
-        admin: bool = Depends(admin_required),
+    item: ShareItem,
+    file_service: FileService = Depends(get_file_service),
+    admin: bool = Depends(admin_required),
 ):
     share_info = await file_service.share_local_file(item)
     return APIResponse(detail=share_info)
 
 
 @admin_api.patch("/file/update")
 async def update_file(
-        data: UpdateFileData,
-        admin: bool = Depends(admin_required),
+    data: UpdateFileData,
+    admin: bool = Depends(admin_required),
 ):
     file_code = await FileCodes.filter(id=data.id).first()
     if not file_code:
@@ -167,7 +163,11 @@ async def update_file(
         update_data["prefix"] = data.prefix
     if data.suffix is not None and data.suffix != file_code.suffix:
         update_data["suffix"] = data.suffix
-    if data.expired_at is not None and data.expired_at != "" and data.expired_at != file_code.expired_at:
+    if (
+        data.expired_at is not None
+        and data.expired_at != ""
+        and data.expired_at != file_code.expired_at
+    ):
         update_data["expired_at"] = data.expired_at
     if data.expired_count is not None and data.expired_count != file_code.expired_count:
         update_data["expired_count"] = data.expired_count

apps/base/migrations/migrations_004.py

@@ -0,0 +1,14 @@
+from tortoise import connections
+
+
+async def add_save_path_to_uploadchunk():
+    conn = connections.get("default")
+    await conn.execute_script(
+        """
+        ALTER TABLE uploadchunk ADD COLUMN save_path VARCHAR(512) NULL;
+        """
+    )
+
+
+async def migrate():
+    await add_save_path_to_uploadchunk()

apps/base/models.py

@@ -49,6 +49,7 @@ class UploadChunk(models.Model):
     file_size = fields.BigIntField()
     chunk_size = fields.IntField()
     file_name = fields.CharField(max_length=255)
+    save_path = fields.CharField(max_length=512, null=True)
     created_at = fields.DatetimeField(auto_now_add=True)
     completed = fields.BooleanField(default=False)
 
@@ -66,6 +67,7 @@ class KeyValue(Model):
 
 class PresignUploadSession(models.Model):
     """预签名上传会话模型"""
+
     id = fields.IntField(pk=True)
     upload_id = fields.CharField(max_length=36, unique=True, index=True)
     file_name = fields.CharField(max_length=255)
@@ -85,4 +87,6 @@ async def is_expired(self):
 file_codes_pydantic = pydantic_model_creator(FileCodes, name="FileCodes")
 upload_chunk_pydantic = pydantic_model_creator(UploadChunk, name="UploadChunk")
 key_value_pydantic = pydantic_model_creator(KeyValue, name="KeyValue")
-presign_upload_session_pydantic = pydantic_model_creator(PresignUploadSession, name="PresignUploadSession")
+presign_upload_session_pydantic = pydantic_model_creator(
+    PresignUploadSession, name="PresignUploadSession"
+)

apps/base/utils.py

@@ -10,41 +10,44 @@
 from apps.base.dependencies import IPRateLimit
 from apps.base.models import FileCodes
 from core.settings import settings
-from core.utils import get_random_num, get_random_string, max_save_times_desc, sanitize_filename
+from core.utils import (
+    get_random_num,
+    get_random_string,
+    max_save_times_desc,
+    sanitize_filename,
+    get_now,
+)
 
 
 async def get_file_path_name(file: UploadFile) -> Tuple[str, str, str, str, str]:
-    """获取文件路径和文件名"""
-    today = datetime.datetime.now()
-    storage_path = settings.storage_path.strip("/")  # 移除开头和结尾的斜杠
+    today = await get_now()
+    storage_path = settings.storage_path.strip("/")
     file_uuid = uuid.uuid4().hex
-    # 一些客户端对非ASCII字符会进行编码，需要解码
-    filename = await sanitize_filename(unquote(file.filename))
-    # 使用 UUID 作为子目录名
+    filename = await sanitize_filename(unquote(file.filename or ""))
     base_path = f"share/data/{today.strftime('%Y/%m/%d')}/{file_uuid}"
-    # 如果设置了存储路径，将其添加到基础路径中
     path = f"{storage_path}/{base_path}" if storage_path else base_path
     prefix, suffix = os.path.splitext(filename)
-    # 保持原始文件名
     save_path = f"{path}/{filename}"
     return path, suffix, prefix, filename, save_path
 
 
-async def get_chunk_file_path_name(file_name: str, upload_id: str) -> Tuple[str, str, str, str, str]:
-    """获取切片文件的路径和文件名"""
-    today = datetime.datetime.now()
-    storage_path = settings.storage_path.strip("/")  # 移除开头和结尾的斜杠
+async def get_chunk_file_path_name(
+    file_name: str, upload_id: str
+) -> Tuple[str, str, str, str, str]:
+    today = await get_now()
+    storage_path = settings.storage_path.strip("/")
     base_path = f"share/data/{today.strftime('%Y/%m/%d')}/{upload_id}"
     path = f"{storage_path}/{base_path}" if storage_path else base_path
     prefix, suffix = os.path.splitext(file_name)
     save_path = f"{path}/{prefix}{suffix}"
     return path, suffix, prefix, file_name, save_path
 
 
-async def get_expire_info(expire_value: int, expire_style: str) -> Tuple[Optional[datetime.datetime], int, int, str]:
-    """获取过期信息"""
+async def get_expire_info(
+    expire_value: int, expire_style: str
+) -> Tuple[Optional[datetime.datetime], int, int, str]:
     expired_count, used_count = -1, 0
-    now = datetime.datetime.now()
+    now = await get_now()
     code = None
 
     max_timedelta = (
@@ -64,7 +67,7 @@ async def get_expire_info(expire_value: int, expire_style: str) -> Tuple[Optiona
         "hour": lambda: now + datetime.timedelta(hours=expire_value),
         "minute": lambda: now + datetime.timedelta(minutes=expire_value),
         "count": lambda: (now + datetime.timedelta(days=1), expire_value),
-        "forever": lambda: (None, None),  # 修改这里
+        "forever": lambda: (None, None),
     }
 
     if expire_style in expire_styles:
@@ -74,7 +77,7 @@ async def get_expire_info(expire_value: int, expire_style: str) -> Tuple[Optiona
             if expire_style == "count":
                 expired_count = extra
             elif expire_style == "forever":
-                code = await get_random_code(style="string")  # 移动到这里
+                code = await get_random_code(style="string")
         else:
             expired_at = result
         if expired_at and expired_at - now > max_timedelta:
@@ -88,12 +91,11 @@ async def get_expire_info(expire_value: int, expire_style: str) -> Tuple[Optiona
     return expired_at, expired_count, used_count, code
 
 
-async def get_random_code(style="num") -> str:
-    """获取随机字符串"""
+async def get_random_code(style: str = "num") -> str:
     while True:
         code = await get_random_num() if style == "num" else await get_random_string()
         if not await FileCodes.filter(code=code).exists():
-            return code
+            return str(code)
 
 
 async def calculate_file_hash(file: UploadFile, chunk_size=1024 * 1024) -> str: