xtn-tools-pro 1.0.0.2.8__py3-none-any.whl → 1.0.0.3.0__py3-none-any.whl

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.dist-info → xtn_tools_pro-1.0.0.3.0.dist-info}/METADATA

@@ -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.dist-info → xtn_tools_pro-1.0.0.3.0.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=CccaMMl-Mr_SFO2kUSXH2JKsgNpvE90bxcMDfrqris8,8444
+xtn_tools_pro/task_pro/go_fun.py,sha256=GCIfckuNR47uxRvoKCBBlne6M7nXzVuMNSHhdodS_5g,9817
 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.2.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.2.8.dist-info/METADATA,sha256=vPJnzEL5yxvzlRNSY18RO7fUZTtk-FQmTaHZ8MVEzKA,455
-xtn_tools_pro-1.0.0.2.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.2.8.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.2.8.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.3.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.3.0.dist-info/METADATA,sha256=4bEX_P5pv8elCZsoRSRHtpT3TuGV3NBR8wjjgArF6Zw,455
+xtn_tools_pro-1.0.0.3.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.3.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.3.0.dist-info/RECORD,,