From e61fc7414bfc199db8611a5e0f669d920e54e6d8 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Mon, 15 Mar 2021 00:04:18 +0800 Subject: [PATCH] =?UTF-8?q?[BiliAccount=20@=202.5.4.26]=20*=20fixes:=20=20?= =?UTF-8?q?=20=20=20=201.=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=E7=A0=B4=E7=AB=99=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E5=AF=86=E7=A0=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82(fixes=20#74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [General] 1. 登录接口信息更新到安卓版本6.20.0 --- BiliAccount/BiliAccount.csproj | 6 +++--- BiliAccount/Core/ByPassword.cs | 8 ++++---- BiliAccount/Init.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BiliAccount/BiliAccount.csproj b/BiliAccount/BiliAccount.csproj index e98af76..24e8ba2 100644 --- a/BiliAccount/BiliAccount.csproj +++ b/BiliAccount/BiliAccount.csproj @@ -6,7 +6,7 @@ BiliAccount true BiliAccount - 2.5.3.25 + 2.5.4.26 LeoChen zhangbudademao.com BiliAccount @@ -19,8 +19,8 @@ bilibili bililive bililogin biliaccount favicon_4.png - enhancements: - 1. 修改登录接口UA + fixes: + 1. 修复了由于破站改接口导致无法通过密码登录的问题。 true snupkg diff --git a/BiliAccount/Core/ByPassword.cs b/BiliAccount/Core/ByPassword.cs index 0061185..9d43e66 100644 --- a/BiliAccount/Core/ByPassword.cs +++ b/BiliAccount/Core/ByPassword.cs @@ -50,10 +50,10 @@ public static void DoLogin(ref Account account) /* 旧版参数 * string parm = "appkey=" + Config.Instance.Appkey + "&build=" + Config.Instance.Build + "&mobi_app=android&password=" + account.EncryptedPassword + "&platform=android&ts=" + TimeStamp + "&username=" + account.UserName; */ - string parm = $"appkey={Config.Instance.Appkey}&bili_local_id={account.DeviceId}&build={Config.Instance.Build}&buvid={account.Buvid}&channel=bili&device=phone&device_id={account.DeviceId}&device_name=BiliAccount{account.DeviceGuid}&device_platform=BiliAccount{Assembly.GetExecutingAssembly().GetName().Version}&local_id={account.Buvid}&mobi_app=android&password={account.EncryptedPassword}&platform=android&statistics=%7B%22appId%22%3A1%2C%22platform%22%3A3%2C%22version%22%3A%22{Config.Instance.Version}%22%2C%22abtest%22%3A%22%22%7D&ts={TimeStamp}&username={account.UserName}"; + string parm = $"appkey={Config.Instance.Appkey}&bili_local_id={account.DeviceId}&build={Config.Instance.Build}&buvid={account.Buvid}&channel=bili&device=phone&device_id={account.DeviceId}&device_name=BiliAccount{account.DeviceGuid}&device_platform=BiliAccount{Assembly.GetExecutingAssembly().GetName().Version}&from_pv=main.my-information.my-login.0.click&from_url=bilibili%3A%2F%2Fuser_center%2Fmine&local_id={account.Buvid}&mobi_app=android&password={account.EncryptedPassword}&platform=android&statistics=%7B%22appId%22%3A1%2C%22platform%22%3A3%2C%22version%22%3A%22{Config.Instance.Version}%22%2C%22abtest%22%3A%22%22%7D&ts={TimeStamp}&username={account.UserName}"; parm += "&sign=" + GetSign(parm); //string str = Http.PostBodyOutCookies("http://passport.bilibili.com/api/v3/oauth2/login", out account.Cookies, parm, null, "application/x-www-form-urlencoded;charset=utf-8", "", Config.Instance.User_Agent); - string str = Http.PostBodyOutCookies("http://passport.bilibili.com/api/v3/oauth2/login", out account.Cookies, parm, null, "application/x-www-form-urlencoded;charset=utf-8", "", $"BiliAccount/{Config.Dll_Version}"); + string str = Http.PostBodyOutCookies("https://passport.bilibili.com/x/passport-login/oauth2/login ", out account.Cookies, parm, null, "application/x-www-form-urlencoded;charset=utf-8", "", $"BiliAccount/{Config.Dll_Version}"); if (!string.IsNullOrEmpty(str)) { #if NETSTANDARD2_0 || NETCORE3_0 @@ -95,7 +95,7 @@ public static void DoLoginWithCatpcha(string captcha, ref Account account) string parm = "actionKey=" + Config.Instance.Appkey + "&appkey=" + Config.Instance.Appkey + "&build=" + Config.Instance.Build + "&captcha=" + captcha + "&mobi_app=android&password=" + account.EncryptedPassword + "&device=android&platform=android&ts=" + TimeStamp + "&username=" + account.UserName; parm += "&sign=" + GetSign(parm); //string str = Http.PostBodyOutCookies("http://passport.bilibili.com/api/v3/oauth2/login", out account.Cookies, parm, account.Cookies, "application/x-www-form-urlencoded;charset=utf-8", "", Config.Instance.User_Agent); - string str = Http.PostBodyOutCookies("http://passport.bilibili.com/api/v3/oauth2/login", out account.Cookies, parm, account.Cookies, "application/x-www-form-urlencoded;charset=utf-8", "", $"BiliAccount/{Config.Dll_Version}"); + string str = Http.PostBodyOutCookies("https://passport.bilibili.com/x/passport-login/oauth2/login", out account.Cookies, parm, account.Cookies, "application/x-www-form-urlencoded;charset=utf-8", "", $"BiliAccount/{Config.Dll_Version}"); if (!string.IsNullOrEmpty(str)) { #if NETSTANDARD2_0 || NETCORE3_0 @@ -371,7 +371,7 @@ private static void LoginSuccess(DoLogin_DataTemplete obj, ref Account account) account.Uid = obj.data.token_info.mid; account.AccessToken = obj.data.token_info.access_token; account.RefreshToken = obj.data.token_info.refresh_token; - account.Expires_AccessToken = DateTime.Parse("1970-01-01 08:00:00").AddSeconds(obj.ts + obj.data.token_info.expires_in); + account.Expires_AccessToken = DateTime.Now.AddSeconds(obj.data.token_info.expires_in); account.Cookies = new CookieCollection(); foreach (DoLogin_DataTemplete.Data_Templete.Cookie_Info_Templete.Cookie_Templete i in obj.data.cookie_info.cookies) diff --git a/BiliAccount/Init.json b/BiliAccount/Init.json index 954fa2a..ad37f8e 100644 --- a/BiliAccount/Init.json +++ b/BiliAccount/Init.json @@ -1,7 +1,7 @@ { "appkey": "bca7e84c2d947ac6", "appsecret": "60698ba2f68e01ce44738920a0ffe768", - "build": "6140500", - "version": "6.14.0", - "user_agent": "Mozilla/5.0 BiliDroid/6.14.0(bbcallen@gmail.com) os/android model/MI 9 mobi_app/android build/6140500 channel/master innerVer/6140500 osVer/10 network/2" + "build": "6200400", + "version": "6.20.0", + "user_agent": "Mozilla/5.0 BiliDroid/6.20.0(bbcallen@gmail.com) os/android model/MI 9 mobi_app/android build/6200400 channel/master innerVer/6200400 osVer/10 network/2" } \ No newline at end of file