xtn-tools-pro 1.0.0.2.9__tar.gz → 1.0.0.3.1__tar.gz

{xtn-tools-pro-1.0.0.2.9/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.3.1}/PKG-INFO

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

{xtn-tools-pro-1.0.0.2.9 → xtn-tools-pro-1.0.0.3.1}/setup.py

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

{xtn-tools-pro-1.0.0.2.9 → xtn-tools-pro-1.0.0.3.1}/xtn_tools_pro/task_pro/go_fun.py

@@ -119,7 +119,7 @@ class GoFun:
         while True:
             qsize = download_queue.qsize()
             logger.info(f"获取任务，当前队列任务数：{qsize}")
-            if download_queue.qsize() >= 10:
+            if qsize <= 10:
                 time.sleep(2)
                 continue
             resp = requests.get(download_url, headers=headers, params=params, timeout=5)
@@ -151,7 +151,18 @@ class GoFun:
             result_list = []
             try:
                 while True:
-                    result_list.append(queue.get_nowait())
+                    task_item = queue.get_nowait()
+                    taskNo = task_item["taskNo"]
+                    phone = task_item["phone"]
+                    isRegistered = task_item["isRegistered"]
+                    country_region = task_item["country_region"]
+                    full_phone = f"{country_region}{phone}"
+                    task_item = {
+                        'taskNo': taskNo,
+                        'phone': full_phone,
+                        'isRegistered': isRegistered
+                    }
+                    result_list.append(task_item)
             except Exception as e:
                 pass
 
@@ -161,10 +172,10 @@ class GoFun:
                 try:
                     resp = requests.post(upload_url, json=data, headers=headers, params=params, timeout=5)
                     json_data = resp.json()
-                    logger.info(f"成功回写任务个数：{len(result_list)},{json_data}")
+                    logger.info(f"成功回写任务个数:{len(result_list)},{json_data},{data}")
                     break
                 except Exception as e:
-                    logger.critical(f"回写异常：{e}")
+                    logger.critical(f"回写异常,{len(result_list)},{e}")
 
     def _go_task_fun_task(self, download_queue, upload_queue, ini_info, go_task_function, logger):
         """

{xtn-tools-pro-1.0.0.2.9 → xtn-tools-pro-1.0.0.3.1/xtn_tools_pro.egg-info}/PKG-INFO

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