Merge ff5062c54f into 2c227d5d26

src/DownKyi.Core/BiliApi/LoginNew/LoginQR.cs

@@ -18,8 +18,10 @@ namespace DownKyi.Core.BiliApi.LoginNew
         public static LoginUrlOrigin GetLoginUrl()
         {
             string getLoginUrl = "https://passport.bilibili.com/x/passport-login/web/qrcode/generate";
-            string response = WebClient.RequestWeb(getLoginUrl);
+            string response = WebClient.HttpRequestGetData(getLoginUrl);
+
             Console.Out.WriteLine(response);
+
             try
             {
                 return JsonConvert.DeserializeObject<LoginUrlOrigin>(response);

src/DownKyi.Core/BiliApi/WebClient.cs

@@ -141,5 +141,36 @@ namespace DownKyi.Core.BiliApi
                 return RequestWeb(url, referer, method, parameters, retry - 1);
             }
         }
+
+
+        #region HttpGet 数据请求
+        /// <summary>
+        /// HttpGet 数据请求
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public static string HttpRequestGetData(string url)
+        {
+            string result = "";
+            try
+            {
+                HttpWebRequest objRequest = (HttpWebRequest)WebRequest.Create(url);
+                objRequest.Method = "GET";
+                HttpWebResponse objResponse = (HttpWebResponse)objRequest.GetResponse();
+                using (StreamReader sr = new StreamReader(objResponse.GetResponseStream()))
+                {
+                    result = sr.ReadToEnd();
+                    sr.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.Out.WriteLine(ex.ToString());
+            }
+            return result;
+        }
+        #endregion
+
+
     }
 }

src/DownKyi/ViewModels/ViewLoginViewModel.cs

@@ -253,7 +253,6 @@ namespace DownKyi.ViewModels
             InitStatus();
 
             Task.Run(Login, (tokenSource = new CancellationTokenSource()).Token);
-            //await loginTask;
         }