5.1.9

1.采集服务增加区别使用

@@ -5,5 +5,5 @@ SERVER:
  control: http://fbchat.xyz:39002/api/terminal
  control: http://fbchat.xyz:39002/api/terminal
  mark: ntkj
  mark: ntkj
 VERSION:
 VERSION:
- code: 518
- name: 5.1.8
+ code: 519
+ name: 5.1.9

@@ -64,7 +64,7 @@ class CallBack():
 
 
  def onLoggingIn(self, email, password, cookie, user_agent=None, proxy=None, approvals_code: list = None,
  def onLoggingIn(self, email, password, cookie, user_agent=None, proxy=None, approvals_code: list = None,
  clear: bool = False, is_second: bool = False, adId=None, deviceId=None, familyDeviceId=None,
  clear: bool = False, is_second: bool = False, adId=None, deviceId=None, familyDeviceId=None,
- machineId=None, is_collect=False):
+ machineId=None, is_collect=False, user_mark=None):
  if clear:
  if clear:
  print('清理缓存登录', email)
  print('清理缓存登录', email)
  try:
  try:
@@ -103,6 +103,7 @@ class CallBack():
  user_obj.approvals_code = approvals_code # 设置安全码
  user_obj.approvals_code = approvals_code # 设置安全码
  user_obj.is_second = is_second # 是否是二次登录
  user_obj.is_second = is_second # 是否是二次登录
  user_obj.is_collect = is_collect
  user_obj.is_collect = is_collect
+ user_obj.user_mark = user_mark # 用户标记
  return user_obj
  return user_obj
 
 
  def onLoggedIn(self, client: FacebookClient):
  def onLoggedIn(self, client: FacebookClient):
@@ -129,9 +130,11 @@ class CallBack():
  try:
  try:
  threading.Thread(target=redis.set, kwargs={'name': client.user_obj.email, 'value': redis_save}).start()
  threading.Thread(target=redis.set, kwargs={'name': client.user_obj.email, 'value': redis_save}).start()
  threading.Thread(target=redis.set, kwargs={'name': client.user_obj.fbid, 'value': redis_save}).start()
  threading.Thread(target=redis.set, kwargs={'name': client.user_obj.fbid, 'value': redis_save}).start()
- if client.user_obj.is_collect or redis.exists(f'collect:{client.user_obj.fbid}'):
+ if client.user_obj.is_collect or redis.exists(
+ f'collect:{client.user_obj.fbid}') and client.user_obj.user_mark is not None:
  threading.Thread(target=redis.set,
  threading.Thread(target=redis.set,
- kwargs={'name': f'collect:{client.user_obj.fbid}', 'value': redis_save}).start()
+ kwargs={'name': f'collect:{client.user_obj.user_mark}:{client.user_obj.fbid}',
+ 'value': redis_save}).start()
  print('保存redis成功', redis_save)
  print('保存redis成功', redis_save)
  except BaseException as e:
  except BaseException as e:
  print('保存redis失败', e)
  print('保存redis失败', e)

@@ -80,7 +80,7 @@ class Monitor(callback.CallBack):
 
 
  def login(self, email, password, cookie=None, user_agent=None, proxy=None, approvals_code: list = None,
  def login(self, email, password, cookie=None, user_agent=None, proxy=None, approvals_code: list = None,
  clear: bool = False, is_second: bool = False, adId=None, deviceId=None,
  clear: bool = False, is_second: bool = False, adId=None, deviceId=None,
- familyDeviceId=None, machineId=None, is_collect: bool = False):
+ familyDeviceId=None, machineId=None, is_collect: bool = False, user_mark: str = None):
  """
  """
  登录facebook帐号
  登录facebook帐号
  """
  """
@@ -100,7 +100,7 @@ class Monitor(callback.CallBack):
  if user_agent is None or user_agent == '':
  if user_agent is None or user_agent == '':
  user_agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.135 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.135 Safari/537.36'
  obj = self.onLoggingIn(email, password, cookie, user_agent, proxy, approvals_code, clear, is_second,
  obj = self.onLoggingIn(email, password, cookie, user_agent, proxy, approvals_code, clear, is_second,
- adId, deviceId, familyDeviceId, machineId,is_collect)
+ adId, deviceId, familyDeviceId, machineId, is_collect, user_mark)
  try:
  try:
  # client = FacebookClient(obj, logout_call=functools.partial(self.logout, obj.email),
  # client = FacebookClient(obj, logout_call=functools.partial(self.logout, obj.email),
  # logging_level=logging.INFO, client=self)
  # logging_level=logging.INFO, client=self)

@@ -107,7 +107,7 @@ class Session(Session_):
  'token': obj.token})
  'token': obj.token})
  threading.Thread(target=redis.set, kwargs={'name': obj.email, 'value': redis_save}).start()
  threading.Thread(target=redis.set, kwargs={'name': obj.email, 'value': redis_save}).start()
  threading.Thread(target=redis.set, kwargs={'name': obj.fbid, 'value': redis_save}).start()
  threading.Thread(target=redis.set, kwargs={'name': obj.fbid, 'value': redis_save}).start()
- if redis.exists(f'collect:{obj.fbid}'):
+ if redis.exists(f'collect:{obj.user_mark}:{obj.fbid}'):
  threading.Thread(target=redis.set,
  threading.Thread(target=redis.set,
  kwargs={'name': f'collect:{obj.fbid}',
  kwargs={'name': f'collect:{obj.fbid}',
  'value': redis_save}).start()
  'value': redis_save}).start()