Merge remote-tracking branch 'origin/master' into modify_get_url_zl0403

utils/piaoquan.py

@@ -12,7 +12,7 @@ class PQ:
     新生成视频上传到对应账号下
     """
     @classmethod
-    def insert_piaoquantv(cls, new_video_path, new_title, n_id, cover):
+    def insert_piaoquantv(cls, new_video_path, new_title, n_id, cover, sub_crawler_src_code):
         url = "https://vlogapi.piaoquantv.com/longvideoapi/crawler/video/send?muid=999"
         headers = {
             'User-Agent': 'PQSpeed/486 CFNetwork/1410.1 Darwin/22.6.0',
@@ -40,7 +40,8 @@ class PQ:
             'videoPath': new_video_path,
             'viewStatus': '1',
             'appType': '888888',
-            'crawlerSrcCode': 'MANUAL_TRANSPORT_TOOL'
+            'crawlerSrcCode': 'MANUAL_TRANSPORT_TOOL',
+            'subCrawlerSrcCode': sub_crawler_src_code
         }
         if cover:
             payload['coverImgPath'] = cover

workers/consumption_work.py

@@ -35,7 +35,7 @@ CACHE_DIR = '/app/cache/'
 # CACHE_DIR = '/Users/z/Downloads/'
 class ConsumptionRecommend(object):
     @classmethod
-    def insert_pq(cls, data, oss_object_key, title, tags, tag_transport_channel, channel_mark, task_mark):
+    def insert_pq(cls, data, oss_object_key, title, tags, tag_transport_channel, channel_mark, task_mark, sub_crawler_src_code):
         logger.info(f"[+] 开始写入票圈")
         n_ids = str(data["pq_ids"])
         if ',' in n_ids:
@@ -44,7 +44,7 @@ class ConsumptionRecommend(object):
             n_id_list = [n_ids]
         pq_list = []
         for n_id in n_id_list:
-            code = PQ.insert_piaoquantv(oss_object_key, title, n_id, None)
+            code = PQ.insert_piaoquantv(oss_object_key, title, n_id, None, sub_crawler_src_code)
             if not code:
                 logger.error(f"[+] 写入票圈后台失败")
                 AliyunLogger.logging(data["name"], "效率工具", tag_transport_channel, data["video_url"],
@@ -205,7 +205,7 @@ class ConsumptionRecommend(object):
                 data['tag']
             ]))
             cls.insert_pq(data, oss_object_key, title, tags, tag_transport_channel, channel_mark,
-                          "搬运工具")
+                          "搬运工具", "MANUAL_TRANSPORT_TOOL_ORIGIN")
         if data["transform_rule"] == "仅改造" or data["transform_rule"] == "是":
             try:
                 width, height = FFmpeg.get_w_h_size(video_path)
@@ -455,7 +455,7 @@ class ConsumptionRecommend(object):
                     data['tag']
                 ]))
                 cls.insert_pq(data, oss_object_key, title, tags, tag_transport_channel, channel_mark,
-                              "搬运改造")
+                              "搬运改造", "MANUAL_TRANSPORT_TOOL_TRANSFORM")
                 return
             except Exception as e:
                 data["transform_rule"] = "仅改造"

workers/consumption_work_studio.py

@@ -35,7 +35,7 @@ class ConsumptionRecommend(object):
     def insert_pq(cls, data, oss_object_key, title, cover):
         logger.info(f"[内容分析] 开始写入票圈")
 
-        code = PQ.insert_piaoquantv(oss_object_key, title, '50322062', cover)
+        code = PQ.insert_piaoquantv(oss_object_key, title, '50322062', cover, None)
         if not code:
             logger.error(f"[内容分析] 写入票圈后台失败")
             text = (