|
@@ -232,7 +232,10 @@ def callback_requests(func, *args, **kwargs):
|
|
|
try:
|
|
|
proxies = proxy.proxies if proxy is not None else None
|
|
|
logger.debug(f"[当前代理]:{proxies}")
|
|
|
- kwargs.setdefault('proxies', proxies)
|
|
|
+ if kwargs.get('proxies') is None:
|
|
|
+ kwargs.setdefault('proxies', proxies)
|
|
|
+ else:
|
|
|
+ kwargs.update({'proxies': proxies})
|
|
|
return func(*args, **kwargs)
|
|
|
except (IOError, AssertionError) as e:
|
|
|
logger.error(f"[访问异常]:{e}")
|