调试

agc_main.py

@@ -29,7 +29,7 @@ def video_start(user_data):
 def job_feishu_bot():
     name_list = Material.feishu_name()
     count_list = sqlHelp.get_count_list(name_list)
-    Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all')
+    Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all', '所有人')
     print("机器人通知完成")
 
 def clear_returned_usernames():
@@ -69,3 +69,5 @@ while True:
 # list = Material.feishu_list()
 # AgcVidoe.video_stitching(list)
 # print(list)
+
+

common/feishu.py

@@ -314,30 +314,31 @@ class Feishu:
 
     # 飞书机器人
     @classmethod
-    def bot(cls, log_type, crawler, text, mark):
+    def bot(cls, log_type, crawler, text, mark, mark_name):
         try:
             url = "https://open.feishu.cn/open-apis/bot/v2/hook/5a6ce4ca-32fa-44fe-bbe4-69ae369bb3cf"
+            # url = "https://open.feishu.cn/open-apis/bot/v2/hook/2b317db6-93ed-43b4-bf01-03c35cfa1d59"
             headers = {'Content-Type': 'application/json'}
             if crawler == "抖音":
                 content = "抖音cookie过期"
                 sheet_url = "https://w42nne6hzg.feishu.cn/sheets/IbVVsKCpbhxhSJtwYOUc8S1jnWb?sheet=n9xlLF"
-                users = "<at id=" + str(cls.get_userid(log_type, crawler, mark)) + "></at>"
+                users = "<at id=" + str(cls.get_userid(log_type, crawler, mark)) + f">{mark_name}</at>"
             elif crawler == "管理后台":
                 content = "管理后台cookie过期"
                 sheet_url = "https://w42nne6hzg.feishu.cn/sheets/IbVVsKCpbhxhSJtwYOUc8S1jnWb?sheet=n9xlLF"
-                users = "<at id=" + str(cls.get_userid(log_type, crawler, mark)) + "></at>"
+                users = f"<at id=" + str(cls.get_userid(log_type, crawler, mark)) + f">{mark_name}</at>"
             elif crawler == "快手":
                 content = "快手cookie过期"
                 sheet_url = "https://w42nne6hzg.feishu.cn/sheets/IbVVsKCpbhxhSJtwYOUc8S1jnWb?sheet=n9xlLF"
-                users = "<at id=" + str(cls.get_userid(log_type, crawler, mark)) + "></at>"
+                users = f"<at id=" + str(cls.get_userid(log_type, crawler, mark)) + f">{mark_name}</at>"
             elif crawler == "AGC视频":
                 content = 'AGC视频生成条数详情'
                 sheet_url = "https://w42nne6hzg.feishu.cn/sheets/IbVVsKCpbhxhSJtwYOUc8S1jnWb?sheet=n9xlLF"
-                users = "<at id=" + str(cls.get_userid(log_type, crawler, mark)) + ">所有人</at> \n"
+                users = f"<at id=" + str(cls.get_userid(log_type, crawler, mark)) + f">{mark_name}</at> \n"
             elif crawler == "AGC完成通知":
                 content = "今日所有AGC视频完成啦～～～"
                 sheet_url = "https://w42nne6hzg.feishu.cn/sheets/IbVVsKCpbhxhSJtwYOUc8S1jnWb?sheet=n9xlLF"
