diff --git a/MangoServer/requirements.txt b/MangoServer/requirements.txt index 3da65e78..3c818f26 100644 Binary files a/MangoServer/requirements.txt and b/MangoServer/requirements.txt differ diff --git a/MangoServer/src/auto_test/auto_api/service/base/api_base_test_setup/__init__.py b/MangoServer/src/auto_test/auto_api/service/base/api_base_test_setup/__init__.py index 15427737..269c01d2 100644 --- a/MangoServer/src/auto_test/auto_api/service/base/api_base_test_setup/__init__.py +++ b/MangoServer/src/auto_test/auto_api/service/base/api_base_test_setup/__init__.py @@ -3,12 +3,11 @@ # @Description: # @Time : 2025-07-04 17:18 # @Author : 毛鹏 -import mimetypes import re import traceback from urllib.parse import urlparse, urljoin -import magic +import filetype from mangotools.exceptions import MangoToolsError from src.auto_test.auto_api.models import ApiInfo @@ -81,12 +80,11 @@ class APIBaseTestSetup(PublicBase): for k, v in i.items(): file_path = self.test_data.replace(v) file_name = self.test_data.identify_parentheses(v)[0].replace('(', '').replace(')', '') - mime = magic.Magic(mime=True) - mime_type = mime.from_file(file_path) - if mime_type is None: - file.append((k, (file_name, open(file_path, 'rb'),))) + kind = filetype.guess(file_path) + if kind is not None: + file.append((k, (file_name, open(file_path, 'rb'), kind.mime))) else: - file.append((k, (file_name, open(file_path, 'rb'), mime_type))) + file.append((k, (file_name, open(file_path, 'rb'),))) request_data_model.file = file else: value = self.test_data.replace(value) diff --git a/MangoServer/tests/1test_01.py b/MangoServer/tests/1test_01.py index a4f5bf7d..3417536b 100644 --- a/MangoServer/tests/1test_01.py +++ b/MangoServer/tests/1test_01.py @@ -1,6 +1,11 @@ -import magic +import filetype file_path = r"D:\code\MangoTestingPlatform\MangoServer\upload_template\元素批量上传模版.xlsx" -mime = magic.Magic(mime=True) -mime_type = mime.from_file(file_path) -print(mime_type) # 输出: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + +# 使用 filetype 替换 magic +kind = filetype.guess(file_path) +if kind is not None: + mime_type = kind.mime + print(mime_type) # 输出: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet +else: + print("无法识别文件类型")