diff --git a/conf/config.yaml b/conf/config.yaml index 40ee4d8..f686b95 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -4,5 +4,5 @@ SERVER: reconnect_interval: 3 VERSION: - code: 89 - name: 1.9.9 \ No newline at end of file + code: 90 + name: 2.0.0 \ No newline at end of file diff --git a/core/monitor.py b/core/monitor.py index 952a99d..0f68d41 100644 --- a/core/monitor.py +++ b/core/monitor.py @@ -203,16 +203,15 @@ class Monitor(callback.CallBack): self.onChangEnv(email, 'changeError', '登录失败,请检查帐号密码,或者重试') browser.close() return False, email, password, cookie_, user_agent_ - # browser.get(mainUrl) - # click_list = ['News Feed', 'Friend Requests', 'Notifications', 'Search', 'More'] - # action_list = random.sample(click_list, 5) - # print('随机动作', action_list) - # for i, action in enumerate(action_list): - # print(email, action) - # self.onChangEnv(email, 'changeMatching', f'匹配设备指纹{i + 1}...') - # browser.find_element_by_name(action).click() - # browser.get('https://m.facebook.com/home.php') - # time.sleep(random.randint(1, 3)) + browser.get(mainUrl) + click_list = ['News Feed', 'Friend Requests', 'Notifications', 'Search', 'More'] + action_list = random.sample(click_list, 5) + print('随机动作', action_list) + for i, action in enumerate(action_list): + print(email, action) + self.onChangEnv(email, 'changeMatching', f'匹配设备指纹{i + 1}...') + browser.find_element_by_name(action).click() + browser.get('https://m.facebook.com/home.php') browser.close() return True, email, password, cookie_, user_agent_ diff --git a/lib/state.py b/lib/state.py index fbd4df4..d01aa0d 100644 --- a/lib/state.py +++ b/lib/state.py @@ -84,11 +84,10 @@ class PCState(State): sec-fetch-site: none sec-fetch-user: ?1 upgrade-insecure-requests: 1 - user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36 + user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36 viewport-width: 1440''' session.headers.update({k: v for k, v in [h.strip().split(': ', maxsplit=1) for h in header.split('\n') if h]}) session.headers["User-Agent"] = user_agent or cls.random_useragent() - if is_mobile(session.headers["User-Agent"]): session.headers["Referer"] = "https://m.facebook.com/" setattr(session, 'mobile', True)