project-redbud/FunGame-Core
6
1
Fork 0
mirror of https://github.com/project-redbud/FunGame-Core.git synced 2025-04-22 03:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove user's password (#47)

Browse Source
This commit is contained in:
milimoe 2023-07-30 02:48:47 +08:00 committed by GitHub
parent ca052f1d31
commit 2a1a85e338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Api/Factory/UserFactory.cs
View File

@ -13,9 +13,9 @@ namespace Milimoe.FunGame.Core.Api.Factory
return General.UnknownUserInstance; return General.UnknownUserInstance;
} }
public static User Create(long Id = 0, string Username = "", string Password = "", DateTime? RegTime = null, DateTime? LastTime = null, string Email = "", string NickName = "", bool IsAdmin = false, bool IsOperator = false, bool IsEnable = true, decimal Credits = 0, decimal Materials = 0, decimal GameTime = 0, string AutoKey = "") public static User Create(long Id = 0, string Username = "", DateTime? RegTime = null, DateTime? LastTime = null, string Email = "", string NickName = "", bool IsAdmin = false, bool IsOperator = false, bool IsEnable = true, decimal Credits = 0, decimal Materials = 0, decimal GameTime = 0, string AutoKey = "")
{ {
return new User(Id, Username, Password, RegTime, LastTime, Email, NickName, IsAdmin, IsOperator, IsEnable, Credits, Materials, GameTime, AutoKey); return new User(Id, Username, RegTime, LastTime, Email, NickName, IsAdmin, IsOperator, IsEnable, Credits, Materials, GameTime, AutoKey);
} }
} }
} }

8
Api/Utility/Factory.cs
View File

@ -160,7 +160,6 @@ namespace Milimoe.FunGame.Core.Api.Utility
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <param name="Username"></param> /// <param name="Username"></param>
/// <param name="Password"></param>
/// <param name="RegTime"></param> /// <param name="RegTime"></param>
/// <param name="LastTime"></param> /// <param name="LastTime"></param>
/// <param name="Email"></param> /// <param name="Email"></param>
@ -173,9 +172,9 @@ namespace Milimoe.FunGame.Core.Api.Utility
/// <param name="GameTime"></param> /// <param name="GameTime"></param>
/// <param name="AutoKey"></param> /// <param name="AutoKey"></param>
/// <returns></returns> /// <returns></returns>
public static User GetUser(long Id = 0, string Username = "", string Password = "", DateTime? RegTime = null, DateTime? LastTime = null, string Email = "", string NickName = "", bool IsAdmin = false, bool IsOperator = false, bool IsEnable = true, decimal Credits = 0, decimal Materials = 0, decimal GameTime = 0, string AutoKey = "") public static User GetUser(long Id = 0, string Username = "", DateTime? RegTime = null, DateTime? LastTime = null, string Email = "", string NickName = "", bool IsAdmin = false, bool IsOperator = false, bool IsEnable = true, decimal Credits = 0, decimal Materials = 0, decimal GameTime = 0, string AutoKey = "")
{ {
return UserFactory.Create(Id, Username, Password, RegTime, LastTime, Email, NickName, IsAdmin, IsOperator, IsEnable, Credits, Materials, GameTime, AutoKey); return UserFactory.Create(Id, Username, RegTime, LastTime, Email, NickName, IsAdmin, IsOperator, IsEnable, Credits, Materials, GameTime, AutoKey);
} }
/// <summary> /// <summary>
@ -203,7 +202,6 @@ namespace Milimoe.FunGame.Core.Api.Utility
{ {
long Id = (long)dr[UserQuery.Column_UID]; long Id = (long)dr[UserQuery.Column_UID];
string Username = (string)dr[UserQuery.Column_Username]; string Username = (string)dr[UserQuery.Column_Username];
string Password = (string)dr[UserQuery.Column_Password];
DateTime RegTime = (DateTime)dr[UserQuery.Column_RegTime]; DateTime RegTime = (DateTime)dr[UserQuery.Column_RegTime];
DateTime LastTime = (DateTime)dr[UserQuery.Column_LastTime]; DateTime LastTime = (DateTime)dr[UserQuery.Column_LastTime];
string Email = (string)dr[UserQuery.Column_Email]; string Email = (string)dr[UserQuery.Column_Email];
@ -215,7 +213,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
decimal Materials = Convert.ToDecimal(dr[UserQuery.Column_Materials]); decimal Materials = Convert.ToDecimal(dr[UserQuery.Column_Materials]);
decimal GameTime = Convert.ToDecimal(dr[UserQuery.Column_GameTime]); decimal GameTime = Convert.ToDecimal(dr[UserQuery.Column_GameTime]);
string AutoKey = (string)dr[UserQuery.Column_AutoKey]; string AutoKey = (string)dr[UserQuery.Column_AutoKey];
return UserFactory.Create(Id, Username, Password, RegTime, LastTime, Email, NickName, IsAdmin, IsOperator, IsEnable, Credits, Materials, GameTime, AutoKey); return UserFactory.Create(Id, Username, RegTime, LastTime, Email, NickName, IsAdmin, IsOperator, IsEnable, Credits, Materials, GameTime, AutoKey);
} }
return UserFactory.Create(); return UserFactory.Create();
} }