-                users = "<at id=" + str(cls.get_userid(log_type, crawler, mark)) + "></at>"
+                users = f"<at id=" + str(cls.get_userid(log_type, crawler, mark)) + f">{mark_name}</at>"
 
             data = json.dumps({
                 "msg_type": "interactive",

common/material.py

@@ -31,10 +31,11 @@ class Material():
         list = []
         for row in summary[2:]:
             mark = row[0]
+            mark_name = row[1]
             feishu_id = row[3]
             video_call = row[4]
             pq_id = row[7]
-            number = {"mark": mark, "feishu_id": feishu_id, "video_call": video_call, "pq_id": pq_id}
+            number = {"mark": mark, "feishu_id": feishu_id, "video_call": video_call, "pq_id": pq_id, "mark_name": mark_name}
             list.append(number)
         return list
 
@@ -55,6 +56,7 @@ class Material():
         list = []
         for row in summary[2:]:
             mark = row[0]
+            mark_name = row[1]
             feishu_id = row[3]
             sheet = row[5]
             token = row[6]
@@ -67,10 +69,10 @@ class Material():
             douyin = result[0]
             kuaishou = result[1]
             if type == "douyin":
-                number = {"mark": mark, "feishu_id": feishu_id, "channel": douyin, "token": token}
+                number = {"mark": mark, "feishu_id": feishu_id, "channel": douyin, "token": token, "mark_name": mark_name}
                 list.append(number)
             elif type == "kuaishou":
-                number = {"mark": mark, "feishu_id": feishu_id, "channel": kuaishou, "token": token}
+                number = {"mark": mark, "feishu_id": feishu_id, "channel": kuaishou, "token": token, "mark_name": mark_name}
                 list.append(number)
         return list
 

data_main.py

@@ -47,15 +47,13 @@ def kuanshou_task():
 # schedule.every(2).minutes.do(douyin_task)
 #
 # schedule.every(2).minutes.do(kuanshou_task)
-douyin_task()
-kuanshou_task()
-# schedule.every(10).hours.do(douyin_task)
-#
-# schedule.every(11).hours.do(kuanshou_task)
+schedule.every(8).hours.do(douyin_task)
+
+schedule.every(8).hours.do(kuanshou_task)
 
-# # 持续运行，直到手动终止
-# while True:
-#     schedule.run_pending()
-#     time.sleep(1)
+# 持续运行，直到手动终止
+while True:
+    schedule.run_pending()
+    time.sleep(1)
 
 

extract_data/douyin/douyin_author.py

@@ -63,6 +63,7 @@ class douyinAuthor():
     def get_videoList(cls, data):
         try:
             mark = data['mark']
+            mark_name = data['mark_name']
             token = data['token']
             feishu_id = data['feishu_id']
             channel_id = data['channel'][0]
@@ -126,7 +127,7 @@ class douyinAuthor():
                     if response.status_code != 200:
                         Common.logger("douyin").info(
                             f"接口请求失败，请更换cookie，{response.status_code}")
-                        Feishu.bot('recommend', '抖音', f'{mark}:抖音cookie失效，请及时更换～', mark)
+                        Feishu.bot('recommend', '抖音', f'抖音cookie失效，请及时更换～', mark, mark_name)
                         # 如果返回空信息，则随机睡眠 600, 1200 秒
                         time.sleep(random.randint(600, 1200))
                         continue

extract_data/kuaishou/kuaishou_author.py

@@ -59,6 +59,7 @@ class kuaishouAuthor():
     def get_kuaishou_videoList(cls, data):
         try:
             mark = data['mark']
+            mark_name = data['mark_name']
             token = data['token']
             feishu_id = data['feishu_id']
             channel_id = data['channel'][0]
@@ -112,7 +113,7 @@ class kuaishouAuthor():
                     if response.status_code != 200:
                         Common.logger("kuaishou").info(
                             f"接口请求失败，请更换cookie，{response.status_code}")
-                        Feishu.bot('recommend', '快手', f'{mark}:快手cookie失效，请及时更换～', mark)
+                        Feishu.bot('recommend', '快手', f'快手cookie失效，请及时更换～', mark, mark_name)
                         time.sleep(600)
                         return
                     elif "feeds" not in response.json()["data"]["visionProfilePhotoList"]:
@@ -122,7 +123,7 @@ class kuaishouAuthor():
                     elif len(response.json()["data"]["visionProfilePhotoList"]["feeds"]) == 0:
                         Common.logger("kuaishou").info(
                             f'数据为空{response.json()["data"]["visionProfilePhotoList"]["feeds"]}')
-                        Feishu.bot('recommend', '快手', f'{mark}:快手cookie失效，请及时更换～', mark)
+                        Feishu.bot('recommend', '快手', f'快手cookie失效，请及时更换～', mark, mark_name)
                         time.sleep(600)
                         break
                     pcursor = response.json()['data']['visionProfilePhotoList']['pcursor']

video_agc/agc_video_method.py

@@ -115,7 +115,7 @@ class AgcVidoe():
 
     # 获取视频链接
     @classmethod
-    def get_audio_url(cls, uid, mark):
+    def get_audio_url(cls, uid, mark, mark_name):
         cookie = Material.get_houtai_cookie()
         url = f"https://admin.piaoquantv.com/manager/video/detail/{uid}"
 
@@ -144,7 +144,7 @@ class AgcVidoe():
             if code != 0:
                 Common.logger("video").info(
                     f"未登录，请更换cookie，{data}")
-                Feishu.bot('recommend', '管理后台', '管理后台cookie失效，请及时更换～', mark)
+                Feishu.bot('recommend', '管理后台', '管理后台cookie失效，请及时更换～', mark, mark_name)
                 return ""
             audio_url = data["content"]["transedVideoPath"]
             return audio_url
@@ -286,6 +286,7 @@ class AgcVidoe():
         try:
             pq_ids = ex_list["pq_id"]
             pq_ids_list = pq_ids.split(',')
+            mark_name = ex_list['mark_name']
 
             mark = ex_list["mark"]
             feishu_id = ex_list["feishu_id"]
@@ -315,7 +316,7 @@ class AgcVidoe():
                     link = result[1][0]
                     limit_count = 1
                     if count >= kb_count or kb_count == 0:
-                        Feishu.bot('recommend', 'AGC完成通知', '今日自制视频拼接任务完成啦～', mark)
+                        Feishu.bot('recommend', 'AGC完成通知', '今日自制视频拼接任务完成啦～', mark, mark_name)
                         return mark
                 # 获取音频类型+字幕+标题
                 uid, srt, title_list = Material.get_all_data(feishu_id, link, mark)
@@ -343,7 +344,7 @@ class AgcVidoe():
                     cls.create_subtitle_file(srt, s_path)
                     Common.logger("video").info(f"SRT 文件目录创建成功")
                 # 获取音频
-                audio_video = cls.get_audio_url(uid, mark)
+                audio_video = cls.get_audio_url(uid, mark, mark_name)
                 Common.logger("video").info(f"获取需要拼接的音频成功")
                 # 获取音频秒数
                 audio_duration = cls.get_audio_duration(audio_video)