yeziuku/FunGame-Core
1
0
Fork 0
forked from project-redbud/FunGame-Core
Code Pull Requests Activity

修复潜在危害 #1

Browse Source 
修复潜在危害
This commit is contained in:
Yezi 2023-03-30 15:27:18 +08:00 committed by GitHub
commit bbe634b8bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FunGame.Desktop/Model/LoginModel.cs
View File

@ -18,7 +18,6 @@ namespace Milimoe.FunGame.Desktop.Model
{
private static SocketObject Work;
private static bool Working = false;
private static bool Success = false;
public LoginModel() : base(RunTime.Socket)
{
@ -29,9 +28,11 @@ namespace Milimoe.FunGame.Desktop.Model
{
try
{
Work = SocketObject;
Success = true;
Working = false;
if (SocketObject.SocketType == SocketMessageType.Login || SocketObject.SocketType == SocketMessageType.CheckLogin)
{
Work = SocketObject;
Working = false;
}
}
catch (Exception e)
{
@ -53,9 +54,9 @@ namespace Milimoe.FunGame.Desktop.Model
if (objs.Length > 1) password = (string)objs[1];
if (objs.Length > 2) autokey = (string)objs[2];
password = password.Encrypt(username);
SetWorking();
if (Socket.Send(SocketMessageType.Login, username, password, autokey) == SocketResult.Success)
{
SetWorking();
string ErrorMsg = "";
Guid CheckLoginKey = Guid.Empty;
(CheckLoginKey, ErrorMsg) = await Task.Factory.StartNew(GetCheckLoginKeyAsync);
@ -64,9 +65,9 @@ namespace Milimoe.FunGame.Desktop.Model
ShowMessage.ErrorMessage(ErrorMsg, "登录失败");
return false;
}
SetWorking();
if (Socket.Send(SocketMessageType.CheckLogin, CheckLoginKey) == SocketResult.Success)
{
SetWorking();
DataSet ds = await Task.Factory.StartNew(GetLoginUserAsync);
if (ds != null)
{
@ -96,7 +97,7 @@ namespace Milimoe.FunGame.Desktop.Model
{
if (!Working) break;
}
if (Success)
if (Work != null)
{
// 返回一个确认登录的Key
if (Work.Length > 0) key = Work.GetParam<Guid>(0);
@ -124,7 +125,7 @@ namespace Milimoe.FunGame.Desktop.Model
{
if (!Working) break;
}
if (Success)
if (Work != null)
{
// 返回构造User对象的DataTable
if (Work.Length > 0) ds = Work.GetParam<DataSet>(0);
@ -141,7 +142,6 @@ namespace Milimoe.FunGame.Desktop.Model
private static void SetWorking()
{
Working = true;
Success = false;
Work = default;
}
}