xtn-tools-pro 1.0.0.3.5__tar.gz → 1.0.0.3.7__tar.gz

{xtn-tools-pro-1.0.0.3.5/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.3.7}/PKG-INFO

@@ -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 → xtn-tools-pro-1.0.0.3.7}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.0.3.5",  # 版本
+    version="1.0.0.3.7",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@gmail.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

{xtn-tools-pro-1.0.0.3.5 → xtn-tools-pro-1.0.0.3.7}/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 → xtn-tools-pro-1.0.0.3.7/xtn_tools_pro.egg-info}/PKG-INFO

@@ -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