fix RequestUtils ua
This commit is contained in:
jxxghp
@ -16,7 +16,7 @@ class OcrHelper:
|
||||
:param ua: 下载图片使用的ua
|
||||
"""
|
||||
if image_url:
|
||||
ret = RequestUtils(headers=ua,
|
||||
ret = RequestUtils(ua=ua,
|
||||
cookies=cookie).get_res(image_url)
|
||||
if ret is not None:
|
||||
image_bin = ret.content
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import traceback
|
||||
from multiprocessing.dummy import Pool as ThreadPool
|
||||
from multiprocessing.pool import ThreadPool
|
||||
from threading import Event
|
||||
@ -120,6 +121,7 @@ class AutoSignIn(_PluginBase):
|
||||
# 特殊站点直接返回签到信息，防止仿真签到、模拟登陆有歧义
|
||||
return msg or ""
|
||||
except Exception as e:
|
||||
traceback.print_exc()
|
||||
return f"【{site_info.get('name')}】签到失败：{str(e)}"
|
||||
else:
|
||||
return self.__signin_base(site_info)
|
||||
@ -162,14 +164,14 @@ class AutoSignIn(_PluginBase):
|
||||
return f"【{site}】仿真登录失败，Cookie已失效！"
|
||||
else:
|
||||
res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).get_res(url=checkin_url)
|
||||
if not res and site_url != checkin_url:
|
||||
logger.info(f"开始站点模拟登录：{site}，地址：{site_url}...")
|
||||
res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
proxies=settings.PROXY if site_info.get("proxy") else None
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).get_res(url=site_url)
|
||||
# 判断登录状态
|
||||
if res and res.status_code in [200, 500, 403]:
|
||||
@ -193,6 +195,7 @@ class AutoSignIn(_PluginBase):
|
||||
return f"【{site}】签到失败，无法打开网站！"
|
||||
except Exception as e:
|
||||
logger.warn("%s 签到失败：%s" % (site, str(e)))
|
||||
traceback.print_exc()
|
||||
return f"【{site}】签到失败：{str(e)}！"
|
||||
|
||||
def stop_service(self):
|
||||
|
||||
@ -46,7 +46,7 @@ class HDArea(_ISiteSigninHandler):
|
||||
'action': 'sign_in'
|
||||
}
|
||||
html_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).post_res(url="https://www.hdarea.co/sign_in.php", data=data)
|
||||
if not html_res or html_res.status_code != 200:
|
||||
|
||||
@ -58,7 +58,7 @@ class HDChina(_ISiteSigninHandler):
|
||||
site_cookie = cookie
|
||||
# 获取页面html
|
||||
html_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).get_res(url="https://hdchina.org/index.php")
|
||||
if not html_res or html_res.status_code != 200:
|
||||
@ -98,7 +98,7 @@ class HDChina(_ISiteSigninHandler):
|
||||
'csrf': x_csrf
|
||||
}
|
||||
sign_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).post_res(url="https://hdchina.org/plugin_sign-in.php?cmd=signin", data=data)
|
||||
if not sign_res or sign_res.status_code != 200:
|
||||
|
||||
@ -68,7 +68,7 @@ class HDSky(_ISiteSigninHandler):
|
||||
img_hash = None
|
||||
while not img_hash and res_times <= 3:
|
||||
image_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=settings.PROXY if proxy else None
|
||||
).post_res(url='https://hdsky.me/image_code_ajax.php',
|
||||
data={'action': 'new'})
|
||||
@ -113,7 +113,7 @@ class HDSky(_ISiteSigninHandler):
|
||||
}
|
||||
# 访问签到链接
|
||||
res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=settings.PROXY if proxy else None
|
||||
).post_res(url='https://hdsky.me/showup.php', data=data)
|
||||
if res and res.status_code == 200:
|
||||
|
||||
@ -114,7 +114,7 @@ class Opencd(_ISiteSigninHandler):
|
||||
}
|
||||
# 访问签到链接
|
||||
sign_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=settings.PROXY if proxy else None
|
||||
).post_res(url='https://www.open.cd/plugin_sign-in.php?cmd=signin', data=data)
|
||||
if sign_res and sign_res.status_code == 200:
|
||||
|
||||
@ -99,7 +99,7 @@ class Tjupt(_ISiteSigninHandler):
|
||||
logger.info(f"获取到签到图片 {img_url}")
|
||||
# 获取签到图片hash
|
||||
captcha_img_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=settings.PROXY if proxy else None
|
||||
).get_res(url=img_url)
|
||||
if not captcha_img_res or captcha_img_res.status_code != 200:
|
||||
@ -203,7 +203,7 @@ class Tjupt(_ISiteSigninHandler):
|
||||
}
|
||||
logger.debug(f"提交data {data}")
|
||||
sign_in_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=settings.PROXY if proxy else None
|
||||
).post_res(url=self._sign_in_url, data=data)
|
||||
if not sign_in_res or sign_in_res.status_code != 200:
|
||||
|
||||
@ -77,7 +77,7 @@ class TTG(_ISiteSigninHandler):
|
||||
}
|
||||
# 签到
|
||||
sign_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=settings.PROXY if proxy else None
|
||||
).post_res(url="https://totheglory.im/signed.php",
|
||||
data=data)
|
||||
|
||||
@ -105,7 +105,7 @@ class U2(_ISiteSigninHandler):
|
||||
}
|
||||
# 签到
|
||||
sign_res = RequestUtils(cookies=site_cookie,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=settings.PROXY if proxy else None
|
||||
).post_res(url="https://u2.dmhy.org/showup.php?action=show",
|
||||
data=data)
|
||||
|
||||
@ -115,7 +115,7 @@ class SiteStatistic(_PluginBase):
|
||||
# 普通模式
|
||||
res = RequestUtils(cookies=site_cookie,
|
||||
session=session,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).get_res(url=url)
|
||||
if res and res.status_code == 200:
|
||||
@ -136,7 +136,7 @@ class SiteStatistic(_PluginBase):
|
||||
.replace("window.location=", "")
|
||||
res = RequestUtils(cookies=site_cookie,
|
||||
session=session,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).get_res(url=tmp_url)
|
||||
if res and res.status_code == 200:
|
||||
@ -155,7 +155,7 @@ class SiteStatistic(_PluginBase):
|
||||
if '"search"' not in html_text and '"csrf-token"' not in html_text:
|
||||
res = RequestUtils(cookies=site_cookie,
|
||||
session=session,
|
||||
headers=ua,
|
||||
ua=ua,
|
||||
proxies=proxies
|
||||
).get_res(url=url + "/index.php")
|
||||
if res and res.status_code == 200:
|
||||
|
||||
Reference in New Issue
Block a user