diff --git a/telegram/8619211027341.session b/telegram/8619211027341.session index 32b24cb..5f4fdd8 100644 Binary files a/telegram/8619211027341.session and b/telegram/8619211027341.session differ diff --git a/telegram/bot_session.session b/telegram/bot_session.session index a46661f..e8bc5fd 100644 Binary files a/telegram/bot_session.session and b/telegram/bot_session.session differ diff --git a/交易/bitmart_交易.py b/交易/bitmart_交易.py index fe9d2a2..fa6c9ae 100644 --- a/交易/bitmart_交易.py +++ b/交易/bitmart_交易.py @@ -34,6 +34,8 @@ class WeexTransaction: self.kline_1 = None # 0:跌,1:涨 self.kline_2 = None # 0:跌,1:涨 + self.kline_1 = self.kline_2 = self.kline_3 = None + self.direction = None # 信号类型 self.pbar = None # 进度条对象 @@ -378,12 +380,13 @@ 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 + if self.get_now_time() != int(self.kline_3["id"]): + 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("获取最新价格有问题!!!") @@ -406,7 +409,7 @@ class WeexTransaction: self.time_start = self.get_now_time() - + self.page.get(url="https://derivatives.bitmart.com/zh-CN/futures/ETHUSDT") # 打开网页 if self.get_position_status(): logger.info("获取仓位信息成功!!!") diff --git a/交易/websea_交易.py b/交易/websea_交易.py index 7d28102..1d14f47 100644 --- a/交易/websea_交易.py +++ b/交易/websea_交易.py @@ -34,6 +34,8 @@ class WeexTransaction: self.kline_1 = None # 0:跌,1:涨 self.kline_2 = None # 0:跌,1:涨 + self.kline_1 = self.kline_2 = self.kline_3 = None + self.direction = None # 信号类型 self.pbar = None # 进度条对象 @@ -333,7 +335,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 @@ -356,6 +358,8 @@ class WeexTransaction: self.time_start = self.get_now_time() + self.page.get(url="https://www.websea.com/zh-CN/futures/ETH-USDT") # 打开网页 + if self.get_token(): # 获取token logger.info("获取token成功!!!") else: diff --git a/交易/weex_交易.py b/交易/weex_交易.py index d43b910..c33888e 100644 --- a/交易/weex_交易.py +++ b/交易/weex_交易.py @@ -41,6 +41,8 @@ class WeexTransaction: self.kline_1 = None # 0:跌,1:涨 self.kline_2 = None # 0:跌,1:涨 + self.kline_1 = self.kline_2 = self.kline_3 = None + self.direction = None # 信号类型 self.pbar = None # 进度条对象 @@ -252,16 +254,22 @@ class WeexTransaction: def get_token(self): tab = self.page.new_tab() - tab.listen.start("gateway2.ngsvsfx.cn/v1/user/security/getLanguageType") - tab.get(url="https://www.weeaxs.site/zh-CN/futures/ETH-USDT") + tab.listen.start("/user/security/getLanguageType") - res = tab.listen.wait() - self.headers = res.request.headers + for i in range(3): + tab.get(url="https://www.weeaxs.site/zh-CN/futures/ETH-USDT") - self.session.headers.update(self.headers) + res = tab.listen.wait(timeout=15) + if res.request.headers.get("U-TOKEN"): + self.headers = res.request.headers - tab.close() - return True + self.session.headers.update(self.headers) + + tab.close() + return True + else: + tab.close() + return False def get_position_status(self): json_data = { @@ -335,17 +343,18 @@ class WeexTransaction: self.pbar.n = current_minute - 30 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 [0, 1, 2, 3, 4, 5, 30, 31, 32, 33, 34, 35]: # 判断是否是 新的30分钟了 + # if current_minute not in range(60): # 判断是否是 新的30分钟了 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 + if self.get_now_time() != self.kline_3["id"]: + 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: @@ -365,6 +374,8 @@ class WeexTransaction: self.time_start = self.get_now_time() + self.page.get(url="https://www.weeaxs.site/zh-CN/futures/ETH-USDT") # 打开网页 + if self.get_position_status(): logger.info("获取仓位信息成功!!!") else: