diff --git a/BiliAccount.Geetest/BiliAccount.Geetest.csproj b/BiliAccount.Geetest/BiliAccount.Geetest.csproj
index c51877b..f172c32 100644
--- a/BiliAccount.Geetest/BiliAccount.Geetest.csproj
+++ b/BiliAccount.Geetest/BiliAccount.Geetest.csproj
@@ -6,7 +6,7 @@
BiliAccount.Geetest
true
BiliAccount.Geetest
- 1.0.4.4
+ 1.0.5.5
LeoChen
zhangbudademao.com
BiliAccount.Geetest
@@ -20,8 +20,7 @@
favicon_4.png
enhancements:
- 1. 更新了BiliAccount到2.5.2.24
- 2. 更新了Titanium.Web.Proxy到3.1.1341
+ 1. 更新了Titanium.Web.Proxy到3.1.1344
true
snupkg
@@ -119,7 +118,7 @@
-
+
diff --git a/BiliAccount.TestProject/Program.cs b/BiliAccount.TestProject/Program.cs
index f879a42..fc6d383 100644
--- a/BiliAccount.TestProject/Program.cs
+++ b/BiliAccount.TestProject/Program.cs
@@ -33,28 +33,28 @@ private static void Main(string[] args)
Console.WriteLine($"BiliAccount：{AssemblyName.GetAssemblyName("BiliAccount.dll").Version.ToString()}");
Console.WriteLine($"BiliAccount.Geetest：{AssemblyName.GetAssemblyName("BiliAccount.Geetest.dll").Version.ToString()}");
Console.WriteLine($"BiliAccount.Geetest.Controls：{AssemblyName.GetAssemblyName("BiliAccount.Geetest.Controls.dll").Version.ToString()}");
- //Console.WriteLine("账号");
- //string username = Console.ReadLine();
- //Console.WriteLine("密码");
- //string pwd = Console.ReadLine();
- //Account account = ByPassword.LoginByPassword(username, pwd);
- //Console.WriteLine(var_dump(account));
- //if (account.LoginStatus == Account.LoginStatusEnum.NeedSafeVerify) Process.Start(account.Url);
+ Console.WriteLine("账号");
+ string username = Console.ReadLine();
+ Console.WriteLine("密码");
+ string pwd = Console.ReadLine();
+ Account account = ByPassword.LoginByPassword(username, pwd);
+ Console.WriteLine(var_dump(account));
+ if (account.LoginStatus == Account.LoginStatusEnum.NeedSafeVerify) Process.Start(account.Url);
//ByQRCode.QrCodeStatus_Changed += ByQRCode_QrCodeStatus_Changed;
//ByQRCode.QrCodeRefresh += ByQRCode_QrCodeRefresh;
- //ByQRCode.LoginByQrCode("#ff000000","#00FFFFFF").Save("tmp.png");
+ //ByQRCode.LoginByQrCode("#ff000000", "#00FFFFFF").Save("tmp.png");
//string token = Console.ReadLine();
//Console.WriteLine(BiliAccount.Linq.ByPassword.IsTokenAvailable(token));
- Console.WriteLine("手机号");
- string tel = Console.ReadLine();
- BySMS.SendSMS(tel);
- Console.WriteLine("验证码");
- string code = Console.ReadLine();
- Account account = BySMS.Login(code, tel);
- Console.WriteLine(var_dump(account));
+ //Console.WriteLine("手机号");
+ //string tel = Console.ReadLine();
+ //BySMS.SendSMS(tel);
+ //Console.WriteLine("验证码");
+ //string code = Console.ReadLine();
+ //Account account = BySMS.Login(code, tel);
+ //Console.WriteLine(var_dump(account));
//Console.WriteLine(var_dump(ByPassword.SSO(account.AccessToken)));
diff --git a/BiliAccount/BiliAccount.csproj b/BiliAccount/BiliAccount.csproj
index ca964d7..24e8ba2 100644
--- a/BiliAccount/BiliAccount.csproj
+++ b/BiliAccount/BiliAccount.csproj
@@ -6,7 +6,7 @@
BiliAccount
true
BiliAccount
- 2.5.2.24
+ 2.5.4.26
LeoChen
zhangbudademao.com
BiliAccount
@@ -19,10 +19,8 @@
bilibili bililive bililogin biliaccount
favicon_4.png
- enhancements:
- 1. 更新了QRCoder到1.4.1版本（针对.net standard和.net core平台）
- 2. 更新了System.Drawing.Common到5.0.0（针对.net standard和.net core平台）
- 3. 优化了对SSO过程中对低版本IDE环境的兼容性。(#18)
+ fixes:
+ 1. 修复了由于破站改接口导致无法通过密码登录的问题。
true
snupkg
@@ -100,6 +98,14 @@
Auto
+
+ 1701;1702;NETSDK1138
+
+
+
+ 1701;1702;NETSDK1138
+
+
diff --git a/BiliAccount/Core/ByPassword.cs b/BiliAccount/Core/ByPassword.cs
index 716ecab..d4e23d6 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}&build={Config.Instance.Build}&buvid={account.Buvid}&channel=bili&local_id={account.Buvid}&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}&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", "", Config.Instance.User_Agent);
+ 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
@@ -94,7 +94,8 @@ 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", "", Config.Instance.User_Agent);
+ 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
@@ -370,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/Core/ByQRCode.cs b/BiliAccount/Core/ByQRCode.cs
index a5b3f08..56ba52a 100644
--- a/BiliAccount/Core/ByQRCode.cs
+++ b/BiliAccount/Core/ByQRCode.cs
@@ -61,7 +61,7 @@ public static Bitmap GetQrcode(Color Foreground,Color Background,bool IsBorderVi
Bitmap qrCodeImage = null;
re:
//获取二维码要包含的url
- string str = Http.GetBody("https://passport.bilibili.com/qrcode/getLoginUrl", null, "https://passport.bilibili.com/login");
+ string str = Http.GetBody("https://passport.bilibili.com/qrcode/getLoginUrl", null, "https://passport.bilibili.com/login",$"BiliAccount/{Config.Dll_Version}");
if (!string.IsNullOrEmpty(str))
{
#if NETSTANDARD2_0 || NETCORE3_0
@@ -117,7 +117,7 @@ private static void MonitorCallback(object o)
{
string oauthKey = o.ToString();
- string str = Http.PostBody("https://passport.bilibili.com/qrcode/getLoginInfo", "oauthKey=" + oauthKey + "&gourl=https%3A%2F%2Fwww.bilibili.com%2F", null, "application/x-www-form-urlencoded; charset=UTF-8", "https://passport.bilibili.com/login");
+ string str = Http.PostBody("https://passport.bilibili.com/qrcode/getLoginInfo", "oauthKey=" + oauthKey + "&gourl=https%3A%2F%2Fwww.bilibili.com%2F", null, "application/x-www-form-urlencoded; charset=UTF-8", "https://passport.bilibili.com/login",$"BiliAccount/{Config.Dll_Version}");
if (!string.IsNullOrEmpty(str))
{
#if NETSTANDARD2_0 || NETCORE3_0
diff --git a/BiliAccount/Core/BySMS.cs b/BiliAccount/Core/BySMS.cs
index 05cbf52..6ec3dec 100644
--- a/BiliAccount/Core/BySMS.cs
+++ b/BiliAccount/Core/BySMS.cs
@@ -48,10 +48,10 @@ private static long TimeStamp
public static Account Login(string captcha_key, string code, string tel)
{
Account account = new Account();
- string param = $"appkey={Config.Instance.Appkey}&bili_local_id={account.DeviceId}&build={Config.Instance.Build}&buvid={account.Buvid}&captcha_key={captcha_key}&channel=bili&cid=86&code={code}&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&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&tel={tel}&ts={TimeStamp}";
+ string param = $"appkey={Config.Instance.Appkey}&bili_local_id={account.DeviceId}&build={Config.Instance.Build}&buvid={account.Buvid}&captcha_key={captcha_key}&channel=bili&cid=86&code={code}&device=phone&device_id={account.DeviceId}&device_name=BiliAccount{account.DeviceGuid}&device_platform=BiliAccount{Config.Dll_Version}&local_id={account.Buvid}&mobi_app=android&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&tel={tel}&ts={TimeStamp}";
param += $"&sign={GetSign(param)}";
- string str = Http.PostBody("https://passport.bilibili.com/x/passport-login/login/sms", param);
+ string str = Http.PostBody("https://passport.bilibili.com/x/passport-login/login/sms", param,null, $"BiliAccount/{Config.Dll_Version}");
#if NETSTANDARD2_0 || NETCORE3_0
Login_DataTemplete obj = JsonConvert.DeserializeObject(str);
#else
@@ -92,7 +92,7 @@ public static string SMS_Send(string tel)
{
string param = $"appkey={Config.Instance.Appkey}&build={Config.Instance.Build}&channel=bili&cid=86&mobi_app=android&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&tel={tel}&ts={TimeStamp}";
param += $"&sign={GetSign(param)}";
- string str = Http.PostBody("https://passport.bilibili.com/x/passport-login/sms/send", param);
+ string str = Http.PostBody("https://passport.bilibili.com/x/passport-login/sms/send", param,null, $"BiliAccount/{Config.Dll_Version}");
#if NETSTANDARD2_0 || NETCORE3_0
SMS_Send_DataTemplete obj = JsonConvert.DeserializeObject(str);
#else
diff --git a/BiliAccount/Core/Config.cs b/BiliAccount/Core/Config.cs
index db35b1c..64ac3e6 100644
--- a/BiliAccount/Core/Config.cs
+++ b/BiliAccount/Core/Config.cs
@@ -1,4 +1,5 @@
using System;
+using System.Reflection;
#if NETSTANDARD2_0 || NETCORE3_0
using Newtonsoft.Json;
@@ -23,6 +24,17 @@ internal class Config
#endregion Private Fields
+ ///
+ /// 当前程序集版本号
+ ///
+ public static string Dll_Version
+ {
+ get
+ {
+ return Assembly.GetExecutingAssembly().GetName().Version.ToString();
+ }
+ }
+
#region Private Constructors
///
diff --git a/BiliAccount/Core/Device_Verify.cs b/BiliAccount/Core/Device_Verify.cs
index 74b7254..8fc3aa6 100644
--- a/BiliAccount/Core/Device_Verify.cs
+++ b/BiliAccount/Core/Device_Verify.cs
@@ -47,7 +47,8 @@ public static void GetAccount(string code, ref Account account)
param += $"&sign={GetSign(param)}";
WebHeaderCollection headers = new WebHeaderCollection();
headers.Add("Buvid", account.Buvid);
- string str = Http.GetBody($"https://passport.bilibili.com/api/v2/oauth2/access_token?{param}", null, "", Config.Instance.User_Agent, headers);
+ //string str = Http.GetBody($"https://passport.bilibili.com/api/v2/oauth2/access_token?{param}", null, "", Config.Instance.User_Agent, headers);
+ string str = Http.GetBody($"https://passport.bilibili.com/api/v2/oauth2/access_token?{param}", null, "", $"BiliAccount/{Config.Dll_Version}", headers);
if (!string.IsNullOrEmpty(str))
{
#if NETSTANDARD2_0 || NETCORE3_0
@@ -88,7 +89,7 @@ public static void GetAccount(string code, ref Account account)
///
public static void SMS_Send(string challenge, string key, string tmp_token, string validate)
{
- string str = Http.PostBody("https://api.bilibili.com/x/safecenter/sms/send", $"csrf=&csrf_token=&type=18&captcha_type=7&captcha_key={key}&captcha=&challenge={challenge}&seccode={validate}%7Cjordan&validate={validate}&tmp_code={tmp_token}");
+ string str = Http.PostBody("https://api.bilibili.com/x/safecenter/sms/send", $"csrf=&csrf_token=&type=18&captcha_type=7&captcha_key={key}&captcha=&challenge={challenge}&seccode={validate}%7Cjordan&validate={validate}&tmp_code={tmp_token}",null, $"BiliAccount/{Config.Dll_Version}");
if (!string.IsNullOrEmpty(str))
{
int code = int.Parse(new Regex("(?<=\"code\":)(\\d+)(?=,)").Match(str).Value);
@@ -112,7 +113,7 @@ public static string Verify(string code, string tmp_token)
{
string param = $"appkey={Config.Instance.Appkey}&build={Config.Instance.Build}&channel=bili&code={code}&csrf=&csrf_token=&mobi_app=android&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&tmp_token={tmp_token}&ts={TimeStamp * 1000}";
param += $"&sign={GetSign(param)}";
- string str = Http.PostBody("https://passport.bilibili.com/api/login/verify_device", param);
+ string str = Http.PostBody("https://passport.bilibili.com/api/login/verify_device", param,null, $"BiliAccount/{Config.Dll_Version}");
if (!string.IsNullOrEmpty(str))
{
#if NETSTANDARD2_0 || NETCORE3_0
diff --git a/BiliAccount/Exceptions/GetAccount_Exception.cs b/BiliAccount/Exceptions/GetAccount_Exception.cs
index 2c08649..2f9a9f7 100644
--- a/BiliAccount/Exceptions/GetAccount_Exception.cs
+++ b/BiliAccount/Exceptions/GetAccount_Exception.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace BiliAccount.Exceptions
{
@@ -25,5 +22,4 @@ public GetAccount_Exception(int code, string message) : base(message)
#endregion Public Constructors
}
-
-}
+}
\ No newline at end of file
diff --git a/BiliAccount/Exceptions/InvalidColorValue.cs b/BiliAccount/Exceptions/InvalidColorValue.cs
index e3b56ac..6db26e0 100644
--- a/BiliAccount/Exceptions/InvalidColorValue.cs
+++ b/BiliAccount/Exceptions/InvalidColorValue.cs
@@ -5,12 +5,9 @@ namespace BiliAccount.Exceptions
///
/// 传入了错误的颜色值
///
- public class InvalidColorValue:Exception
+ public class InvalidColorValue : Exception
{
- ///
- /// 错误的属性名
- ///
- public string PropertyName { get; private set; }
+ #region Public Constructors
///
/// 以指定的属性名初始化
@@ -20,5 +17,16 @@ public InvalidColorValue(string name) : base($"传入了错误的颜色值！{na
{
PropertyName = name;
}
+
+ #endregion Public Constructors
+
+ #region Public Properties
+
+ ///
+ /// 错误的属性名
+ ///
+ public string PropertyName { get; private set; }
+
+ #endregion Public Properties
}
-}
+}
\ No newline at end of file
diff --git a/BiliAccount/Exceptions/SMS_Send_Exception.cs b/BiliAccount/Exceptions/SMS_Send_Exception.cs
index 7005b78..0db8fdd 100644
--- a/BiliAccount/Exceptions/SMS_Send_Exception.cs
+++ b/BiliAccount/Exceptions/SMS_Send_Exception.cs
@@ -9,12 +9,6 @@ namespace BiliAccount.Exceptions
///
public class SMS_Send_Exception : Exception
{
- #region Public Fields
-
- public int code { get; private set; }
-
- #endregion Public Fields
-
#region Public Constructors
public SMS_Send_Exception(int code, string message) : base(message)
@@ -23,5 +17,11 @@ public SMS_Send_Exception(int code, string message) : base(message)
}
#endregion Public Constructors
+
+ #region Public Properties
+
+ public int code { get; private set; }
+
+ #endregion Public Properties
}
}
\ No newline at end of file
diff --git a/BiliAccount/Exceptions/Verify_Exception.cs b/BiliAccount/Exceptions/Verify_Exception.cs
index 1fed866..fa8305e 100644
--- a/BiliAccount/Exceptions/Verify_Exception.cs
+++ b/BiliAccount/Exceptions/Verify_Exception.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace BiliAccount.Exceptions
{
@@ -25,4 +22,4 @@ public Verify_Exception(int code, string message) : base(message)
#endregion Public Constructors
}
-}
+}
\ No newline at end of file
diff --git a/BiliAccount/Framework4.0Methods/Stream4Methods.cs b/BiliAccount/Framework4.0Methods/Stream4Methods.cs
index abc3dbf..206547d 100644
--- a/BiliAccount/Framework4.0Methods/Stream4Methods.cs
+++ b/BiliAccount/Framework4.0Methods/Stream4Methods.cs
@@ -1,9 +1,8 @@
-
-namespace BiliAccount
+namespace BiliAccount
{
internal class Stream4Methods
{
-#region Public Methods
+ #region Public Methods
public static void CopyTo(System.IO.Stream input, System.IO.Stream output)
{
@@ -15,6 +14,6 @@ public static void CopyTo(System.IO.Stream input, System.IO.Stream output)
}
}
-#endregion Public Methods
+ #endregion Public Methods
}
-}
+}
\ No newline at end of file
diff --git a/BiliAccount/Framework4.0Methods/String4Methods.cs b/BiliAccount/Framework4.0Methods/String4Methods.cs
index db842f9..8042032 100644
--- a/BiliAccount/Framework4.0Methods/String4Methods.cs
+++ b/BiliAccount/Framework4.0Methods/String4Methods.cs
@@ -1,11 +1,10 @@
-
using System;
namespace BiliAccount
{
internal static class String40Methods
{
-#region Public Methods
+ #region Public Methods
public static bool IsAllDigit(string str)
{
@@ -48,6 +47,6 @@ public static string ReverseString(string str)
return new string(result);
}
-#endregion Public Methods
+ #endregion Public Methods
}
-}
+}
\ No newline at end of file
diff --git a/BiliAccount/Init.json b/BiliAccount/Init.json
index 6f2388f..ad37f8e 100644
--- a/BiliAccount/Init.json
+++ b/BiliAccount/Init.json
@@ -1,7 +1,7 @@
{
- "appkey": "1d8b6e7d45233436",
- "appsecret": "560c52ccd288fed045859ed18bffd973",
- "build": "6130400",
- "version": "6.13.0",
- "user_agent": "Mozilla/5.0 BiliDroid/6.13.0(bbcallen@gmail.com) os/android model/MI 9 mobi_app/android build/6130400 channel/master innerVer/6130400 osVer/10 network/2"
+ "appkey": "bca7e84c2d947ac6",
+ "appsecret": "60698ba2f68e01ce44738920a0ffe768",
+ "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
diff --git a/BiliAccount/Linq/ByPassword.cs b/BiliAccount/Linq/ByPassword.cs
index baec717..473e382 100644
--- a/BiliAccount/Linq/ByPassword.cs
+++ b/BiliAccount/Linq/ByPassword.cs
@@ -1,5 +1,4 @@
using System;
-using System.Text.RegularExpressions;
#pragma warning disable CS0618
diff --git a/BiliAccount/Linq/ByQRCode.cs b/BiliAccount/Linq/ByQRCode.cs
index a1f57b7..392dd31 100644
--- a/BiliAccount/Linq/ByQRCode.cs
+++ b/BiliAccount/Linq/ByQRCode.cs
@@ -149,7 +149,7 @@ public static Bitmap LoginByQrCode(string strForeground = "#FF000000", string st
/// 传入了错误的颜色值
public static Bitmap LoginByQrCode(System.Drawing.Color Foreground, System.Drawing.Color Background, bool IsBorderVisable = false)
{
- if(Foreground != Background)
+ if (Foreground != Background)
return Core.ByQRCode.GetQrcode(Foreground, Background, IsBorderVisable);
else
throw new Exceptions.InvalidColorValue("strForeground and strBackground can not be same!");
diff --git a/BiliAccount/QRCode/AbstractQRCode.cs b/BiliAccount/QRCode/AbstractQRCode.cs
index 9f38f70..2237d1d 100644
--- a/BiliAccount/QRCode/AbstractQRCode.cs
+++ b/BiliAccount/QRCode/AbstractQRCode.cs
@@ -1,11 +1,12 @@
#if !NETSTANDARD2_0 && !NETCORE3_0
+
namespace BiliAccount
{
#pragma warning disable CS1591
internal abstract class AbstractQRCode
{
-#region Protected Constructors
+ #region Protected Constructors
protected AbstractQRCode()
{
@@ -16,15 +17,15 @@ protected AbstractQRCode(QRCodeData data)
this.QrCodeData = data;
}
-#endregion Protected Constructors
+ #endregion Protected Constructors
-#region Protected Properties
+ #region Protected Properties
protected QRCodeData QrCodeData { get; set; }
-#endregion Protected Properties
+ #endregion Protected Properties
-#region Public Methods
+ #region Public Methods
public void Dispose()
{
@@ -40,7 +41,8 @@ virtual public void SetQRCodeData(QRCodeData data)
this.QrCodeData = data;
}
-#endregion Public Methods
+ #endregion Public Methods
}
}
+
#endif
\ No newline at end of file