diff --git a/.travis.yml b/.travis.yml index 36e2c48..a911995 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ if: 'tag IS blank' env: global: - - TRAVIS_TAG=v2.0 + - TRAVIS_TAG=v2.1 jobs: include: - diff --git a/README.md b/README.md index fe48d97..d849922 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

- Bilibili Toolkit -

- +

@@ -20,7 +20,7 @@ |组件 |版本 |描述 | |--------------------|---------------|------------------------------| -|login |2019/12/6 |登录 | +|login |2019/12/22 |登录 | |get_user_info |2019/9/15 |获取用户信息 | |set_privacy |2018/7/24 |修改隐私设置 | |silver_to_coin |2018/8/8 |银瓜子兑换硬币 | diff --git a/bilibili.py b/bilibili.py index efb85b6..d82522a 100644 --- a/bilibili.py +++ b/bilibili.py @@ -40,7 +40,7 @@ __author__ = "Hsury" __email__ = "i@hsury.com" __license__ = "SATA" -__version__ = "2019.12.6" +__version__ = "2019.12.22" class Bilibili: app_key = "1d8b6e7d45233436" @@ -65,7 +65,7 @@ class Bilibili: def __init__(self, https=True, queue=None): self._session = requests.Session() - self._session.headers.update({'User-Agent': "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36"}) + self._session.headers.update({'User-Agent': "Mozilla/5.0 BiliDroid/5.51.1 (bbcallen@gmail.com)"}) self.__queue = queue self.get_cookies = lambda: self._session.cookies.get_dict(domain=".bilibili.com") self.get_csrf = lambda: self.get_cookies().get("bili_jct", "") @@ -208,7 +208,7 @@ def get_key(): while True: key = get_key() key_hash, pub_key = key['key_hash'], key['pub_key'] - url = f"{self.protocol}://passport.bilibili.com/api/v3/oauth2/login" + url = f"{self.protocol}://passport.bilibili.com/api/v2/oauth2/login" param = f"appkey={Bilibili.app_key}&password={parse.quote_plus(base64.b64encode(rsa.encrypt(f'{key_hash}{self.password}'.encode(), pub_key)))}&username={parse.quote_plus(self.username)}" payload = f"{param}&sign={self.calc_sign(param)}" headers = {'Content-type': "application/x-www-form-urlencoded"}