Selaa lähdekoodia

update xiaoniangaoplus

piaoquan 1 vuosi sitten
vanhempi
commit
8463b8085c

+ 6 - 1
main/process_offline.sh

@@ -34,6 +34,7 @@ if [[ "$time" > "00:30:00"  &&  "$time" < "01:59:59" || "$time" > "05:00:00"  &&
   echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 吉祥幸福 爬虫脚本任务" >> ${log_path}
 #  ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
 #  ps aux | grep run_zhongmiaoyinxin | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zfqz | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zmyx | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_xngplus | grep -v grep | awk '{print $2}' | xargs kill -9
@@ -58,6 +59,7 @@ if [[ "$time" > "02:00:00"  &&  "$time" < "03:59:59" || "$time" > "06:00:00"  &&
   echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 众妙音信-new 爬虫脚本任务" >> ${log_path}
 #  ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
 #  ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_zmyx | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zfqz | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_xngplus | grep -v grep | awk '{print $2}' | xargs kill -9
@@ -105,6 +107,7 @@ if [[ "$time" > "07:00:00"  &&  "$time" < "08:59:59" || "$time" > "19:00:00"  &&
   echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 小年糕+ 爬虫脚本任务" >> ${log_path}
 #  ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
 #  ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_xngplus | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_xngrule | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zfqz | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zmyx | grep -v grep | awk '{print $2}' | xargs kill -9
@@ -131,6 +134,7 @@ if [[ "$time" > "10:00:00"  &&  "$time" < "11:59:59" || "$time" > "15:00:00"  &&
   echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 祝福圈子 爬虫脚本任务" >> ${log_path}
 #  ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
 #  ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_zfqz | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_xngplus | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_xngrule | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
@@ -156,6 +160,7 @@ if [[ "$time" > "16:00:00"  &&  "$time" < "16:59:59" ]];then
   echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 漂漂圈 爬虫脚本任务" >> ${log_path}
 #  ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
 #  ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_ppq | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_xngplus | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_xngrule | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
@@ -166,7 +171,7 @@ if [[ "$time" > "16:00:00"  &&  "$time" < "16:59:59" ]];then
     echo "$(date "+%Y-%m-%d %H:%M:%S") 漂漂圈 小程序爬虫, 异常停止, 正在重启!" >> ${log_path}
     adb forward --remove-all
     cd ${piaoquan_crawler_dir}
-    nohup python3 -u piaopiaoquan/piaopiaoquan_main/run_ppq_recommend.py --log_type="recommend" --crawler="zhufuquanzi" --env=${env} >>piaopiaoquan/logs/nohup-recommend.log 2>&1 &
+    nohup python3 -u piaopiaoquan/piaopiaoquan_main/run_ppq_recommend.py --log_type="recommend" --crawler="piaopiaoquan" --env=${env} >>piaopiaoquan/logs/nohup-recommend.log 2>&1 &
     echo "$(date "+%Y-%m-%d %H:%M:%S") 重启完成!" >> ${log_path}
   else
     echo "$(date "+%Y-%m-%d %H:%M:%S") 漂漂圈 程序爬虫, 进程状态正常" >> ${log_path}

+ 0 - 0
piaopiaoquan/logs/__init__.py


+ 4 - 4
piaopiaoquan/piaopiaoquan/piaopiaoquan_recommend.py

@@ -43,9 +43,9 @@ class PPQRecommend:
         self.rule_dict = rule_dict
         self.our_uid = our_uid
         if self.env == "dev":
-            chromedriverExecutable = "/Users/a123456/Downloads/chromedriver_v111/chromedriver"
+            chromedriverExecutable = "/Users/piaoquan/Downloads/chromedriver"
         else:
-            chromedriverExecutable = "/Users/a123456/Downloads/chromedriver_v111/chromedriver"
+            chromedriverExecutable = "/Users/piaoquan/Downloads/chromedriver"
 
         Common.logger(self.log_type, self.crawler).info("启动微信")
         # Common.logging(self.log_type, self.crawler, self.env, '启动微信')
@@ -266,7 +266,7 @@ class PPQRecommend:
             'update_time_stamp': int(time.time()),
             "avatar_url": avatar_url,
             "cover_url": cover_url,
-            "session": f"xiaoniangao-{int(time.time())}"
+            "session": f"piaopiiaoquan-{int(time.time())}"
         }
         pipeline = PiaoQuanPipeline(
             platform=self.crawler,
@@ -311,8 +311,8 @@ class PPQRecommend:
         try:
             self.get_video_info_2(video_element)
         except Exception as e:
-            Common.logger(self.log_type, self.crawler).error(f"抓取单条视频异常:{e}\n")
             self.driver.press_keycode(AndroidKey.BACK)
+            Common.logger(self.log_type, self.crawler).error(f"抓取单条视频异常:{e}\n")
             AliyunLogger.logging(
                 code="3001",
                 platform=self.platform,

+ 4 - 3
xiaoniangaoplus/xiaoniangaoplus/xiaoniangao_plus_scheduling2.py

@@ -213,8 +213,8 @@ class XiaoNianGaoPlusRecommend:
             time.sleep(10)
             video_url_elements = self.search_elements(
                 '//wx-video[@class="dynamic-index--video-item dynamic-index--video"]')
-            if video_url_elements:
-                return video_url_elements[0].get_attribute("src")
+            Common.logger(self.log_type, self.crawler).info(f"{video_url_elements[0].get_attribute('src')}")
+            return video_url_elements[0].get_attribute('src')
 
     def parse_detail(self, index):
         page_source = self.driver.page_source
@@ -331,7 +331,7 @@ class XiaoNianGaoPlusRecommend:
             video_dict["strategy"] = self.log_type
             video_dict["out_video_id"] = video_dict["video_id"]
             video_dict["crawler_rule"] = json.dumps(self.rule_dict)
-            video_dict["user_id"] = random.choice(self.our_uid)
+            video_dict["user_id"] = self.our_uid
             video_dict["publish_time"] = video_dict["publish_time_str"]
             self.mq.send_msg(video_dict)
             # print(video_dict)
@@ -344,6 +344,7 @@ class XiaoNianGaoPlusRecommend:
         try:
             self.get_video_info_2(video_element)
         except Exception as e:
+            self.driver.press_keycode(AndroidKey.BACK)
             Common.logger(self.log_type, self.crawler).error(f"抓取单条视频异常:{e}\n")
             AliyunLogger.logging(
                 code="3001",

+ 1 - 0
zhufuquanzi/zhufuquanzi_recommend/zhufuquanzi_recommend_new.py

@@ -368,6 +368,7 @@ class ZFQZRecommend:
                         cls.swipe_up(driver)
                 except Exception as e:
                     Common.logger(log_type, crawler).error(f"抓取单条视频异常:{e}\n")
+                    driver.press_keycode(AndroidKey.BACK)
                     AliyunLogger.logging(
                         code="3001",
                         platform=ZFQZRecommend.platform,