update:存储改成单例模式,修复读取问题

This commit is contained in:
lan
2024-06-18 23:04:52 +08:00
parent 8afae1f567
commit e421ab93bc
4 changed files with 20 additions and 6 deletions
+3 -1
View File
@@ -11,7 +11,7 @@ from apps.admin.pydantics import IDData
from apps.base.models import FileCodes, KeyValue
from core.response import APIResponse
from core.settings import settings
from core.storage import file_storage
from core.storage import FileStorageInterface, storages
admin_api = APIRouter(
prefix='/admin',
@@ -26,6 +26,7 @@ async def login():
@admin_api.delete('/file/delete', dependencies=[Depends(admin_required)])
async def file_delete(data: IDData):
file_storage: FileStorageInterface = storages[settings.file_storage]()
file_code = await FileCodes.get(id=data.id)
await file_storage.delete_file(file_code)
await file_code.delete()
@@ -79,6 +80,7 @@ async def get_file_by_id(id):
@admin_api.get('/file/download', dependencies=[Depends(admin_required)])
async def file_download(id: int):
file_storage: FileStorageInterface = storages[settings.file_storage]()
has, file_code = await get_file_by_id(id)
# 检查文件是否存在
if not has:
+5 -1
View File
@@ -10,7 +10,7 @@ from apps.base.pydantics import SelectFileModel
from apps.base.utils import get_expire_info, get_file_path_name, error_ip_limit, upload_ip_limit
from core.response import APIResponse
from core.settings import settings
from core.storage import file_storage
from core.storage import storages, FileStorageInterface
from core.utils import get_select_token
# 创建一个API路由
@@ -56,6 +56,7 @@ async def share_file(expire_value: int = Form(default=1, gt=0), expire_style: st
# 获取文件路径和名称
path, suffix, prefix, uuid_file_name, save_path = await get_file_path_name(file)
# 保存文件
file_storage: FileStorageInterface = storages[settings.file_storage]()
await file_storage.save_file(file, save_path)
# 创建一个新的FileCodes实例
await FileCodes.create(
@@ -94,6 +95,7 @@ async def get_code_file_by_code(code, check=True):
# 获取文件的API
@share_api.get('/select/')
async def get_code_file(code: str, ip: str = Depends(error_ip_limit)):
file_storage: FileStorageInterface = storages[settings.file_storage]()
# 获取文件
has, file_code = await get_code_file_by_code(code)
# 检查文件是否存在
@@ -115,6 +117,7 @@ async def get_code_file(code: str, ip: str = Depends(error_ip_limit)):
# 选择文件的API
@share_api.post('/select/')
async def select_file(data: SelectFileModel, ip: str = Depends(error_ip_limit)):
file_storage: FileStorageInterface = storages[settings.file_storage]()
# 获取文件
has, file_code = await get_code_file_by_code(data.code)
# 检查文件是否存在
@@ -141,6 +144,7 @@ async def select_file(data: SelectFileModel, ip: str = Depends(error_ip_limit)):
# 下载文件的API
@share_api.get('/download')
async def download_file(key: str, code: str, ip: str = Depends(error_ip_limit)):
file_storage: FileStorageInterface = storages[settings.file_storage]()
# 检查token是否有效
is_valid = await get_select_token(code) == key
if not is_valid: