From f37670f13f8faf018a87d5b73b662bb1909ebe87 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 19 十一月 2024 19:38:03 +0800 Subject: [PATCH] 审计结果文件下载 --- app/service/basic.py | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/service/basic.py b/app/service/basic.py index 30ac727..c64d47a 100644 --- a/app/service/basic.py +++ b/app/service/basic.py @@ -15,16 +15,25 @@ raise Exception(f"Failed to fetch data from API: {response.text}") return response_data.get("data", {}) - async def download_from_url(self, url: str, params: dict): + async def download_from_url(self, url, params=None): async with httpx.AsyncClient() as client: - response = await client.get(url, params=params, stream=True) - if response.status_code == 200: - content_disposition = response.headers.get('Content-Disposition') - filename = content_disposition.split('filename=')[-1].strip( - '"') if content_disposition else 'unknown_filename' - return response.content, filename, response.headers.get('Content-Type') - else: - return None, None, None + async with client.stream('GET', url, params=params) as response: + if response.status_code == 200: + # 鑾峰彇鏂囦欢鍚� + content_disposition = response.headers.get('Content-Disposition') + if content_disposition: + filename = content_disposition.split('filename=')[1].strip('"') + else: + filename = 'unknown_filename' + + # 鑾峰彇鍐呭绫诲瀷 + content_type = response.headers.get('Content-Type') + + # 璇诲彇鏂囦欢鍐呭 + content = await response.aread() + return content, filename, content_type + else: + raise Exception(f"Failed to download: {response.status_code}") async def excel_talk_image_download(self, file_id: str): url = f"{self.base_url}/exceltalk/download/image" @@ -65,4 +74,4 @@ print(e) return else: - yield f"Error: {response.status_code}" + yield f"Error: {response.status_code}" \ No newline at end of file -- Gitblit v1.8.0