update

gongzhonghao/gongzhonghao_follow/gongzhonghao_follow_2.py

@@ -120,37 +120,20 @@ class GongzhonghaoFollow2:
                     Common.logger(log_type, crawler).warning(f"get_gzh_url:{r.text}\n")
                     Feishu.bot(log_type, crawler, "token_2过期啦，请扫码更换token\nhttps://mp.weixin.qq.com/")
                     time.sleep(60 * 10)
-<<<<<<< HEAD
-                    os.system("ps aux | grep run_gongzhonghao_follow_2.py | grep -v grep | awk '{print $2}' | xargs kill -9")
-=======
                     os.system("ps aux | grep run_gongzhonghao_follow_2 | grep -v grep | awk '{print $2}' | xargs kill -9")
->>>>>>> 10469649fb8e3a7c21407a8a53956e879cd35721
                 elif r.json()["base_resp"]["err_msg"] == "freq control" and 21 >= datetime.datetime.now().hour >= 10:
                     Common.logger(log_type, crawler).info(f"status_code:{r.status_code}")
                     Common.logger(log_type, crawler).warning(f"get_gzh_url:{r.text}\n")
                     Feishu.bot(log_type, crawler, "公众号_2频控啦，请扫码更换其他公众号token\nhttps://mp.weixin.qq.com/")
                     time.sleep(60 * 10)
-<<<<<<< HEAD
-                    os.system(
-                        "ps aux | grep run_gongzhonghao_follow_2.py | grep -v grep | awk '{print $2}' | xargs kill -9")
-=======
                     os.system("ps aux | grep run_gongzhonghao_follow_2 | grep -v grep | awk '{print $2}' | xargs kill -9")
->>>>>>> 10469649fb8e3a7c21407a8a53956e879cd35721
                 else:
                     break
             if "list" not in r.json() or len(r.json()["list"]) == 0:
                 Common.logger(log_type, crawler).info(f"status_code:{r.status_code}")
-<<<<<<< HEAD
-                Common.logger(log_type, crawler).warning(f"get_gzh_url:{r.text}\n")
-                Feishu.bot(log_type, crawler, "公众号_2频控啦，请扫码更换其他公众号token\nhttps://mp.weixin.qq.com/")
-                time.sleep(60 * 10)
-                os.system(
-                    "ps aux | grep run_gongzhonghao_follow_2.py | grep -v grep | awk '{print $2}' | xargs kill -9")
-=======
                 Feishu.bot(log_type, crawler, "公众号_2频控啦，请扫码更换其他公众号token\nhttps://mp.weixin.qq.com/")
                 time.sleep(60 * 10)
                 os.system("ps aux | grep run_gongzhonghao_follow_2 | grep -v grep | awk '{print $2}' | xargs kill -9")
->>>>>>> 10469649fb8e3a7c21407a8a53956e879cd35721
                 return
             else:
                 fakeid = r.json()["list"][int(index) - 1]["fakeid"]
@@ -262,24 +245,14 @@ class GongzhonghaoFollow2:
                         Common.logger(log_type, crawler).info(f"response:{r.text}")
                         Feishu.bot(log_type, crawler, "token_2过期啦，请扫码更换token\nhttps://mp.weixin.qq.com/")
                         time.sleep(60 * 10)
-<<<<<<< HEAD
-                        os.system(
-                            "ps aux | grep run_gongzhonghao_follow_2.py | grep -v grep | awk '{print $2}' | xargs kill -9")
-=======
                         os.system("ps aux | grep run_gongzhonghao_follow_2 | grep -v grep | awk '{print $2}' | xargs kill -9")
->>>>>>> 10469649fb8e3a7c21407a8a53956e879cd35721
                     elif r.json()["base_resp"][
                         "err_msg"] == "freq control" and 21 >= datetime.datetime.now().hour >= 10:
                         Common.logger(log_type, crawler).info(f"status_code:{r.status_code}")
                         Common.logger(log_type, crawler).warning(f"get_gzh_url:{r.text}\n")
                         Feishu.bot(log_type, crawler, "公众号_2频控啦，请扫码更换其他公众号token\nhttps://mp.weixin.qq.com/")
                         time.sleep(60 * 10)
-<<<<<<< HEAD
-                        os.system(
-                            "ps aux | grep run_gongzhonghao_follow_2.py | grep -v grep | awk '{print $2}' | xargs kill -9")
-=======
                         os.system("ps aux | grep run_gongzhonghaofollow_2 | grep -v grep | awk '{print $2}' | xargs kill -9")
->>>>>>> 10469649fb8e3a7c21407a8a53956e879cd35721
                     else:
                         break
                 if 'app_msg_list' not in r.json():
@@ -288,11 +261,7 @@ class GongzhonghaoFollow2:
                     Feishu.bot(log_type, crawler, "公众号_2频控啦，请扫码更换其他公众号token\nhttps://mp.weixin.qq.com/")
                     time.sleep(60 * 10)
                     os.system(
-<<<<<<< HEAD
-                        "ps aux | grep run_gongzhonghao_follow_2.py | grep -v grep | awk '{print $2}' | xargs kill -9")
-=======
                         "ps aux | grep run_gongzhonghaofollow_2 | grep -v grep | awk '{print $2}' | xargs kill -9")
->>>>>>> 10469649fb8e3a7c21407a8a53956e879cd35721
                     return
                 elif len(r.json()['app_msg_list']) == 0:
                     Common.logger(log_type, crawler).info('没有更多视频了\n')