zhangyong 1 년 전
부모
커밋
aecf2706d1
4개의 변경된 파일10개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 0
      extract_data/douyin/douyin_author.py
  2. 4 0
      extract_data/kuaishou/kuaishou_author.py
  3. 3 1
      extract_data/zhannei/zhannei_author.py
  4. 1 1
      video_agc/agc_video_method.py

+ 2 - 0
extract_data/douyin/douyin_author.py

@@ -122,6 +122,8 @@ class douyinAuthor():
                     data = obj.get('aweme_list', [])
                     data = obj.get('aweme_list', [])
                     response.close()
                     response.close()
                     if response.status_code != 200:
                     if response.status_code != 200:
+                        if "-" in mark:
+                            mark = mark.split("-")[0]
                         Common.logger("douyin").info(
                         Common.logger("douyin").info(
                             f"接口请求失败,请更换cookie,{response.status_code}")
                             f"接口请求失败,请更换cookie,{response.status_code}")
                         Feishu.bot('recommend', '抖音', f'抖音cookie失效,请及时更换~', mark, mark_name)
                         Feishu.bot('recommend', '抖音', f'抖音cookie失效,请及时更换~', mark, mark_name)

+ 4 - 0
extract_data/kuaishou/kuaishou_author.py

@@ -108,6 +108,8 @@ class kuaishouAuthor():
                                       timeout=10)
                                       timeout=10)
                     response.close()
                     response.close()
                     if response.status_code != 200:
                     if response.status_code != 200:
+                        if "-" in mark:
+                            mark = mark.split("-")[0]
                         Common.logger("kuaishou").info(
                         Common.logger("kuaishou").info(
                             f"接口请求失败,请更换cookie,{response.status_code}")
                             f"接口请求失败,请更换cookie,{response.status_code}")
                         Feishu.bot('recommend', '快手', f'快手cookie失效,请及时更换~', mark, mark_name)
                         Feishu.bot('recommend', '快手', f'快手cookie失效,请及时更换~', mark, mark_name)
@@ -118,6 +120,8 @@ class kuaishouAuthor():
                             f'数据为空{response.json()["data"]["visionProfilePhotoList"]}')
                             f'数据为空{response.json()["data"]["visionProfilePhotoList"]}')
                         break
                         break
                     elif len(response.json()["data"]["visionProfilePhotoList"]["feeds"]) == 0:
                     elif len(response.json()["data"]["visionProfilePhotoList"]["feeds"]) == 0:
+                        if "-" in mark:
+                            mark = mark.split("-")[0]
                         Common.logger("kuaishou").info(
                         Common.logger("kuaishou").info(
                             f'数据为空{response.json()["data"]["visionProfilePhotoList"]["feeds"]}')
                             f'数据为空{response.json()["data"]["visionProfilePhotoList"]["feeds"]}')
                         Feishu.bot('recommend', '快手', f'快手cookie失效,请及时更换~', mark, mark_name)
                         Feishu.bot('recommend', '快手', f'快手cookie失效,请及时更换~', mark, mark_name)

+ 3 - 1
extract_data/zhannei/zhannei_author.py

@@ -94,9 +94,11 @@ class ZhanNeiAuthor():
                 data = response.json()
                 data = response.json()
                 code = data["code"]
                 code = data["code"]
                 if code != 0:
                 if code != 0:
+                    if "-" in mark:
+                        mark1 = mark.split("-")[0]
                     Common.logger("video").info(
                     Common.logger("video").info(
                         f"未登录,请更换cookie,{data}")
                         f"未登录,请更换cookie,{data}")
-                    Feishu.bot('recommend', '管理后台', '管理后台cookie失效,请及时更换~', mark, mark_name)
+                    Feishu.bot('recommend', '管理后台', '管理后台cookie失效,请及时更换~', mark1, mark_name)
                     return
                     return
                 video_url = data["content"]["transedVideoPath"]
                 video_url = data["content"]["transedVideoPath"]
                 channel_name = mark+'/zhannei'
                 channel_name = mark+'/zhannei'

+ 1 - 1
video_agc/agc_video_method.py

@@ -502,7 +502,7 @@ class AgcVidoe():
         # 总条数
         # 总条数
         all_count = cls.get_link_gs_count(mark)
         all_count = cls.get_link_gs_count(mark)
         if all_count >= int(zd_count):
         if all_count >= int(zd_count):
-            Feishu.bot('recommend', 'AGC完成通知', '今日脚本跟随视频拼接任务完成啦~', mark, mark_name)
+            Feishu.bot('recommend', 'AGC完成通知', '今日脚本跟随视频拼接任务完成啦~', mark.split("-")[0], mark_name)
             return mark
             return mark
         # 获取音频类型+字幕+标题
         # 获取音频类型+字幕+标题
         uid, srt, video_list = Material.get_all_data(feishu_id, link, mark)
         uid, srt, video_list = Material.get_all_data(feishu_id, link, mark)