[2.3.6.20]

fixes: 1. 修复.net core 3.x下二维码登录返回值转换错误的问题。(fixed #23)
LeoChen98 · May 3, 2020 · 148eb0f · 148eb0f
1 parent 8a00b57
commit 148eb0f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/BiliAccount/BiliAccount.csproj b/BiliAccount/BiliAccount.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>BiliAccount</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>BiliAccount</PackageId>
-    <Version>2.3.5.19</Version>
+    <Version>2.3.6.20</Version>
     <Authors>LeoChen</Authors>
     <Company>zhangbudademao.com</Company>
     <Product>BiliAccount</Product>
@@ -20,7 +20,7 @@
     <PackageIcon>favicon_4.png</PackageIcon>
     <PackageReleaseNotes>
       fixes:
-      1. 修复.net core 3.x下二维码登录转换错误的问题。
+      1. 修复.net core 3.x下二维码登录返回值转换错误的问题。
     </PackageReleaseNotes>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

diff --git a/BiliAccount/Core/ByQRCode.cs b/BiliAccount/Core/ByQRCode.cs
@@ -8,6 +8,7 @@
 #if NETSTANDARD2_0 || NETCORE3_0
 using QRCoder;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 #else
 
 using System.Web.Script.Serialization;
@@ -112,8 +113,12 @@ private static void MonitorCallback(object o)
                     Refresher.Dispose();
 
                     Account account = new Account();
-
+#if NETSTANDARD2_0 || NETCORE3_0
+                    string Querystring = Regex.Split((obj.data as JObject)["url"].ToString(), "\\?")[1];
+#else
                     string Querystring = Regex.Split((obj.data as Dictionary<string, object>)["url"].ToString(), "\\?")[1];
+#endif
+
                     string[] KeyValuePair = Regex.Split(Querystring, "&");
                     account.Cookies = new CookieCollection();
                     for (int i = 0; i < KeyValuePair.Length - 1; i++)