xtn-tools-pro 1.0.1.1.0__py3-none-any.whl → 1.0.1.1.2__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun_v3.py

@@ -108,6 +108,7 @@ class GoFunTaskV3:
         # go_task_fun_cnt = 0
         # go_task_fun_task_process = None
         self.manager_info["gofun_kill_status"] = False  # 进程kill状态，True需要kill/False无需kill
+        self.manager_info["gofun_kill_status_qz"] = False  # 进程 强制 kill状态，True需要kill/False无需kill
         self.manager_info["gofun_run_status_time"] = get_time_now_timestamp(is_time_10=True)
 
         go_process_list = []
@@ -154,6 +155,16 @@ class GoFunTaskV3:
                     logger.info("检测到已达强制重启间隔，正在重启...")
                     self.manager_info["gofun_kill_status"] = True
 
+            if self.manager_info["gofun_kill_status_qz"]:
+                for p in go_process_list:
+                    # p.terminate()
+                    p.join()
+                go_process_list = []
+                go_task_status_error = 0
+                logger.info("检测到强制关闭指令，关闭gofun成功!!!")
+                self.manager_info["gofun_kill_status_qz"] = False
+
+
             logger.info(
                 f"主线程正常...进程数:{len(go_process_list)}...gofun(True不存在|False正常):{self.manager_info['gofun_kill_status']}")
             time.sleep(10)
@@ -187,11 +198,20 @@ class GoFunTaskV3:
         params = {"taskType": task}
         logger.warning("下载队列启动成功...")
         download_queue_exist_cnt = 3
+        now_qsize_v = None
+        now_qsize_v_time = None
         while True:
             try:
                 qsize = download_queue.qsize()
                 logger.info(f"当前队列剩余任务数:{qsize}")
                 if qsize > download_task_qsize:
+                    if not now_qsize_v or qsize != now_qsize_v:
+                        now_qsize_v = qsize
+                        now_qsize_v_time = get_time_now_timestamp(is_time_10=True)
+
+                    if now_qsize_v_time + (60 * 5) < get_time_now_timestamp(is_time_10=True):
+                        manager_info["gofun_kill_status"] = True
+
                     time.sleep(download_not_task_time)
                     continue
                 resp = requests.get(download_url, headers=headers, params=params, timeout=5)

xtn_tools_pro/utils/crypto.py

@@ -9,10 +9,10 @@
 # 2024/5/13    xiatn     V00.01.000    新建
 # --------------------------------------------------------------------------------------------------
 import jwt
+import pyotp
 import base64
 import hashlib
 import secrets
-import datetime
 
 
 def get_md5_32(s: str, is_upper=False):
@@ -166,5 +166,15 @@ def img_str_to_bytes(img_data: str):
     return img_data.encode('latin1')
 
 
+def get_2FA(secret):
+    """
+        计算 2FA
+    :param secret:
+    :return:
+    """
+    totp = pyotp.TOTP(secret)
+    return str(totp.now())
+
+
 if __name__ == '__main__':
-    print(get_base64_encode(''))
+    print(get_2FA('ninqzrh367u3iahpi2mum36bgfvouv5m'))

xtn_tools_pro/utils/helpers.py

@@ -142,49 +142,10 @@ def get_orderId_random(prefix="", suffix=""):
     return f"{prefix}{combined_number}{suffix}"
 
 
-def get_xxx():
-    return "get_xxx"
 
 
-def get_xxx1():
-    return "get_xxx1"
 
 
-def get_xxx2():
-    return "get_xxx2"
-
-
-def get_xxx3():
-    return "get_xxx3"
-
-
-def get_xxx4():
-    return "get_xxx4"
-
-
-def get_xxx5():
-    return "get_xxx5"
-
-
-def get_xxx6():
-    return "get_xxx6"
-
-
-def get_xxx7():
-    return "get_xxx7"
-
-
-def get_xxx8():
-    return "get_xxx8"
-
-
-def get_xxx9():
-    return "get_xxx9"
-
-
-def get_xxx10():
-    return "get_xxx10"
-
 
 if __name__ == '__main__':
     # print(get_uuid(4))

{xtn_tools_pro-1.0.1.1.0.dist-info → xtn_tools_pro-1.0.1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.1.1.0
+Version: 1.0.1.1.2
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com
@@ -18,5 +18,6 @@ Requires-Dist: Faker
 Requires-Dist: PyJWT
 Requires-Dist: tqdm
 Requires-Dist: fabric
+Requires-Dist: pyotp
 
 xtnkk-tools

{xtn_tools_pro-1.0.1.1.0.dist-info → xtn_tools_pro-1.0.1.1.2.dist-info}/RECORD

@@ -51,20 +51,20 @@ xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDst
 xtn_tools_pro/task_pro/go_fun.py,sha256=hWEt2uJ9FCvJH7PhVZttS-11A7J6zbRKwX7c5YLYQag,19144
 xtn_tools_pro/task_pro/go_fun_air_v1.py,sha256=25gHmW5aAV6nMY9Y6-wD7uQ_wqE39dr-eaegqVbYKM8,11035
 xtn_tools_pro/task_pro/go_fun_v2.py,sha256=SgcXgtEBGSVL1V2LyqO0z8Md2H8JZxucYrLLIwqtiLM,18489
-xtn_tools_pro/task_pro/go_fun_v3.py,sha256=GnwowamPTsuL-oSaXYqIkp-DBxFKV5-T1l0A6VZ_6kk,18801
+xtn_tools_pro/task_pro/go_fun_v3.py,sha256=QHOb_5z1nS4LQmUIXgI4G4TWuHk0L4JxI1TQEJO-sI4,19744
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
-xtn_tools_pro/utils/crypto.py,sha256=YOdWB8yVauVEyT2d5i9M_bXUJVFTq4BQoUy2NLPhmts,4427
+xtn_tools_pro/utils/crypto.py,sha256=fyqno82Tw8LeF5i8YiEpjPI3oswsqTeWE5Lc9M2ef68,4603
 xtn_tools_pro/utils/file_utils.py,sha256=obaBP7CaBCsXxzqGeWzV2l0yw7vicgKOaXzmpMV8ips,2567
-xtn_tools_pro/utils/helpers.py,sha256=OmPRxB6vDN1S7OhxQWgoOXnxs2YPorwSQKBVzYOiKoA,4928
+xtn_tools_pro/utils/helpers.py,sha256=0CTMY7wfSQR_DC9-v1lkKQLpWcB1FL9V_kw_5DOcZ40,4454
 xtn_tools_pro/utils/log.py,sha256=mf5huJDA8xVxxFWPG_tl_vOsAA2_ywGDFycYSGHIDCo,10202
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k82s,17608
 xtn_tools_pro/utils/shell.py,sha256=2SeC620Fj2Gi4bSWmr6w9-OjOBR1MB_OfTEz5HIwK-k,2940
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.1.1.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.1.0.dist-info/METADATA,sha256=wWejR6GHUrWYHHcLsByY5hMr5ovaw0l1YMmABeGCnI4,523
-xtn_tools_pro-1.0.1.1.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.1.0.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.1.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.1.0.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.1.2.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.1.2.dist-info/METADATA,sha256=Vqscm8H2d0-WoMh44YgeE-VNIekELf7Gh4_lxtkLQJw,545
+xtn_tools_pro-1.0.1.1.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.1.2.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.1.2.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.1.2.dist-info/RECORD,,