diff --git a/Api/Factory/UserFactory.cs b/Api/Factory/UserFactory.cs index 68b7dba..54cabe4 100644 --- a/Api/Factory/UserFactory.cs +++ b/Api/Factory/UserFactory.cs @@ -13,9 +13,9 @@ namespace Milimoe.FunGame.Core.Api.Factory 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); } } } diff --git a/Api/Utility/Factory.cs b/Api/Utility/Factory.cs index 876ffb9..46bda57 100644 --- a/Api/Utility/Factory.cs +++ b/Api/Utility/Factory.cs @@ -160,7 +160,6 @@ namespace Milimoe.FunGame.Core.Api.Utility /// /// /// - /// /// /// /// @@ -173,9 +172,9 @@ namespace Milimoe.FunGame.Core.Api.Utility /// /// /// - 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); } /// @@ -203,7 +202,6 @@ namespace Milimoe.FunGame.Core.Api.Utility { long Id = (long)dr[UserQuery.Column_UID]; string Username = (string)dr[UserQuery.Column_Username]; - string Password = (string)dr[UserQuery.Column_Password]; DateTime RegTime = (DateTime)dr[UserQuery.Column_RegTime]; DateTime LastTime = (DateTime)dr[UserQuery.Column_LastTime]; 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 GameTime = Convert.ToDecimal(dr[UserQuery.Column_GameTime]); 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(); } diff --git a/Entity/User/User.cs b/Entity/User/User.cs index d746b1c..6f8cd37 100644 --- a/Entity/User/User.cs +++ b/Entity/User/User.cs @@ -10,7 +10,6 @@ namespace Milimoe.FunGame.Core.Entity public override Guid Guid { get; set; } = Guid.NewGuid(); public override long Id { get; set; } public string Username { get; set; } = ""; - public string Password { get; set; } = ""; public DateTime RegTime { get; set; } public DateTime LastTime { 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.Username = Username; - this.Password = Password; this.RegTime = RegTime ?? General.DefaultTime; this.LastTime = LastTime ?? General.DefaultTime; this.Email = Email; diff --git a/Library/Common/JsonConverter/UserConverter.cs b/Library/Common/JsonConverter/UserConverter.cs index 684c59c..ea0416b 100644 --- a/Library/Common/JsonConverter/UserConverter.cs +++ b/Library/Common/JsonConverter/UserConverter.cs @@ -34,9 +34,6 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter case UserQuery.Column_Username: user.Username = reader.GetString() ?? ""; break; - case UserQuery.Column_Password: - user.Password = reader.GetString() ?? ""; - break; case UserQuery.Column_RegTime: string regTime = reader.GetString() ?? ""; 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.WriteNumber(UserQuery.Column_UID, value.Id); 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_LastTime, value.LastTime.ToString(General.GeneralDateTimeFormat)); writer.WriteString(UserQuery.Column_Email, value.Email);