From c486f616c07b6a091a45aff87ad4028fdba3524c Mon Sep 17 00:00:00 2001
From: Administrator <fdefewf@vrfdgesgf>
Date: Fri, 12 Dec 2025 13:10:42 +0800
Subject: [PATCH] fwefwf

---
 bit_tools.py                           |  34 ++++++++++++-------------
 telegram/8619211027341.session         | Bin 45056 -> 45056 bytes
 telegram/8619211027341.session-journal |   0
 telegram/bot_session.session           | Bin 36864 -> 36864 bytes
 交易/bitmart_交易.py                   |  13 +++++-----
 交易/websea_交易.py                    |   2 +-
 交易/weex_交易.py                      |   2 +-
 推特/main.py                           |   2 +-
 8 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 telegram/8619211027341.session-journal

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 e6edf78ec49bfd8d06f3e28c6c4c8f0938ce5628..32b24cbd5ac9cc509780d69ad2ee9a705fd83fbe 100644
GIT binary patch
delta 71
zcmZp8z|`=7X@V4!u>V9ECm^{oVQDVsBF9^PFP`3rzd4yNPl4S#(|Ykl{^ZT3dB<3o
b7Ejy!w`dY0)8gryCzdE#1NoD;uJ;B21Fs$9

delta 71
zcmZp8z|`=7X@V4!kkv#PCm^{oVQDU>xZ^FqyI+@`QJl<|r@-!+X<dGiKWVdR-Z2)Y
a@~fNw7ENMgD!;aQVu_M9kUx3rdT#*G9vuDv

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 d8c7ce827a3b424155864bd9cb1c07b0b1a001db..a46661f9ad2df763f4898abf19f236399c9b7275 100644
GIT binary patch
delta 119
zcmZozz|^pSX@WH4m5DOWj8`@$DCbK}bG+sE;>E(CIza|D21XVZCVB0NcLX!77f+fz
zH{X|Y5lnjX=lm7yObY`y&n;id&bD|F{~3m`$<m!FlXL3hm=;gle5PKN6DU1-xv9!z
T@y=?X(Bym8x|<Jn+Oq)w4D~Qu

delta 119
zcmZozz|^pSX@WGP)I=F)MyZVn%K1{09dG&F{g(Z(U66r|fsuuUNnU&69l=cN@{5z_
z=KFGr!=yKV&R@aKRIa#rZuwGnw(^_&XBfgJOLwYF&Z&=MD!;b*OuZ^6P<rxmQ<cf$
Soz+00$@i>vHy`Y@X9ECsFfO$K

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: