xtn-tools-pro 1.0.0.3.6__tar.gz → 1.0.0.3.8__tar.gz

{xtn-tools-pro-1.0.0.3.6/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.3.8}/PKG-INFO

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

{xtn-tools-pro-1.0.0.3.6 → xtn-tools-pro-1.0.0.3.8}/setup.py

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

{xtn-tools-pro-1.0.0.3.6 → xtn-tools-pro-1.0.0.3.8}/xtn_tools_pro/task_pro/go_fun.py

@@ -35,14 +35,14 @@ class GoFun:
 
         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,
-            "upload_task_tine": upload_task_tine,
+            "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():
@@ -50,6 +50,8 @@ class GoFun:
                                                  "update_proxies_time", "upload_task_tine"]:
                 raise Exception(f"ini_dict 配置 {server_k} 不存在")
 
+        logger.info(f"\n当前设置配置如下:\n\t功能函数重启间隔:{restart_time};进程数:{processes_num};线程数:{thread_num}\n\t代理更新间隔:{update_proxies_time};回写间隔{upload_task_tine}\n")
+
         if port:
             task_host = f"http://{host}:{port}"
         else:
@@ -149,6 +151,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:
@@ -308,3 +313,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.6 → xtn-tools-pro-1.0.0.3.8/xtn_tools_pro.egg-info}/PKG-INFO

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