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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. {xtn-tools-pro-1.0.0.2.8/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.2.9}/PKG-INFO +1 -1
  2. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/setup.py +1 -1
  3. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/task_pro/go_fun.py +24 -3
  4. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9/xtn_tools_pro.egg-info}/PKG-INFO +1 -1
  5. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/LICENSE +0 -0
  6. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/README.md +0 -0
  7. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/setup.cfg +0 -0
  8. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/__init__.py +0 -0
  9. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/db/MongoDB.py +0 -0
  10. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/db/MysqlDB.py +0 -0
  11. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/db/RedisDB.py +0 -0
  12. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/db/__init__.py +0 -0
  13. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/proxy/XiaoXiangProxy.py +0 -0
  14. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/proxy/__init__.py +0 -0
  15. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/proxy/proxy.py +0 -0
  16. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/task_pro/__init__.py +0 -0
  17. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/tools.py +0 -0
  18. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/__init__.py +0 -0
  19. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/crypto.py +0 -0
  20. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/file_utils.py +0 -0
  21. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/helpers.py +0 -0
  22. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/log.py +0 -0
  23. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/retry.py +0 -0
  24. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/sql.py +0 -0
  25. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/utils/time_utils.py +0 -0
  26. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro.egg-info/SOURCES.txt +0 -0
  27. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro.egg-info/dependency_links.txt +0 -0
  28. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro.egg-info/requires.txt +0 -0
  29. {xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro.egg-info/top_level.txt +0 -0
{xtn-tools-pro-1.0.0.2.8/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.2.9}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.0.2.8
3
+ Version: 1.0.0.2.9
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com
{xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/setup.py RENAMED
@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
15
15
 
16
16
  setuptools.setup(
17
17
  name="xtn-tools-pro", # 模块名称
18
- version="1.0.0.2.8", # 版本
18
+ version="1.0.0.2.9", # 版本
19
19
  author="xtn", # 作者
20
20
  author_email="czw011122@gmail.com", # 作者邮箱
21
21
  description="xtn 开发工具", # 模块简介
{xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9}/xtn_tools_pro/task_pro/go_fun.py RENAMED
@@ -141,9 +141,30 @@ class GoFun:
141
141
  headers = {"Authorization": auto}
142
142
  params = {"taskType": task}
143
143
  while True:
144
- qsize = queue.qsize()
145
- print("回写任务", qsize)
146
- time.sleep(1)
144
+ # 判断队列是否有值
145
+ empty = queue.empty()
146
+ if empty:
147
+ time.sleep(2)
148
+ continue
149
+
150
+ # 循环全部获取队列的任务
151
+ result_list = []
152
+ try:
153
+ while True:
154
+ result_list.append(queue.get_nowait())
155
+ except Exception as e:
156
+ pass
157
+
158
+ # 回写任务
159
+ data = {"result": result_list, "remoteAddr": external_ip}
160
+ while True:
161
+ try:
162
+ resp = requests.post(upload_url, json=data, headers=headers, params=params, timeout=5)
163
+ json_data = resp.json()
164
+ logger.info(f"成功回写任务个数：{len(result_list)},{json_data}")
165
+ break
166
+ except Exception as e:
167
+ logger.critical(f"回写异常：{e}")
147
168
 
148
169
  def _go_task_fun_task(self, download_queue, upload_queue, ini_info, go_task_function, logger):
149
170
  """
{xtn-tools-pro-1.0.0.2.8 → xtn-tools-pro-1.0.0.2.9/xtn_tools_pro.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.0.2.8
3
+ Version: 1.0.0.2.9
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com