|
@@ -12,7 +12,7 @@ from app.providers.r2r import r2r
|
|
|
from app.providers.storage import storage
|
|
from app.providers.storage import storage
|
|
|
from app.services.file.impl.oss_file import OSSFileService
|
|
from app.services.file.impl.oss_file import OSSFileService
|
|
|
import asyncio
|
|
import asyncio
|
|
|
-
|
|
|
|
|
|
|
+from pathlib import Path
|
|
|
import nest_asyncio
|
|
import nest_asyncio
|
|
|
|
|
|
|
|
# 使得异步代码可以在已运行的事件循环中嵌套
|
|
# 使得异步代码可以在已运行的事件循环中嵌套
|
|
@@ -36,8 +36,10 @@ class R2RFileService(OSSFileService):
|
|
|
# if ext_file is not None:
|
|
# if ext_file is not None:
|
|
|
# # TODO: 文件去重策略
|
|
# # TODO: 文件去重策略
|
|
|
# return ext_file
|
|
# return ext_file
|
|
|
-
|
|
|
|
|
- file_key = f"{uuid.uuid4()}-{file.filename}"
|
|
|
|
|
|
|
+ file_extension = Path(filename).suffix
|
|
|
|
|
+ file_key = f"{uuid.uuid4()}{file_extension}"
|
|
|
|
|
+ print(file_key)
|
|
|
|
|
+ # file_key = f"{uuid.uuid4()}-{file.filename}"
|
|
|
with tempfile.NamedTemporaryFile(
|
|
with tempfile.NamedTemporaryFile(
|
|
|
suffix="_" + file.filename, delete=True
|
|
suffix="_" + file.filename, delete=True
|
|
|
) as temp_file:
|
|
) as temp_file:
|
