新增UA缓存持久化

@@ -26,19 +26,24 @@ class CallBack():
  def _task_(self, type_, client, taskid: int, code: int, msg: dict = None):
  def _task_(self, type_, client, taskid: int, code: int, msg: dict = None):
  print('【%s】' % type_, code, msg)
  print('【%s】' % type_, code, msg)
 
 
- def onLoggingIn(self, email, password, cookie):
+ def onLoggingIn(self, email, password, cookie, user_agent=None):
  user_obj = UserList.get(email=email)
  user_obj = UserList.get(email=email)
  if not user_obj:
  if not user_obj:
- user_obj = UserList.insert(email=email, password=password, status=Status.LOGGINE, cookie=cookie)
+ user_obj = UserList.insert(email=email, password=password, status=Status.LOGGINE, cookie=cookie,
+ user_agent=user_agent)
  else:
  else:
  user_obj.set(status=Status.LOGGINE)
  user_obj.set(status=Status.LOGGINE)
 
 
  return user_obj
  return user_obj
 
 
  def onLoggedIn(self, client: FacebookClient):
  def onLoggedIn(self, client: FacebookClient):
- client.user_obj.set(fbid=client.uid,
- status=Status.ONLINE,
- cookie=client.get_cookie())
+ client.user_obj.set(
+ fbid=client.uid,
+ status=Status.ONLINE,
+ cookie=client.get_cookie(),
+ user_agent=client.get_user_agent()
+ )
+
  self._notify_(
  self._notify_(
  type_="account",
  type_="account",
  client=client,
  client=client,

@@ -58,13 +58,13 @@ class Monitor(callback.CallBack):
  cfunc = functools.partial(mfunc, client)
  cfunc = functools.partial(mfunc, client)
  setattr(client, fname, cfunc)
  setattr(client, fname, cfunc)
 
 
- def login(self, email, password, cookie=None):
+ def login(self, email, password, cookie=None, user_agent=None):
  client = self._get_member(email)
  client = self._get_member(email)
  if client:
  if client:
  self.onLoggedIn(client) # 已登录就直接触发登录成功
  self.onLoggedIn(client) # 已登录就直接触发登录成功
  return client.info()
  return client.info()
  else:
  else:
- obj = self.onLoggingIn(email, password, cookie) # 返回db中的user对象
+ obj = self.onLoggingIn(email, password, cookie, user_agent) # 返回db中的user对象
  try:
  try:
  client = FacebookClient(obj)
  client = FacebookClient(obj)
  client.user_obj = obj
  client.user_obj = obj
@@ -168,7 +168,7 @@ class Monitor(callback.CallBack):
  type_ = cmd.get('type')
  type_ = cmd.get('type')
  taskid = int(cmd.get('taskId'))
  taskid = int(cmd.get('taskId'))
  target = cmd.get('object')
  target = cmd.get('object')
- payload = cmd.get('data', '{}') # str or jsonstr
+ payload = cmd.get('data', '{}') # str or jsonstr or dict
 
 
  if type_ == 'login':
  if type_ == 'login':
  kwargs = parameter.join(self.login, payload)
  kwargs = parameter.join(self.login, payload)

 #!/usr/bin/env python
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
-# @Time : 2020-02-15 17:30
-# @Author : Lemon
-# @File : control_server.py
-# @Software: PyCharm
 
 
 import requests
 import requests
 
 

@@ -147,13 +147,13 @@ class RequestSource():
 class FacebookClient(Client):
 class FacebookClient(Client):
  def __init__(self,
  def __init__(self,
  user_obj,
  user_obj,
- user_agent=None,
  max_tries=1):
  max_tries=1):
 
 
  self.email = user_obj.email
  self.email = user_obj.email
  self.user_obj = user_obj
  self.user_obj = user_obj
  self.extend = None
  self.extend = None
- super().__init__(user_obj.email, user_obj.password, user_agent, max_tries, user_obj.format_cookie())
+
+ super().__init__(user_obj.email, user_obj.password, user_obj.user_agent, max_tries, user_obj.format_cookie())
 
 
  def __repr__(self):
  def __repr__(self):
  return "client：%s" % self.email
  return "client：%s" % self.email
@@ -710,3 +710,6 @@ class FacebookClient(Client):
  if 'Arbiter.inform' in onloads:
  if 'Arbiter.inform' in onloads:
  return {"success": True}
  return {"success": True}
  raise BaseException("未知错误:" + onloads)
  raise BaseException("未知错误:" + onloads)
+
+ def get_user_agent(self):
+ return self._state._session.headers.get('User-Agent', random.choice(_util.USER_AGENTS))

@@ -69,6 +69,7 @@ class UserList(Base):
  email = Column(String(50), index=True, nullable=False, unique=True)
  email = Column(String(50), index=True, nullable=False, unique=True)
  password = Column(String(50), nullable=False)
  password = Column(String(50), nullable=False)
  cookie = Column(String(512))
  cookie = Column(String(512))
+ user_agent = Column(String(256))
  fbid = Column(String(20), index=True)
  fbid = Column(String(20), index=True)
  status = Column(Integer, default=0, nullable=False, index=True)
  status = Column(Integer, default=0, nullable=False, index=True)
 
 
@@ -149,9 +150,11 @@ class UserList(Base):
  return users
  return users
 
 
 
 
+# Base.metadata.drop_all(engine)
 Base.metadata.create_all(engine)
 Base.metadata.create_all(engine)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
+ print(UserList.all())
  # def tes(email):
  # def tes(email):
  # u = UserList.get(email=email)
  # u = UserList.get(email=email)
  # u.set(status=3)
  # u.set(status=3)