作者 陈俊学

2.0.7

修改quit 为close,避免浏览器卡死退出。
@@ -4,5 +4,5 @@ SERVER: @@ -4,5 +4,5 @@ SERVER:
4 reconnect_interval: 3 4 reconnect_interval: 3
5 5
6 VERSION: 6 VERSION:
7 - code: 96  
8 - name: 2.0.6  
  7 + code: 97
  8 + name: 2.0.7
@@ -207,15 +207,15 @@ class Monitor(callback.CallBack): @@ -207,15 +207,15 @@ class Monitor(callback.CallBack):
207 time.sleep(2) 207 time.sleep(2)
208 if 'checkpoint' in browser.current_url: 208 if 'checkpoint' in browser.current_url:
209 self.onChangEnv(email, 'changeError', '登录失败:帐号封锁') 209 self.onChangEnv(email, 'changeError', '登录失败:帐号封锁')
210 - browser.quit() 210 + browser.close()
211 return False, email, password, cookie_, user_agent_ 211 return False, email, password, cookie_, user_agent_
212 if 'login_attempt' in browser.current_url: 212 if 'login_attempt' in browser.current_url:
213 self.onChangEnv(email, 'changeError', '登录失败:帐号密码错误') 213 self.onChangEnv(email, 'changeError', '登录失败:帐号密码错误')
214 - browser.quit() 214 + browser.close()
215 return False, email, password, cookie_, user_agent_ 215 return False, email, password, cookie_, user_agent_
216 if 'c_user' not in cookie_: 216 if 'c_user' not in cookie_:
217 self.onChangEnv(email, 'changeError', '登录失败,请检查帐号密码,或者重试') 217 self.onChangEnv(email, 'changeError', '登录失败,请检查帐号密码,或者重试')
218 - browser.quit() 218 + browser.close()
219 return False, email, password, cookie_, user_agent_ 219 return False, email, password, cookie_, user_agent_
220 browser.get(mainUrl) 220 browser.get(mainUrl)
221 page_source = browser.page_source 221 page_source = browser.page_source
@@ -225,7 +225,7 @@ class Monitor(callback.CallBack): @@ -225,7 +225,7 @@ class Monitor(callback.CallBack):
225 click_list = ['动态消息', '加好友请求', '通知', '搜索', '更多'] 225 click_list = ['动态消息', '加好友请求', '通知', '搜索', '更多']
226 else: 226 else:
227 self.onChangEnv(email, 'changeError', '未知语言类型,请联系小陈添加') 227 self.onChangEnv(email, 'changeError', '未知语言类型,请联系小陈添加')
228 - browser.quit() 228 + browser.close()
229 return False, email, password, cookie_, user_agent_ 229 return False, email, password, cookie_, user_agent_
230 action_list = random.sample(click_list, 5) 230 action_list = random.sample(click_list, 5)
231 print('随机动作', action_list) 231 print('随机动作', action_list)
@@ -234,14 +234,14 @@ class Monitor(callback.CallBack): @@ -234,14 +234,14 @@ class Monitor(callback.CallBack):
234 self.onChangEnv(email, 'changeMatching', f'匹配设备指纹{i + 1}...') 234 self.onChangEnv(email, 'changeMatching', f'匹配设备指纹{i + 1}...')
235 browser.find_element_by_name(action).click() 235 browser.find_element_by_name(action).click()
236 browser.get('https://m.facebook.com/home.php') 236 browser.get('https://m.facebook.com/home.php')
237 - browser.quit() 237 + browser.close()
238 return True, email, password, cookie_, user_agent_ 238 return True, email, password, cookie_, user_agent_
239 except Exception as err: 239 except Exception as err:
240 self.onChangEnv(email, 'changeError', str(err)) 240 self.onChangEnv(email, 'changeError', str(err))
241 - browser.quit() 241 + browser.close()
242 return False, email, password, cookie, user_agent 242 return False, email, password, cookie, user_agent
243 finally: 243 finally:
244 - browser.quit() 244 + browser.close()
245 return False, email, password, cookie, user_agent 245 return False, email, password, cookie, user_agent
246 246
247 def logout(self, email): 247 def logout(self, email):