fix: Fix abnormal Chinese names in downloaded files in the background #200

Author: Lan

apps/admin/views.py

@@ -63,21 +63,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 +92,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,38 +111,38 @@ 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)

core/storage.py

@@ -92,7 +92,14 @@ async def get_file_response(self, file_code: FileCodes):
         file_path = self.root_path / await file_code.get_file_path()
         if not file_path.exists():
             return APIResponse(code=404, detail="文件已过期删除")
-        return FileResponse(file_path, filename=file_code.prefix + file_code.suffix)
+        filename = f"{file_code.prefix}{file_code.suffix}"
+        encoded_filename = quote(filename, safe='')
+        content_disposition = f"attachment; filename*=UTF-8''{encoded_filename}"
+        return FileResponse(
+            file_path,
+            headers={"Content-Disposition": content_disposition},
+            filename=filename  # 保留原始文件名以备某些场景使用
+        )
 
 
 class S3FileStorage(FileStorageInterface):
@@ -118,11 +125,11 @@ def __init__(self):
 
     async def save_file(self, file: UploadFile, save_path: str):
         async with self.session.client(
-            "s3",
-            endpoint_url=self.endpoint_url,
-            aws_session_token=self.aws_session_token,
-            region_name=self.region_name,
-            config=Config(signature_version=self.signature_version),
+                "s3",
+                endpoint_url=self.endpoint_url,
+                aws_session_token=self.aws_session_token,
+                region_name=self.region_name,
+                config=Config(signature_version=self.signature_version),
         ) as s3:
             await s3.put_object(
                 Bucket=self.bucket_name,
@@ -133,10 +140,10 @@ async def save_file(self, file: UploadFile, save_path: str):
 
     async def delete_file(self, file_code: FileCodes):
         async with self.session.client(
-            "s3",
-            endpoint_url=self.endpoint_url,
-            region_name=self.region_name,
-            config=Config(signature_version=self.signature_version),
+                "s3",
+                endpoint_url=self.endpoint_url,
+                region_name=self.region_name,
+                config=Config(signature_version=self.signature_version),
         ) as s3:
             await s3.delete_object(
                 Bucket=self.bucket_name, Key=await file_code.get_file_path()
@@ -146,10 +153,10 @@ async def get_file_response(self, file_code: FileCodes):
         try:
             filename = file_code.prefix + file_code.suffix
             async with self.session.client(
-                "s3",
-                endpoint_url=self.endpoint_url,
-                region_name=self.region_name,
-                config=Config(signature_version=self.signature_version),
+                    "s3",
+                    endpoint_url=self.endpoint_url,
+                    region_name=self.region_name,
+                    config=Config(signature_version=self.signature_version),
             ) as s3:
                 link = await s3.generate_presigned_url(
                     "get_object",
@@ -183,10 +190,10 @@ async def get_file_url(self, file_code: FileCodes):
             return await get_file_url(file_code.code)
         else:
             async with self.session.client(
-                "s3",
-                endpoint_url=self.endpoint_url,
-                region_name=self.region_name,
-                config=Config(signature_version=self.signature_version),
+                    "s3",
+                    endpoint_url=self.endpoint_url,
+                    region_name=self.region_name,
+                    config=Config(signature_version=self.signature_version),
             ) as s3:
                 result = await s3.generate_presigned_url(
                     "get_object",
@@ -452,7 +459,7 @@ async def save_file(self, file: UploadFile, save_path: str):
             async with aiohttp.ClientSession(auth=self.auth) as session:
                 content = await file.read()  # 注意：大文件需要分块读取
                 async with session.put(
-                    url, data=content, headers={"Content-Type": file.content_type}
+                        url, data=content, headers={"Content-Type": file.content_type}
                 ) as resp:
                     if resp.status not in (200, 201, 204):
                         content = await resp.text()

path/to/frontend/file

@@ -0,0 +1,54 @@
+import { request } from '@/utils/request';  // 假设这是你的请求函数
+import { ElMessage } from 'element-plus';   // Element Plus 的消息组件
+import { t } from '@/locales';             // 国际化函数
+import { saveFileByWebApi, saveFileByElementA } from '@/utils/file';  // 文件保存工具函数
+
+const downloadFile = (id: number) => {
+  request({
+    url: '/admin/file/download',
+    method: 'get',
+    params: {
+      id,
+    },
+    responseType: 'blob'
+  }).then((response: any) => {
+    const contentDisposition = response.headers?.['content-disposition'] || '';
+    let filename = 'file';
+    
+    try {
+      // 先尝试获取 filename* 参数
+      const filenameStarMatch = contentDisposition.match(/filename\*=UTF-8''([^;]*)/);
+      if (filenameStarMatch) {
+        filename = decodeURIComponent(filenameStarMatch[1]);
+      } else {
+        // 如果没有 filename*，则尝试获取普通 filename
+        const filenameMatch = contentDisposition.match(/filename="([^"]*)"/) || contentDisposition.match(/filename=([^;]*)/);
+        if (filenameMatch) {
+          filename = filenameMatch[1];
+        }
+      }
+    } catch (error) {
+      console.warn('解析文件名失败:', error);
+      // 如果解析失败，使用默认文件名
+      filename = `download_${id}`;
+    }
+
+    // @ts-ignore
+    if (window.showSaveFilePicker) {
+      saveFileByWebApi(response.data, filename).catch(() => {
+        saveFileByElementA(response.data, filename).catch(() => {
+          ElMessage.error(t('admin.fileView.download_fail'));
+        });
+      });
+    } else {
+      saveFileByElementA(response.data, filename).catch(() => {
+        ElMessage.error(t('admin.fileView.download_fail'));
+      });
+    }
+  }).catch(error => {
+    console.error('下载文件失败:', error);
+    ElMessage.error(t('admin.fileView.download_fail'));
+  });
+};
+
+export default downloadFile;