xtn-tools-pro 1.0.0.3.8__py3-none-any.whl → 1.0.0.4.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- xtn_tools_pro/task_pro/go_fun.py +10 -9
- {xtn_tools_pro-1.0.0.3.8.dist-info → xtn_tools_pro-1.0.0.4.0.dist-info}/METADATA +1 -1
- {xtn_tools_pro-1.0.0.3.8.dist-info → xtn_tools_pro-1.0.0.4.0.dist-info}/RECORD +6 -6
- {xtn_tools_pro-1.0.0.3.8.dist-info → xtn_tools_pro-1.0.0.4.0.dist-info}/LICENSE +0 -0
- {xtn_tools_pro-1.0.0.3.8.dist-info → xtn_tools_pro-1.0.0.4.0.dist-info}/WHEEL +0 -0
- {xtn_tools_pro-1.0.0.3.8.dist-info → xtn_tools_pro-1.0.0.4.0.dist-info}/top_level.txt +0 -0
xtn_tools_pro/task_pro/go_fun.py
CHANGED
|
@@ -50,7 +50,8 @@ class GoFun:
|
|
|
50
50
|
"update_proxies_time", "upload_task_tine"]:
|
|
51
51
|
raise Exception(f"ini_dict 配置 {server_k} 不存在")
|
|
52
52
|
|
|
53
|
-
logger.
|
|
53
|
+
logger.debug(
|
|
54
|
+
f"\n当前设置配置如下:\n\t功能函数重启间隔:{restart_time};进程数:{processes_num};线程数:{thread_num}\n\t代理更新间隔:{update_proxies_time};回写间隔{upload_task_tine}\n")
|
|
54
55
|
|
|
55
56
|
if port:
|
|
56
57
|
task_host = f"http://{host}:{port}"
|
|
@@ -60,7 +61,7 @@ class GoFun:
|
|
|
60
61
|
download_url = task_host + "/filter_server/phone/get"
|
|
61
62
|
upload_url = task_host + "/filter_server/phone/update"
|
|
62
63
|
update_proxy_url = task_host + f"/filter_server/proxy/random/get?taskType={task}&limit=1"
|
|
63
|
-
logger.
|
|
64
|
+
logger.debug("无敌框架来咯~")
|
|
64
65
|
|
|
65
66
|
external_ip = self.__get_external_ip(self.logger)
|
|
66
67
|
|
|
@@ -100,7 +101,7 @@ class GoFun:
|
|
|
100
101
|
try:
|
|
101
102
|
rp = requests.get('https://httpbin.org/ip')
|
|
102
103
|
rp_json = rp.json()
|
|
103
|
-
logger.
|
|
104
|
+
logger.warning(f"当前网络ip --> {rp_json}")
|
|
104
105
|
return rp_json['origin']
|
|
105
106
|
except Exception as e:
|
|
106
107
|
pass
|
|
@@ -138,7 +139,7 @@ class GoFun:
|
|
|
138
139
|
while True:
|
|
139
140
|
try:
|
|
140
141
|
qsize = download_queue.qsize()
|
|
141
|
-
logger.info(f"
|
|
142
|
+
logger.info(f"当前队列剩余任务数：{qsize}")
|
|
142
143
|
if qsize >= 10:
|
|
143
144
|
time.sleep(2)
|
|
144
145
|
continue
|
|
@@ -155,7 +156,7 @@ class GoFun:
|
|
|
155
156
|
if not phone_item.isdigit(): # 判断是否全是整数(不包括小数点或负号)
|
|
156
157
|
continue
|
|
157
158
|
download_queue.put(task_item)
|
|
158
|
-
logger.
|
|
159
|
+
logger.warning(f"成功获取任务个数：{len(result_list)}")
|
|
159
160
|
except Exception as e:
|
|
160
161
|
logger.critical(f"获取任务请求异常：{e}")
|
|
161
162
|
time.sleep(2)
|
|
@@ -204,8 +205,8 @@ class GoFun:
|
|
|
204
205
|
try:
|
|
205
206
|
resp = requests.post(upload_url, json=data, headers=headers, params=params, timeout=5)
|
|
206
207
|
json_data = resp.json()
|
|
207
|
-
# logger.
|
|
208
|
-
logger.
|
|
208
|
+
# logger.warning(f"成功回写任务个数:{len(result_list)},{json_data},{data}")
|
|
209
|
+
logger.warning(f"成功回写任务个数:{len(result_list)},{json_data}")
|
|
209
210
|
break
|
|
210
211
|
except Exception as e:
|
|
211
212
|
logger.critical(f"回写异常,{len(result_list)},{e}")
|
|
@@ -239,7 +240,7 @@ class GoFun:
|
|
|
239
240
|
proxies_dict['http'] = 'http://' + random.choice(result_list)
|
|
240
241
|
proxies_dict['https'] = 'http://' + random.choice(result_list)
|
|
241
242
|
proxies_dict['status'] = True
|
|
242
|
-
logger.
|
|
243
|
+
logger.warning(f"成功获取代理：{proxies_dict}")
|
|
243
244
|
|
|
244
245
|
if not update_proxies_time:
|
|
245
246
|
# 一直执行 不退出
|
|
@@ -276,7 +277,7 @@ class GoFun:
|
|
|
276
277
|
try:
|
|
277
278
|
if not processes_start_list:
|
|
278
279
|
go_task_fun_cnt += 1
|
|
279
|
-
logger.
|
|
280
|
+
logger.debug(
|
|
280
281
|
f"第{go_task_fun_cnt}次,进程数:{processes_num},线程数:{thread_num},等待{restart_time}秒强制下一次")
|
|
281
282
|
for i in range(processes_num):
|
|
282
283
|
p = Process(target=self._run_with_timeout,
|
|
@@ -10,7 +10,7 @@ xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJw
|
|
|
10
10
|
xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
|
|
11
11
|
xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
|
|
12
12
|
xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
|
|
13
|
-
xtn_tools_pro/task_pro/go_fun.py,sha256=
|
|
13
|
+
xtn_tools_pro/task_pro/go_fun.py,sha256=6Hono3GY61HcMank72lQxGsb5FeT1AZlyj_9Ddl23JY,14071
|
|
14
14
|
xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
|
|
15
15
|
xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
|
|
16
16
|
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
|
|
|
19
19
|
xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
|
|
20
20
|
xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
|
|
21
21
|
xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
|
|
22
|
-
xtn_tools_pro-1.0.0.
|
|
23
|
-
xtn_tools_pro-1.0.0.
|
|
24
|
-
xtn_tools_pro-1.0.0.
|
|
25
|
-
xtn_tools_pro-1.0.0.
|
|
26
|
-
xtn_tools_pro-1.0.0.
|
|
22
|
+
xtn_tools_pro-1.0.0.4.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
23
|
+
xtn_tools_pro-1.0.0.4.0.dist-info/METADATA,sha256=pXYma9JqJsaCSe1PJsFlObvgELAZJoB4WnVS7JZK_W0,455
|
|
24
|
+
xtn_tools_pro-1.0.0.4.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
|
|
25
|
+
xtn_tools_pro-1.0.0.4.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
|
|
26
|
+
xtn_tools_pro-1.0.0.4.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|