xtn-tools-pro 1.0.0.3.5__py3-none-any.whl → 1.0.0.3.7__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun.py

@@ -29,21 +29,25 @@ class GoFun:
         thread_num = ini_dict.get('thread_num', 0)
         restart_time = ini_dict.get('restart_time', 0)
         update_proxies_time = ini_dict.get('update_proxies_time', 0)
+        upload_task_tine = ini_dict.get('upload_task_tine', 0)
+
+        self.logger = logger
 
         self.__ini_info = {
             "host": host,
-            "port": port,
+            "port": int(port),
             "task": task,
             "auto": auto,
-            "processes_num": processes_num,
-            "thread_num": thread_num,
-            "restart_time": restart_time,
-            "update_proxies_time": update_proxies_time,
+            "processes_num": int(processes_num),
+            "thread_num": int(thread_num),
+            "restart_time": int(restart_time),
+            "update_proxies_time": int(update_proxies_time),
+            "upload_task_tine": int(upload_task_tine),
         }
 
         for server_k, server_v in self.__ini_info.items():
             if not server_v and server_k not in ["port", "processes_num", "thread_num", "restart_time",
-                                                 "update_proxies_time"]:
+                                                 "update_proxies_time", "upload_task_tine"]:
                 raise Exception(f"ini_dict 配置 {server_k} 不存在")
 
         if port:
@@ -54,15 +58,15 @@ class GoFun:
         download_url = task_host + "/filter_server/phone/get"
         upload_url = task_host + "/filter_server/phone/update"
         update_proxy_url = task_host + f"/filter_server/proxy/random/get?taskType={task}&limit=1"
-        external_ip = self.__get_external_ip()
+        logger.info("无敌框架来咯~")
+
+        external_ip = self.__get_external_ip(self.logger)
 
         self.__ini_info["download_url"] = download_url
         self.__ini_info["upload_url"] = upload_url
         self.__ini_info["update_proxy_url"] = update_proxy_url
         self.__ini_info["external_ip"] = external_ip
 
-        self.logger = logger
-
         if not go_task_function:
             return
 
@@ -85,7 +89,7 @@ class GoFun:
 
         download_task_process.join()
 
-    def __get_external_ip(self):
+    def __get_external_ip(self, logger):
         """
             获取当前网络ip
         :return:
@@ -94,7 +98,7 @@ class GoFun:
             try:
                 rp = requests.get('https://httpbin.org/ip')
                 rp_json = rp.json()
-                print(f"当前网络ip --> {rp_json}")
+                logger.info(f"当前网络ip --> {rp_json}")
                 return rp_json['origin']
             except Exception as e:
                 pass
@@ -145,6 +149,9 @@ class GoFun:
                     time.sleep(2)
                     continue
                 for task_item in result_list:
+                    phone_item = task_item["phone"]
+                    if not phone_item.isdigit():  # 判断是否全是整数(不包括小数点或负号)
+                        continue
                     download_queue.put(task_item)
                 logger.info(f"成功获取任务个数：{len(result_list)}")
             except Exception as e:
@@ -160,6 +167,7 @@ class GoFun:
         external_ip = ini_info["external_ip"]
         auto = ini_info["auto"]
         task = ini_info["task"]
+        upload_task_tine = ini_info["upload_task_tine"]
         headers = {"Authorization": auto}
         params = {"taskType": task}
         while True:
@@ -200,6 +208,11 @@ class GoFun:
                 except Exception as e:
                     logger.critical(f"回写异常,{len(result_list)},{e}")
 
+            if not upload_task_tine:
+                # 一直执行 不退出
+                continue
+            time.sleep(upload_task_tine)
+
     def __update_proxy(self, proxies_dict, ini_info, logger):
         """
             更新代理
@@ -298,3 +311,21 @@ class GoFun:
             # 等待所有线程完成
             for future in concurrent.futures.as_completed(futures):
                 future.result()
+
+    def get_ini_dict(self):
+        """
+            配置解释
+        :return:
+        """
+        ini_dict = {
+            "host": "域名",
+            "port": "端口",
+            "task": "任务",
+            "auto": "token",
+            "processes_num": "进程数",
+            "thread_num": "线程数",
+            "restart_time": "间隔x秒强制重启",
+            "update_proxies_time": "间隔x秒更新代理",
+            "upload_task_tine": "回写间隔",
+        }
+        return ini_dict

{xtn_tools_pro-1.0.0.3.5.dist-info → xtn_tools_pro-1.0.0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.3.5
+Version: 1.0.0.3.7
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn_tools_pro-1.0.0.3.5.dist-info → xtn_tools_pro-1.0.0.3.7.dist-info}/RECORD

@@ -10,7 +10,7 @@ xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJw
 xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
 xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
 xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
-xtn_tools_pro/task_pro/go_fun.py,sha256=hqEUN1IfYFL7KkBJrNov0wV4blhJc-PN--UcxJxZ40o,12656
+xtn_tools_pro/task_pro/go_fun.py,sha256=U-ttywrTG_1WJAo_JHCdNoWfPIH1aFR1uIYZjVqSVm0,13824
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
 xtn_tools_pro/utils/file_utils.py,sha256=VfdIxog4s1UW5NpKkCvQsUs9qHjLoNCnstZbnftkT4w,2046
@@ -19,8 +19,8 @@ xtn_tools_pro/utils/log.py,sha256=XZChGrKWgAz42o_gFi_d7DL28svF1OvAw7NS_xkIgnQ,10
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 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.0.3.5.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.3.5.dist-info/METADATA,sha256=dughaJQtyr2qeBG_vq03HODb_Sc7E_hxkkdPkN_mIlM,455
-xtn_tools_pro-1.0.0.3.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.3.5.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.3.5.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.3.7.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.3.7.dist-info/METADATA,sha256=wuKSORAuDlivy8K99C4HVECGk1NKPFQ9IK_BIGMtgIs,455
+xtn_tools_pro-1.0.0.3.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.3.7.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.3.7.dist-info/RECORD,,