diff --git a/telegram/8619211027341.session b/telegram/8619211027341.session index 2225e31..cec6329 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 ddfc2f1..4d41da5 100644 Binary files a/telegram/bot_session.session and b/telegram/bot_session.session differ diff --git a/telegram/gpt1.py b/telegram/gpt1.py index 03dc0ae..d7d18cd 100644 --- a/telegram/gpt1.py +++ b/telegram/gpt1.py @@ -642,7 +642,7 @@ async def send_price_periodically(bot, chat_id): print(f"[price] Failed to send price update: {e}") # 等待下一小时整点(保持每小时推送一次) now = datetime.datetime.now(LOCAL_TZ) - next_hour = (now.replace(minute=0, second=0, microsecond=0) + datetime.timedelta(hours=1)) + next_hour = (now.replace(minute=0, second=0, microsecond=0) + datetime.timedelta(hours=2)) wait_seconds = (next_hour - now).total_seconds() await asyncio.sleep(wait_seconds) diff --git a/telegram/sign.db b/telegram/sign.db index c44a4fe..3bb0722 100644 Binary files a/telegram/sign.db and b/telegram/sign.db differ diff --git a/交易/bitmart-趋势策略交易.py b/交易/bitmart-趋势策略交易.py index 081ba48..4a2d23b 100644 --- a/交易/bitmart-趋势策略交易.py +++ b/交易/bitmart-趋势策略交易.py @@ -1,6 +1,6 @@ import time import datetime -import openBrowser + from tqdm import tqdm from loguru import logger diff --git a/交易/weex-结构优化.py b/交易/weex-结构优化.py index d9d9c6b..1414aff 100644 --- a/交易/weex-结构优化.py +++ b/交易/weex-结构优化.py @@ -27,7 +27,7 @@ class Config: KLINE_LIMIT = 300 # 交易页面URL - TRADING_URL = "https://www.weeaxs.site/zh-CN/futures/ETH-USDT" + TRADING_URL = "https://www.weex.com/zh-CN/futures/ETH-USDT" # 交易配置 POSITION_RATIO = 100 # 开仓金额比例(余额的1/100) @@ -355,9 +355,9 @@ class TradingExecutor: def close_all_positions(self) -> bool: """平仓所有持仓(闪电平仓)""" try: - self.page.ele('x://*[contains(text(), "闪电平仓")]').scroll.to_see(center=True) + self.page.ele('x:(//span[normalize-space(text()) = "闪电平仓"])').scroll.to_see(center=True) time.sleep(1) - self.page.ele('x://*[contains(text(), "闪电平仓")]').click() + self.page.ele('x:(//span[normalize-space(text()) = "闪电平仓"])').click() time.sleep(3) logger.success("成功执行平仓操作") return True @@ -370,7 +370,7 @@ class TradingExecutor: try: self.page.ele('x://input[@placeholder="请输入数量"]').input(amount) time.sleep(1) - self.page.ele('x://*[contains(text(), "买入开多")]').click() + self.page.ele('x://*[normalize-space(text()) ="买入开多"]').click(by_js=True) logger.success(f"成功开多,金额:{amount}") return True except Exception as e: @@ -382,7 +382,7 @@ class TradingExecutor: try: self.page.ele('x://input[@placeholder="请输入数量"]').input(amount) time.sleep(1) - self.page.ele('x://*[contains(text(), "卖出开空")]').click() + self.page.ele('x://*[normalize-space(text()) ="卖出开空"]').click(by_js=True) logger.success(f"成功开空,金额:{amount}") return True except Exception as e: @@ -810,7 +810,7 @@ class WeexTransaction: MessageSender.send_dingtalk_message("获取可用余额失败", is_error=True) return - amount = balance / Config.POSITION_RATIO + amount = int(balance / 100) # 执行交易 trade_executed = self.trading_executor.execute_trade(