xtn-tools-pro 1.0.0.2.8__tar.gz → 1.0.0.3.0__tar.gz

{xtn-tools-pro-1.0.0.2.8/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.3.0}/PKG-INFO

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

{xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.3.0}/setup.py

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

{xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.3.0}/xtn_tools_pro/task_pro/go_fun.py

@@ -141,9 +141,41 @@ class GoFun:
         headers = {"Authorization": auto}
         params = {"taskType": task}
         while True:
-            qsize = queue.qsize()
-            print("回写任务", qsize)
-            time.sleep(1)
+            # 判断队列是否有值
+            empty = queue.empty()
+            if empty:
+                time.sleep(2)
+                continue
+
+            # 循环全部获取队列的任务
+            result_list = []
+            try:
+                while True:
+                    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
+
+            # 回写任务
+            data = {"result": result_list, "remoteAddr": external_ip}
+            while True:
+                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},{data}")
+                    break
+                except Exception as 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.8 → xtn-tools-pro-1.0.0.3.0/xtn_tools_pro.egg-info}/PKG-INFO

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