zhangyong 5 ماه پیش
والد
کامیت
05bd194e09
3فایلهای تغییر یافته به همراه6 افزوده شده و 5 حذف شده
  1. 3 2
      carry_video/carry_video.py
  2. 2 2
      common/aliyun_oss.py
  3. 1 1
      common/download_video.py

+ 3 - 2
carry_video/carry_video.py

@@ -10,6 +10,7 @@ from datetime import datetime
 from urllib.parse import urlparse, parse_qs
 from loguru import logger
 from common import Oss, Feishu, AliyunLogger
+from common.download_video import DownLoad
 from common.ffmpeg import FFmpeg
 from common.gpt4o_help import GPT4o
 from common.redis import in_carry_video_data
@@ -130,8 +131,8 @@ class CarryViode:
             title = GPT4o.get_ai_title(original_title if data["title_category"] == "原标题" else data["title_category"])
         else:
             title = original_title if data["title_category"] == "原标题" else data["title_category"]
-        # video_path = DownLoad.download_video(url, file_path)
-        video_path = Oss.download_video_oss(url, file_path)
+        video_path = DownLoad.download_video(url, file_path)
+        # video_path = Oss.download_video_oss(url, file_path)
         if not video_path:
             logger.error(f"[+] {url}下载失败")
             AliyunLogger.logging(data["name"],"效率工具", data["tag_transport_channel"], data["video_url"],

+ 2 - 2
common/aliyun_oss.py

@@ -8,8 +8,8 @@ import oss2
 import requests
 OSS_ACCESS_KEY_ID = "LTAIP6x1l3DXfSxm"
 OSS_ACCESS_KEY_SECRET = "KbTaM9ars4OX3PMS6Xm7rtxGr1FLon"
-OSS_BUCKET_ENDPOINT = "oss-cn-hangzhou-internal.aliyuncs.com"# 内网地址
-# OSS_BUCKET_ENDPOINT = "oss-cn-hangzhou.aliyuncs.com" # 外网地址
+# OSS_BUCKET_ENDPOINT = "oss-cn-hangzhou-internal.aliyuncs.com"# 内网地址
+OSS_BUCKET_ENDPOINT = "oss-cn-hangzhou.aliyuncs.com" # 外网地址
 OSS_BUCKET_NAME = "art-crawler"
 class Oss():
 

+ 1 - 1
common/download_video.py

@@ -10,7 +10,7 @@ class DownLoad:
             for i in range(3):
                 payload = {}
                 headers = {}
-                response = requests.request("GET", video_url, headers=headers, data=payload, timeout=50)
+                response = requests.request("GET", video_url, headers=headers, data=payload, timeout=240)
                 if response.status_code == 200:
                     # 以二进制写入模式打开文件
                     video = video_path_url + 'video.mp4'