diff --git a/bit_tools.py b/bit_tools.py index 73970fd..548bcbd 100644 --- a/bit_tools.py +++ b/bit_tools.py @@ -1,11 +1,5 @@ -import requests import json -import time - -# 官方文档地址 -# https://doc2.bitbrowser.cn/jiekou/ben-di-fu-wu-zhi-nan.html - -# 此demo仅作为参考使用,以下使用的指纹参数仅是部分参数,完整参数请参考文档 +import requests url = "http://127.0.0.1:54345" headers = {'Content-Type': 'application/json'} @@ -13,20 +7,25 @@ tg_url = "https://web.telegram.org/a/" def createBrowser( - groupId=None + groupId=None, + host=None, + port=None, + proxyUserName=None, + proxyPassword=None ): # 创建或者更新窗口,指纹参数 browserFingerPrint 如没有特定需求,只需要指定下内核即可,如果需要更详细的参数,请参考文档 json_data = { "groupId": groupId, # 分组id 'name': 'google', # 窗口名称 'remark': '', # 备注 - 'proxyMethod': 2, # 代理方式 2自定义 3 提取IP + 'proxyMethod': 1, # 代理方式 2自定义 3 提取IP # 代理类型 ['noproxy', 'http', 'https', 'socks5', 'ssh'] - 'proxyType': 'noproxy', - 'host': '', # 代理主机 - 'port': '', # 代理端口 - 'proxyUserName': '', # 代理账号 + 'proxyType': 'socks5', + 'host': host, # 代理主机EE + 'port': port, # 代理端口 + 'proxyUserName': proxyUserName, # 代理账号 + 'proxyPassword': proxyPassword, # 代理账号 "browserFingerPrint": { # 指纹对象 - 'coreVersion': '124' # 内核版本,注意,win7/win8/winserver 2012 已经不支持112及以上内核了,无法打开 + 'coreVersion': '140' # 内核版本,注意,win7/win8/winserver 2012 已经不支持112及以上内核了,无法打开 } } @@ -150,22 +149,3 @@ def group_add(groupName): res = requests.post(f'{url}/group/add', data=json.dumps(json_data), headers=headers) return res.json() - - -# if __name__ == '__main__': -# for i in get_group_lists(): -# print(i) - -# pass -# browser_id = createBrowser() -# openBrowser(browser_id) -# -# time.sleep(10) # 等待10秒自动关闭窗口 -# -# closeBrowser(browser_id) -# -# time.sleep(10) # 等待10秒自动删掉窗口 -# -# deleteBrowser(browser_id) - -# deleteBrowser(id="43f0d0978f6a4bb7bbcb0b7786f436e9") diff --git a/推特/main.py b/推特/main.py index ec3d05a..248b8e7 100644 --- a/推特/main.py +++ b/推特/main.py @@ -6,14 +6,14 @@ from concurrent.futures import ThreadPoolExecutor from DrissionPage import ChromiumOptions, ChromiumPage from peewee import fn -from bit_tools import openBrowser +from bit_tools import openBrowser, createBrowser from models.ips import Ips from models.xstart import Xstart from models.xtoken import XToken class Hub_Web: - def __init__(self, xstart_info,x_info): + def __init__(self, xstart_info, x_info): self.xstart_info = xstart_info self.x_info = x_info @@ -280,6 +280,22 @@ class Hub_Web: self.ips_info = Ips.select().order_by(fn.Rand()).get() + if not self.xstart_info.bit_id: + self.xstart_info.ip_id = self.ips_info.id + self.xstart_info.save() + + logger.info("没有浏览器,创建中。。。") + + bit_id = createBrowser( + host=self.ips_info.host, + port=int(self.ips_info.port), + proxyUserName=self.ips_info.username, + proxyPassword=self.ips_info.password, + ) + + self.xstart_info.bit_id = bit_id + self.xstart_info.save() + if self.get_page(): logger.info(f"推特名字:{self.x_info.user_name},浏览器打开成功") else: @@ -333,12 +349,11 @@ if __name__ == '__main__': for x_token_info in XToken.select(): xstart_info = Xstart.get_or_create( - x_id = x_token_info.id, + x_id=x_token_info.id, ) - hun_web = Hub_Web(x_info = x_token_info,xstart_info=xstart_info) + hun_web = Hub_Web(x_info=x_token_info, xstart_info=xstart_info) executor.submit(hun_web.action) time.sleep(delay_between_start) -# JagadeeshHubba3----BAKXhW7GNJqK----qatuxm71323@outlook.com----uqxxe78352|7zLR62i9f@wmhotmail.com|32yGAF----MF4J2WVC4E5MDXLZ----b09b4984695f5928ea432da9e2bfb86cc41b1c82