diff --git a/models/__init__.py b/models/__init__.py index c99e4ff..e8c02a5 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -14,7 +14,7 @@ pymysql.install_as_MySQLdb() db_config = { 'database': 'lm', 'user': 'lm', - 'password': 'phzEDrRDEeNZ7yFX', + 'password': 'HhyAsGbrrbsJfpyy', 'host': '192.168.1.79', 'port': 3306 } diff --git a/telegram/8619211027341.session b/telegram/8619211027341.session index df12d0b..41d7415 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 bda20cc..c41ebe7 100644 Binary files a/telegram/bot_session.session and b/telegram/bot_session.session differ diff --git a/telegram/sign.db b/telegram/sign.db index e98f8b7..7981048 100644 Binary files a/telegram/sign.db and b/telegram/sign.db differ diff --git a/交易/websea_交易.py b/交易/websea_交易.py index db6ad10..dd8a088 100644 --- a/交易/websea_交易.py +++ b/交易/websea_交易.py @@ -161,13 +161,13 @@ class WeexTransaction: logger.success(f"{datetime.datetime.now()}，第一根信号：{self.kline_1}，{self.kline_2}，开多") self.send_dingtalk_message(f"信号：{self.direction}，开多，开仓金额：{float(num) / 100}") - self.page.ele('x://*[normalize-space(text())= "买入/做多"]').click() + self.page.actions.click('x://*[normalize-space(text())= "买入/做多"]') self.start = 1 elif self.direction == "short" and not self.start: logger.success(f"{datetime.datetime.now()}，第一根信号：{self.kline_1}，{self.kline_2}，开空") self.send_dingtalk_message(f"信号：{self.direction}，开空，开仓金额：{float(num) / 100}") - self.page.ele('x://*[normalize-space(text())= "卖出/做空"]').click() + self.page.actions.click('x://*[normalize-space(text())= "卖出/做空"]') self.start = -1 elif self.direction == "long" and self.start == -1: logger.success(f"{datetime.datetime.now()}，第一根信号：{self.kline_1}，{self.kline_2}，反手平空做多") @@ -175,9 +175,9 @@ class WeexTransaction: self.page.ele('x://*[normalize-space(text())= "市价全平"]').scroll.to_see(center=True) time.sleep(1) - self.page.ele('x://*[normalize-space(text())= "市价全平"]').click() + self.page.actions.click('x://*[normalize-space(text())= "市价全平"]') time.sleep(3) - self.page.ele('x://*[normalize-space(text())= "买入/做多"]').click() + self.page.actions.click('x://*[normalize-space(text())= "买入/做多"]') self.start = 1 elif self.direction == "short" and self.start == 1: logger.success(f"{datetime.datetime.now()}，第一根信号：{self.kline_1}，{self.kline_2}，反手平多做空") @@ -185,9 +185,9 @@ class WeexTransaction: self.page.ele('x://*[normalize-space(text())= "市价全平"]').scroll.to_see(center=True) time.sleep(1) - self.page.ele('x://*[normalize-space(text())= "市价全平"]').click() + self.page.actions.click('x://*[normalize-space(text())= "市价全平"]') time.sleep(3) - self.page.ele('x://*[normalize-space(text())= "卖出/做空"]').click() + self.page.actions.click('x://*[normalize-space(text())= "卖出/做空"]') self.start = -1 def get_now_time(self): @@ -275,11 +275,12 @@ class WeexTransaction: elif resp_data["result"][0]["type"] == 1: self.start = 1 + self.resp_data = resp_data["result"][0] elif resp_data["result"][0]["type"] == 2: self.start = -1 + self.resp_data = resp_data["result"][0] - self.resp_data = resp_data["result"][0] return True except: time.sleep(1) @@ -384,7 +385,7 @@ class WeexTransaction: self.page.ele('x://*[normalize-space(text())= "市价全平"]').scroll.to_see(center=True) time.sleep(1) - self.page.ele('x://*[normalize-space(text())= "市价全平"]').click() + self.page.actions.click('x://*[normalize-space(text())= "市价全平"]') self.start = 0 elif self.start == -1: if is_bullish(self.kline_1) and is_bullish(self.kline_2): @@ -394,7 +395,7 @@ class WeexTransaction: self.page.ele('x://*[normalize-space(text())= "市价全平"]').scroll.to_see(center=True) time.sleep(1) - self.page.ele('x://*[normalize-space(text())= "市价全平"]').click() + self.page.actions.click('x://*[normalize-space(text())= "市价全平"]') self.start = 0 except: self.send_dingtalk_message(message_content=f"止损平仓出错！！！", type=0) @@ -411,11 +412,18 @@ class WeexTransaction: self.pbar.reset() # 重置进度条 + if self.get_position_status(): + logger.info("获取仓位信息成功!!!") + else: + logger.info("获取仓位信息失败！！！") + + self.send_dingtalk_message(message_content=f"获取仓位信息失败！！！", type=0) + return # =============================================================================================== num = self.get_num() if self.start: # 提取并转换 - direction = "多" if int(self.resp_data['type']) == 2 else "空" + direction = "多" if int(self.resp_data['type']) == 1 else "空" contracts = int(self.resp_data['number']) # 张数 eth_amount = float(self.resp_data['numberConvert']) # ETH数量 open_price = float(self.resp_data['openPriceAvg']) diff --git a/推特/main.py b/推特/main.py index c334689..0d002bd 100644 --- a/推特/main.py +++ b/推特/main.py @@ -582,6 +582,9 @@ Win–win benefits — don’t miss out! 🚀 tab.actions.scroll(delta_y=random.randint(400, 800)) time.sleep(random.randint(3, 10)) + def 回复(self): + self.page.get('https://x.com/Websea_MY/status/1999305458566463782') + # def action(self): @@ -699,7 +702,8 @@ def run_work(x_token_info, xstart_info): # except: # pass - hub.to_do_tui() # 发推 + # hub.to_do_tui() # 发推 + hub.回复() # 发推 # hub.FollowTwitterAccount() # 关注