Sfoglia il codice sorgente

fix: remove repeat util

zhayujie 2 anni fa
parent
commit
21ad51ffbf

+ 2 - 2
channel/feishu/feishu_channel.py

@@ -19,7 +19,7 @@ from config import conf
 from common.expired_dict import ExpiredDict
 from bridge.context import ContextType
 from channel.chat_channel import ChatChannel, check_prefix
-from utils import file_util
+from common import utils
 import json
 import os
 
@@ -118,7 +118,7 @@ class FeiShuChanel(ChatChannel):
     def _upload_image_url(self, img_url, access_token):
         logger.debug(f"[WX] start download image, img_url={img_url}")
         response = requests.get(img_url)
-        suffix = file_util.get_path_suffix(img_url)
+        suffix = utils.get_path_suffix(img_url)
         temp_name = str(uuid.uuid4()) + "." + suffix
         if response.status_code == 200:
             # 将图片内容保存为临时文件

+ 2 - 2
channel/feishu/feishu_message.py

@@ -4,7 +4,7 @@ import json
 import requests
 from common.log import logger
 from common.tmp_dir import TmpDir
-from utils import file_util
+from common import utils
 
 
 class FeishuMessage(ChatMessage):
@@ -28,7 +28,7 @@ class FeishuMessage(ChatMessage):
             file_key = content.get("file_key")
             file_name = content.get("file_name")
 
-            self.content = TmpDir().path() + file_key + "." + file_util.get_path_suffix(file_name)
+            self.content = TmpDir().path() + file_key + "." + utils.get_path_suffix(file_name)
 
             def _download_file():
                 # 如果响应状态码是200,则将响应内容写入本地文件

+ 0 - 8
utils/file_util.py

@@ -1,8 +0,0 @@
-from urllib.parse import urlparse
-import os
-
-
-# 获取url后缀
-def get_path_suffix(path):
-    path = urlparse(path).path
-    return os.path.splitext(path)[-1].lstrip('.')