From 3eec7e45aa9424546f914f7d041ed16906593d3d Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 21 Jan 2026 18:14:14 +0800 Subject: [PATCH] =?UTF-8?q?bitmart=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- telegram/8619211027341.session | Bin 45056 -> 45056 bytes telegram/bot_session.session | Bin 69632 -> 69632 bytes telegram/sign.db | Bin 49152 -> 49152 bytes 交易/weex-结构优化.py | 29 ++++++++++++++++++++++------- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/telegram/8619211027341.session b/telegram/8619211027341.session index fdd0e2bb17d2ba06302c4baa7a461da754b8e860..3aa9b5fa3ef50c1942e2723201a0b0513316ebac 100644 GIT binary patch delta 67 zcmV-J0KETz-~xc)0+1U4&XF8L0nV{trELlALE2m?rRP3RlMZem1)FJbrjfHVZpZ`z Zrk1n)a*_c8rkAskbRs(frk0bnuS?q)9hLw9 delta 67 zcmZp8z|`=7X@WFk)m5! X|1Fxt$mHn1d18r@HIP4f>w0ehYZ4it diff --git a/telegram/bot_session.session b/telegram/bot_session.session index ecb8b348a95b151291906fe04f32396ed599148b..5d816b2214207b9be54acd6ee0fc9c710ea3433a 100644 GIT binary patch delta 147 zcmZozz|ydQWr7sbHHnEbPC#;Ff>ORThp6MN7|q?2?k*K%U}IopVPTRtF0y`}S+H!< zdm{lbvr(2{%F7Tg|uErCGD{Z`}?8NFe?S69GqQmD0Rw2k zjtV7_-5~?lJ;HwX?DLPZpYx BIywLV diff --git a/telegram/sign.db b/telegram/sign.db index c51b303b8397a1e21c2fbb29c6f1e8e39859e0de..fddad46dec0746d31e29bf7586f5e44750040645 100644 GIT binary patch delta 352 zcmZo@U~Xt&o*>Q0Gf~Ewk!NE9qlor2BLgEdT?0d1BSWd_hc140Vq=hJROBd5Nh>KT zEKe=hK*(?I5h>+n;gevHo6M?U&Bc3#?=+tTp9IhQ&4C6>c_zQtc`7Di!NRJ@$-tO0 zWx@x9#>uaA^%;LmmeSiOCSnOuP!Upj2%%u}Lp^0iIXT{F2L7ph+`R34yZOv{@ADS& zRr1c|f6cGXZ_67!S(KeKTJN delta 282 zcmZo@U~Xt&o*>Q0Hc`fzk!@oFqlk8ok%5t!u7RPhp_$b5Ll-|gu`$RqDsmL3q?HsE zmZz4>A>=prh?H`(@Lpk%narwS&BZ4HfjsXw2O2EpnfzYosTiLGgP0;G17lP~$|jgb zBZJAWboCiePnOc#D8}~#qM&Dy))bfmL(|O<^^_THL&sWJi zm;W`tI=}5?B?Bcc{;T{~c?*GX^JYPZ^E{I!ZJl)Zg&CX}85o;;bo&vexd26VfTGWK n?es^8I&W^bt#D%ewyA-|fLWdG!DRLg{u>*+*fu}droagRx-d=y diff --git a/交易/weex-结构优化.py b/交易/weex-结构优化.py index 49a471b..d0a66b8 100644 --- a/交易/weex-结构优化.py +++ b/交易/weex-结构优化.py @@ -276,7 +276,8 @@ class WEEXApiClient: for attempt in range(Config.MAX_RETRY_ATTEMPTS): try: response = self.session.post( - 'https://http-gateway2.ngsvsfx.cn/api/v1/private/order/v2/getHistoryOrderFillTransactionPage', + # 'https://http-gateway2.ngsvsfx.cn/api/v1/private/order/v2/getHistoryOrderFillTransactionPage', + 'https://http-gateway2.janapw.com/api/v1/private/order/v2/getHistoryOrderFillTransactionPage', json=json_data, timeout=15 ) @@ -286,7 +287,7 @@ class WEEXApiClient: if not datas: return True, None - latest_order = datas[0] + latest_order = datas return True, latest_order except Exception as e: logger.warning(f"获取持仓状态失败(第{attempt + 1}次尝试): {e}") @@ -354,7 +355,7 @@ class TradingExecutor: try: self.page.ele('x:(//span[normalize-space(text()) = "闪电平仓"])').scroll.to_see(center=True) time.sleep(1) - self.page.ele('x:(//span[normalize-space(text()) = "闪电平仓"])').click() + self.page.ele('x:(//span[normalize-space(text()) = "闪电平仓"])').click(by_js=True) time.sleep(3) logger.success("成功执行平仓操作") return True @@ -457,16 +458,30 @@ class PositionManager: Args: position_data: 持仓数据字典 """ - self.position_data = position_data + self.position_datas = position_data if not position_data: self.current_position = self.POSITION_NONE return + position_data.reverse() + start = 0 + start1 = 0 + for _, i in enumerate(position_data): - direction = position_data.get("legacyOrderDirection") - if direction == "OPEN_LONG": + direction = i.get("legacyOrderDirection") + if direction == "CLOSE_SHORT": + start = 0 + elif direction == "CLOSE_LONG": + start1 = 0 + elif direction == "OPEN_SHORT": + start -= 1 + elif direction == "OPEN_LONG": + start1 += 1 + + # direction = position_data.get("legacyOrderDirection") + if start1: self.current_position = self.POSITION_LONG - elif direction == "OPEN_SHORT": + elif start: self.current_position = self.POSITION_SHORT else: self.current_position = self.POSITION_NONE