4
Entity/User/User.cs
View File

@ -10,7 +10,6 @@ namespace Milimoe.FunGame.Core.Entity
public override Guid Guid { get; set; } = Guid.NewGuid(); public override Guid Guid { get; set; } = Guid.NewGuid();
public override long Id { get; set; } public override long Id { get; set; }
public string Username { get; set; } = ""; public string Username { get; set; } = "";
public string Password { get; set; } = "";
public DateTime RegTime { get; set; } public DateTime RegTime { get; set; }
public DateTime LastTime { get; set; } public DateTime LastTime { get; set; }
public string Email { get; set; } = ""; public string Email { get; set; } = "";
@ -30,11 +29,10 @@ namespace Milimoe.FunGame.Core.Entity
} }
internal User(long Id = 0, string Username = "", string Password = "", DateTime? RegTime = null, DateTime? LastTime = null, string Email = "", string NickName = "", bool IsAdmin = false, bool IsOperator = false, bool IsEnable = true, decimal Credits = 0, decimal Materials = 0, decimal GameTime = 0, string AutoKey = "") internal User(long Id = 0, string Username = "", DateTime? RegTime = null, DateTime? LastTime = null, string Email = "", string NickName = "", bool IsAdmin = false, bool IsOperator = false, bool IsEnable = true, decimal Credits = 0, decimal Materials = 0, decimal GameTime = 0, string AutoKey = "")
{ {
this.Id = Id; this.Id = Id;
this.Username = Username; this.Username = Username;
this.Password = Password;
this.RegTime = RegTime ?? General.DefaultTime; this.RegTime = RegTime ?? General.DefaultTime;
this.LastTime = LastTime ?? General.DefaultTime; this.LastTime = LastTime ?? General.DefaultTime;
this.Email = Email; this.Email = Email;

4
Library/Common/JsonConverter/UserConverter.cs
View File

@ -34,9 +34,6 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
case UserQuery.Column_Username: case UserQuery.Column_Username:
user.Username = reader.GetString() ?? ""; user.Username = reader.GetString() ?? "";
break; break;
case UserQuery.Column_Password:
user.Password = reader.GetString() ?? "";
break;
case UserQuery.Column_RegTime: case UserQuery.Column_RegTime:
string regTime = reader.GetString() ?? ""; string regTime = reader.GetString() ?? "";
if (DateTime.TryParseExact(regTime, General.GeneralDateTimeFormat, null, System.Globalization.DateTimeStyles.None, out DateTime RegTime)) if (DateTime.TryParseExact(regTime, General.GeneralDateTimeFormat, null, System.Globalization.DateTimeStyles.None, out DateTime RegTime))
@ -92,7 +89,6 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
writer.WriteStartObject(); writer.WriteStartObject();
writer.WriteNumber(UserQuery.Column_UID, value.Id); writer.WriteNumber(UserQuery.Column_UID, value.Id);
writer.WriteString(UserQuery.Column_Username, value.Username); writer.WriteString(UserQuery.Column_Username, value.Username);
writer.WriteString(UserQuery.Column_Password, value.Password);
writer.WriteString(UserQuery.Column_RegTime, value.RegTime.ToString(General.GeneralDateTimeFormat)); writer.WriteString(UserQuery.Column_RegTime, value.RegTime.ToString(General.GeneralDateTimeFormat));
writer.WriteString(UserQuery.Column_LastTime, value.LastTime.ToString(General.GeneralDateTimeFormat)); writer.WriteString(UserQuery.Column_LastTime, value.LastTime.ToString(General.GeneralDateTimeFormat));
writer.WriteString(UserQuery.Column_Email, value.Email); writer.WriteString(UserQuery.Column_Email, value.Email);