zhangyong 6 meses atrás
pai
commit
8f6a0bc60b
4 arquivos alterados com 11 adições e 12 exclusões
  1. 3 2
      carry_data_handle.py
  2. 3 3
      carry_video/carry_video.py
  3. 1 3
      common/tag_video.py
  4. 4 4
      docker-compose.yml

+ 3 - 2
carry_data_handle.py

@@ -9,7 +9,7 @@ from loguru import logger
 from carry_video.carry_video import CarryViode
 from carry_video.carry_video import CarryViode
 from common import Feishu, AliyunLogger
 from common import Feishu, AliyunLogger
 from common.ffmpeg import FFmpeg
 from common.ffmpeg import FFmpeg
-from common.redis import get_carry_data
+from common.redis import get_carry_data, in_carry_video_data
 
 
 ENV = os.getenv('ENV', 'dev')
 ENV = os.getenv('ENV', 'dev')
 NAME = os.getenv('NAME')
 NAME = os.getenv('NAME')
@@ -41,10 +41,11 @@ def video_task_start():
                     logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
                     logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
     except Exception as e:
     except Exception as e:
         data = json.loads(data)
         data = json.loads(data)
+        in_carry_video_data(REDIS_NAME, json.dumps(data, ensure_ascii=False, indent=4))
         text = (
         text = (
             f"**负责人**: {data['name']}\n"
             f"**负责人**: {data['name']}\n"
             f"**内容**: {data}\n"
             f"**内容**: {data}\n"
-            f"**失败信息**: 视频处理失败\n"
+            f"**失败信息**: 视频处理失败,等待重新处理\n"
         )
         )
         AliyunLogger.logging(data["name"], "效率工具", data["tag_transport_channel"], data["video_url"],
         AliyunLogger.logging(data["name"], "效率工具", data["tag_transport_channel"], data["video_url"],
                              f"视频处理失败,失败信息{e}", "3002", str(data))
                              f"视频处理失败,失败信息{e}", "3002", str(data))

+ 3 - 3
carry_video/carry_video.py

@@ -126,9 +126,9 @@ class CarryViode:
                 continue
                 continue
             pq_list.append(code)
             pq_list.append(code)
             logger.info(f"[+] {REDIS_NAME}的{data}写入票圈成功,返回视频id{code}")
             logger.info(f"[+] {REDIS_NAME}的{data}写入票圈成功,返回视频id{code}")
-            # tag_status = Tag.video_tag(code, str(tags))
-            # if tag_status == 0:
-            #     logger.info(f"[+] {REDIS_NAME}的{data}写入标签成功,后台视频ID为{code}")
+            tag_status = Tag.video_tag(code, str(tags))
+            if tag_status == 0:
+                logger.info(f"[+] {REDIS_NAME}的{data}写入标签成功,后台视频ID为{code}")
             try:
             try:
                 current_time = datetime.now()
                 current_time = datetime.now()
                 formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
                 formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")

+ 1 - 3
common/tag_video.py

@@ -5,7 +5,7 @@ class Tag:
     @classmethod
     @classmethod
     def video_tag(cls, pq_id: str, tag: str):
     def video_tag(cls, pq_id: str, tag: str):
         try:
         try:
-            url = "https://admin.piaoquantv.com/manager/video/tag/addVideoAiTags"
+            url = "https://admin.piaoquantv.com/manager/video/tag/addVideoTags"
 
 
             payload = json.dumps({
             payload = json.dumps({
                 "videoId": pq_id,
                 "videoId": pq_id,
@@ -21,5 +21,3 @@ class Tag:
             return code
             return code
         except:
         except:
             return 1
             return 1
-
-

+ 4 - 4
docker-compose.yml

@@ -22,7 +22,7 @@ services:
     restart: unless-stopped
     restart: unless-stopped
     environment:
     environment:
       - ENV=prod
       - ENV=prod
-      - FS_SHEET=4a768d
+      - FS_SHEET=EZef39
       - TASK_TYPE=redis
       - TASK_TYPE=redis
       - NAME=鲁涛
       - NAME=鲁涛
       - REDIS_NAME=task:carry_data_redis_lt
       - REDIS_NAME=task:carry_data_redis_lt
@@ -36,7 +36,7 @@ services:
     restart: unless-stopped
     restart: unless-stopped
     environment:
     environment:
       - ENV=prod
       - ENV=prod
-      - FS_SHEET=4a768d
+      - FS_SHEET=Frush6
       - TASK_TYPE=redis
       - TASK_TYPE=redis
       - NAME=余海涛
       - NAME=余海涛
       - REDIS_NAME=task:carry_data_redis_yht
       - REDIS_NAME=task:carry_data_redis_yht
@@ -123,7 +123,7 @@ services:
     restart: unless-stopped
     restart: unless-stopped
     environment:
     environment:
       - ENV=prod
       - ENV=prod
-      - FS_SHEET=4a768d
+      - FS_SHEET=EZef39
       - TASK_TYPE=redis
       - TASK_TYPE=redis
       - NAME=鲁涛
       - NAME=鲁涛
       - REDIS_NAME=task:carry_data_redis_lt
       - REDIS_NAME=task:carry_data_redis_lt
@@ -138,7 +138,7 @@ services:
     restart: unless-stopped
     restart: unless-stopped
     environment:
     environment:
       - ENV=prod
       - ENV=prod
-      - FS_SHEET=4a768d
+      - FS_SHEET=Frush6
       - TASK_TYPE=redis
       - TASK_TYPE=redis
       - NAME=余海涛
       - NAME=余海涛
       - REDIS_NAME=task:carry_data_redis_yht
       - REDIS_NAME=task:carry_data_redis_yht