diff --git a/bit_tools.py b/bit_tools.py index 72e5328..cea8a63 100644 --- a/bit_tools.py +++ b/bit_tools.py @@ -242,21 +242,21 @@ if __name__ == '__main__': # print(browser_detail(id="532651f5330e4caa917e644f9b676b")) - # 批量修改代理 - for i in Xstart.select(): - update_proxy_Browser(id=i.bit_id, proxyType="http", host="104.168.59.92", port=random.randint(20001, 25000), ) + # # 批量修改代理 + # for i in Xstart.select(): + # update_proxy_Browser(id=i.bit_id, proxyType="http", host="104.168.59.92", port=random.randint(20001, 25000), ) - # fz_datas = get_group_lists() - # print(fz_datas) - # bit_id_list = [] - # for i in XToken.select().where(XToken.start.is_null(False)): - # sql_info = Xstart.get_or_none( - # Xstart.x_id == i.id - # ) - # - # bit_id_list.append(sql_info.bit_id) - # - # print(len(bit_id_list)) - # print(bit_id_list) - # - # print(group_update(fz_datas["英语"], bit_id_list)) + fz_datas = get_group_lists() + print(fz_datas) + bit_id_list = [] + for i in XToken.select().where(XToken.account_start == 2): + sql_info = Xstart.get_or_none( + Xstart.x_id == i.id + ) + + bit_id_list.append(sql_info.bit_id) + + print(len(bit_id_list)) + print(bit_id_list) + + print(group_update(fz_datas["西班牙语"], bit_id_list)) diff --git a/telegram/8619211027341.session b/telegram/8619211027341.session index e6edf78..32b24cb 100644 Binary files a/telegram/8619211027341.session and b/telegram/8619211027341.session differ diff --git a/telegram/8619211027341.session-journal b/telegram/8619211027341.session-journal deleted file mode 100644 index e69de29..0000000 diff --git a/telegram/bot_session.session b/telegram/bot_session.session index d8c7ce8..a46661f 100644 Binary files a/telegram/bot_session.session and b/telegram/bot_session.session differ diff --git a/交易/bitmart_交易.py b/交易/bitmart_交易.py index 7d873f4..fe9d2a2 100644 --- a/交易/bitmart_交易.py +++ b/交易/bitmart_交易.py @@ -378,6 +378,12 @@ class WeexTransaction: time.sleep(10) continue + if self.get_token(): # 获取token + logger.info("获取token成功!!!") + else: + logger.info("获取token失败!!!") + self.send_dingtalk_message(message_content=f"获取token失败!!!", type=0) + continue new_price_datas = self.get_price() if not new_price_datas: logger.info("获取最新价格有问题!!!") @@ -400,12 +406,7 @@ class WeexTransaction: self.time_start = self.get_now_time() - if self.get_token(): # 获取token - logger.info("获取token成功!!!") - else: - logger.info("获取token失败!!!") - self.send_dingtalk_message(message_content=f"获取token失败!!!", type=0) - continue + if self.get_position_status(): logger.info("获取仓位信息成功!!!") diff --git a/交易/websea_交易.py b/交易/websea_交易.py index 1fc4ebc..7d28102 100644 --- a/交易/websea_交易.py +++ b/交易/websea_交易.py @@ -333,7 +333,7 @@ class WeexTransaction: self.pbar.refresh() if current_minute not in [0, 1, 2, 3, 4, 5, 30, 31, 32, 33, 34, ]: # 判断是否是 新的30分钟了 - # if current_minute not in range(60): # 判断是否是 新的30分钟了 + # if current_minute not in range(60): # 判断是否是 新的30分钟了 time.sleep(10) continue diff --git a/交易/weex_交易.py b/交易/weex_交易.py index af54161..d43b910 100644 --- a/交易/weex_交易.py +++ b/交易/weex_交易.py @@ -336,7 +336,7 @@ class WeexTransaction: self.pbar.refresh() if current_minute not in [0, 1, 2, 3, 4, 5, 30, 31, 32, 33, 34, ]: # 判断是否是 新的30分钟了 - # if current_minute not in range(60): # 判断是否是 新的30分钟了 + # if current_minute not in range(60): # 判断是否是 新的30分钟了 time.sleep(10) continue diff --git a/推特/main.py b/推特/main.py index 1176e06..aedc7da 100644 --- a/推特/main.py +++ b/推特/main.py @@ -709,7 +709,7 @@ if __name__ == '__main__': # time.sleep(random.randint(15, 60)) # 同时运行 - max_threads = 8 + max_threads = 3 delay_between_start = 15 # 每次启动线程之间的延迟时间(秒) with ThreadPoolExecutor(max_workers=max_threads) as executor: