修复-2100问题，但未启用新key与API

FortuneDayssss · Aug 21, 2021 · 286aca8 · 286aca8
1 parent c7f00ac
commit 286aca8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/bilibiliuploader/__init__.py b/bilibiliuploader/__init__.py
@@ -1,4 +1,4 @@
 from .bilibiliuploader import BilibiliUploader
 from .core import VideoPart
 
-__version__ = '0.0.2'
+__version__ = '0.0.6'
diff --git a/bilibiliuploader/core.py b/bilibiliuploader/core.py
@@ -45,7 +45,7 @@ def __repr__(self):
                     server_file_name=self.server_file_name)
 
 
-def get_key(sid=None, jsessionid=None):
+def get_key_old(sid=None, jsessionid=None):
     """
     get public key, hash and session id for login.
     Args:
@@ -72,17 +72,39 @@ def get_key(sid=None, jsessionid=None):
     if jsessionid:
         cookie['JSESSIONID'] = jsessionid
     r = requests.post(
-        "https://passport.bilibili.com/api/oauth2/getKey",
+        # "https://passport.bilibili.com/api/oauth2/getKey",
+        "https://passport.bilibili.com/x/passport-login/web/key",
         headers=headers,
         data=post_data,
         cookies=cookie
     )
+    print(r.content.decode())
     r_data = r.json()['data']
     if sid:
         return r_data['hash'], r_data['key'], sid
     return r_data['hash'], r_data['key'], r.cookies['sid']
 
 
+def get_key():
+    headers = {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Accept': "application/json, text/javascript, */*; q=0.01"
+    }
+    params_data = {
+        'appkey': APPKEY,
+        'platform': "pc",
+        'ts': str(int(datetime.now().timestamp()))
+    }
+    params_data['sign'] = cipher.sign_dict(params_data, APPSECRET)
+    r = requests.get(
+        "https://passport.bilibili.com/x/passport-login/web/key",
+        headers=headers,
+        params=params_data
+    )
+    r_data = r.json()['data']
+    return r_data['hash'], r_data['key'], ''
+
+
 def get_capcha(sid):
     headers = {
         'User-Agent': '',
@@ -163,7 +185,8 @@ def login(username, password):
     }
 
     r = requests.post(
-        "https://passport.bilibili.com/api/v3/oauth2/login",
+        # "https://passport.bilibili.com/api/v3/oauth2/login",
+        "https://passport.bilibili.com/x/passport-login/oauth2/login",
         headers=headers,
         data=post_data,
         cookies={

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='bilibiliuploader',
-    version="0.0.4",
+    version="0.0.6",
     packages=['bilibiliuploader', 'bilibiliuploader.util'],
     url='https://github.com/FortuneDayssss/BilibiliUploader',
     install_requires=['certifi>=2020.4.5.1',