project-redbud/FunGame-Server
6
1
Fork 0
mirror of https://github.com/project-redbud/FunGame-Server.git synced 2025-12-05 08:09:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

根据Core改动修复一些问题 (#17)

Browse Source 
* 修复UpdateRoom错误返回的问题

* 跟随Core的工厂方法改动
This commit is contained in:
milimoe 2023-06-15 09:14:37 +08:00 committed by GitHub
parent de293557ab
commit 955fff82d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FunGame.Server/Main.cs
View File

@ -216,8 +216,9 @@ bool SendRefuseConnect(ClientSocket socket, string msg)
SQLResult TestSQLConnection() SQLResult TestSQLConnection()
{ {
new MySQLHelper(ServerLoginLogs.Insert_ServerLoginLogs(Config.ServerName, Config.ServerKey)).Execute(out SQLResult TestResult); MySQLHelper sql = new(ServerLoginLogs.Insert_ServerLoginLogs(Config.ServerName, Config.ServerKey));
return TestResult; sql.Execute();
return sql.Result;
} }
void AddBannedList(ServerSocket server) void AddBannedList(ServerSocket server)

93
FunGame.Server/Model/ServerModel.cs
View File

@ -110,14 +110,14 @@ namespace Milimoe.FunGame.Server.Model
if (username != null && password != null) if (username != null && password != null)
{ {
ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] UserName: " + username); ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] UserName: " + username);
SQLHelper.ExecuteDataSet(UserQuery.Select_Users_LoginQuery(username, password), out SQLResult result); SQLHelper.ExecuteDataSet(UserQuery.Select_Users_LoginQuery(username, password));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
DsUser = SQLHelper.DataSet; DsUser = SQLHelper.DataSet;
if (autokey != null && autokey.Trim() != "") if (autokey != null && autokey.Trim() != "")
{ {
SQLHelper.ExecuteDataSet(UserQuery.Select_CheckAutoKey(username, autokey), out result); SQLHelper.ExecuteDataSet(UserQuery.Select_CheckAutoKey(username, autokey));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] AutoKey: 已确认"); ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] AutoKey: 已确认");
} }
@ -145,7 +145,7 @@ namespace Milimoe.FunGame.Server.Model
if (CheckLoginKey.Equals(checkloginkey)) if (CheckLoginKey.Equals(checkloginkey))
{ {
// 创建User对象 // 创建User对象
_User = Factory.GetInstance<User>(DsUser); _User = Factory.GetUser(DsUser);
// 检查有没有重复登录的情况 // 检查有没有重复登录的情况
KickUser(); KickUser();
// 添加至玩家列表 // 添加至玩家列表
@ -153,8 +153,8 @@ namespace Milimoe.FunGame.Server.Model
GetUsersCount(); GetUsersCount();
// CheckLogin // CheckLogin
LoginTime = DateTime.Now.Ticks; LoginTime = DateTime.Now.Ticks;
SQLHelper.Execute(UserQuery.Update_CheckLogin(UserName, socket.ClientIP.Split(':')[0]), out _); SQLHelper.Execute(UserQuery.Update_CheckLogin(UserName, socket.ClientIP.Split(':')[0]));
return Send(socket, type, DsUser); return Send(socket, type, _User);
} }
ServerHelper.WriteLine("客户端发送了错误的秘钥，不允许本次登录。"); ServerHelper.WriteLine("客户端发送了错误的秘钥，不允许本次登录。");
} }
@ -231,22 +231,22 @@ namespace Milimoe.FunGame.Server.Model
if (username != null && email != null) if (username != null && email != null)
{ {
// 先检查账号是否重复 // 先检查账号是否重复
SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistUsername(username), out SQLResult result); SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistUsername(username));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 账号已被注册"); ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 账号已被注册");
return Send(socket, type, RegInvokeType.DuplicateUserName); return Send(socket, type, RegInvokeType.DuplicateUserName);
} }
// 检查邮箱是否重复 // 检查邮箱是否重复
SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistEmail(email), out result); SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistEmail(email));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 邮箱已被注册"); ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 邮箱已被注册");
return Send(socket, type, RegInvokeType.DuplicateEmail); return Send(socket, type, RegInvokeType.DuplicateEmail);
} }
// 检查验证码是否发送过 // 检查验证码是否发送过
SQLHelper.ExecuteDataSet(RegVerifyCodes.Select_HasSentRegVerifyCode(username, email), out result); SQLHelper.ExecuteDataSet(RegVerifyCodes.Select_HasSentRegVerifyCode(username, email));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
DateTime RegTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegTime]; DateTime RegTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegTime];
string RegVerifyCode = (string)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegVerifyCode]; string RegVerifyCode = (string)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegVerifyCode];
@ -257,10 +257,10 @@ namespace Milimoe.FunGame.Server.Model
return Send(socket, type, RegInvokeType.InputVerifyCode); return Send(socket, type, RegInvokeType.InputVerifyCode);
} }
// 发送验证码，需要先删除之前过期的验证码 // 发送验证码，需要先删除之前过期的验证码
SQLHelper.Execute(RegVerifyCodes.Delete_RegVerifyCode(username, email), out _); SQLHelper.Execute(RegVerifyCodes.Delete_RegVerifyCode(username, email));
RegVerify = Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 6); RegVerify = Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 6);
SQLHelper.Execute(RegVerifyCodes.Insert_RegVerifyCode(username, email, RegVerify), out result); SQLHelper.Execute(RegVerifyCodes.Insert_RegVerifyCode(username, email, RegVerify));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
if (MailSender != null) if (MailSender != null)
{ {
@ -300,8 +300,8 @@ namespace Milimoe.FunGame.Server.Model
if (username != null && password != null && email != null && verifycode != null) if (username != null && password != null && email != null && verifycode != null)
{ {
// 先检查验证码 // 先检查验证码
SQLHelper.ExecuteDataSet(RegVerifyCodes.Select_RegVerifyCode(username, email, verifycode), out SQLResult result); SQLHelper.ExecuteDataSet(RegVerifyCodes.Select_RegVerifyCode(username, email, verifycode));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
// 检查验证码是否过期 // 检查验证码是否过期
DateTime RegTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegTime]; DateTime RegTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegTime];
@ -309,25 +309,25 @@ namespace Milimoe.FunGame.Server.Model
{ {
ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 验证码已过期"); ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 验证码已过期");
msg = "此验证码已过期，请重新注册。"; msg = "此验证码已过期，请重新注册。";
SQLHelper.Execute(RegVerifyCodes.Delete_RegVerifyCode(username, email), out _); SQLHelper.Execute(RegVerifyCodes.Delete_RegVerifyCode(username, email));
return Send(socket, type, false, msg); return Send(socket, type, false, msg);
} }
// 注册 // 注册
if (RegVerify.Equals(SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegVerifyCode])) if (RegVerify.Equals(SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegVerifyCode]))
{ {
ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] UserName: " + username + " Email: " + email); ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] UserName: " + username + " Email: " + email);
SQLHelper.Execute(UserQuery.Insert_Register(username, password, email, socket.ClientIP), out result); SQLHelper.Execute(UserQuery.Insert_Register(username, password, email, socket.ClientIP));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
msg = "注册成功！请牢记您的账号与密码！"; msg = "注册成功！请牢记您的账号与密码！";
SQLHelper.Execute(RegVerifyCodes.Delete_RegVerifyCode(username, email), out _); SQLHelper.Execute(RegVerifyCodes.Delete_RegVerifyCode(username, email));
return Send(socket, type, true, msg); return Send(socket, type, true, msg);
} }
else msg = "服务器无法处理您的注册，注册失败！"; else msg = "服务器无法处理您的注册，注册失败！";
} }
else msg = "验证码不正确，请重新输入！"; else msg = "验证码不正确，请重新输入！";
} }
else if (result == SQLResult.NotFound) msg = "验证码不正确，请重新输入！"; else if (SQLHelper.Result == SQLResult.NotFound) msg = "验证码不正确，请重新输入！";
else msg = "服务器无法处理您的注册，注册失败！"; else msg = "服务器无法处理您的注册，注册失败！";
} }
} }
@ -338,14 +338,11 @@ namespace Milimoe.FunGame.Server.Model
Config.RoomList ??= new(); Config.RoomList ??= new();
Config.RoomList.Clear(); Config.RoomList.Clear();
DataSet DsRoomTemp = new(), DsUserTemp = new(); DataSet DsRoomTemp = new(), DsUserTemp = new();
DsRoomTemp = SQLHelper.ExecuteDataSet(RoomQuery.Select_Rooms, out SQLResult TestResult); DsRoomTemp = SQLHelper.ExecuteDataSet(RoomQuery.Select_Rooms);
if (TestResult == SQLResult.Success) DsUserTemp = SQLHelper.ExecuteDataSet(UserQuery.Select_Users);
{ List<Room> rooms = Factory.GetRooms(DsRoomTemp, DsUserTemp);
DsUserTemp = SQLHelper.ExecuteDataSet(UserQuery.Select_Users, out TestResult);
List<Room> rooms = Factory.GetList<Room>(DsRoomTemp, DsUserTemp);
Config.RoomList.AddRooms(rooms); // 更新服务器中的房间列表 Config.RoomList.AddRooms(rooms); // 更新服务器中的房间列表
} return Send(socket, type, rooms); // 传RoomList
return Send(socket, type, DsRoomTemp, DsUserTemp); // 将Ds传递给客户端，在客户端中构建Room
case SocketMessageType.CreateRoom: case SocketMessageType.CreateRoom:
msg = "-1"; msg = "-1";
@ -368,8 +365,8 @@ namespace Milimoe.FunGame.Server.Model
_ => RoomType.None _ => RoomType.None
}; };
string roomid = Verification.CreateVerifyCode(VerifyCodeType.MixVerifyCode, 7).ToUpper(); string roomid = Verification.CreateVerifyCode(VerifyCodeType.MixVerifyCode, 7).ToUpper();
SQLHelper.Execute(RoomQuery.Insert_CreateRoom(roomid, userid, roomtype, password ?? ""), out SQLResult result); SQLHelper.Execute(RoomQuery.Insert_CreateRoom(roomid, userid, roomtype, password ?? ""));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
msg = roomid; msg = roomid;
} }
@ -398,15 +395,15 @@ namespace Milimoe.FunGame.Server.Model
{ {
UpdateRoomMaster = users[0]; UpdateRoomMaster = users[0];
Room.RoomMaster = UpdateRoomMaster; Room.RoomMaster = UpdateRoomMaster;
SQLHelper.Execute(RoomQuery.Update_QuitRoom(roomid, User.Id, UpdateRoomMaster.Id), out _); SQLHelper.Execute(RoomQuery.Update_QuitRoom(roomid, User.Id, UpdateRoomMaster.Id));
DsUser = SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistUsername(UpdateRoomMaster.Username), out _); DsUser = SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistUsername(UpdateRoomMaster.Username));
DsRoom = SQLHelper.ExecuteDataSet(RoomQuery.Select_IsExistRoom(roomid), out _); DsRoom = SQLHelper.ExecuteDataSet(RoomQuery.Select_IsExistRoom(roomid));
} }
else // 没人了就解散房间 else // 没人了就解散房间
{ {
Config.RoomList.RemoveRoom(roomid); Config.RoomList.RemoveRoom(roomid);
SQLHelper.Execute(RoomQuery.Delete_QuitRoom(roomid, User.Id), out SQLResult result); SQLHelper.Execute(RoomQuery.Delete_QuitRoom(roomid, User.Id));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 解散了房间 " + roomid); ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 解散了房间 " + roomid);
} }
@ -422,7 +419,7 @@ namespace Milimoe.FunGame.Server.Model
Client.Send(Client.Socket!, SocketMessageType.Chat, User.Username, DateTimeUtility.GetNowShortTime() + " [ " + User.Username + " ] 离开了房间。"); Client.Send(Client.Socket!, SocketMessageType.Chat, User.Username, DateTimeUtility.GetNowShortTime() + " [ " + User.Username + " ] 离开了房间。");
if (UpdateRoomMaster.Id != 0 && Room.Roomid != "-1") if (UpdateRoomMaster.Id != 0 && Room.Roomid != "-1")
{ {
Client.Send(Client.Socket!, SocketMessageType.UpdateRoomMaster, DsUser, DsRoom); Client.Send(Client.Socket!, SocketMessageType.UpdateRoomMaster, User, Room);
} }
} }
} }
@ -537,8 +534,8 @@ namespace Milimoe.FunGame.Server.Model
if (verifycode.Trim() != "") if (verifycode.Trim() != "")
{ {
// 先检查验证码 // 先检查验证码
SQLHelper.ExecuteDataSet(ForgetVerifyCodes.Select_ForgetVerifyCode(username, email, verifycode), out SQLResult result); SQLHelper.ExecuteDataSet(ForgetVerifyCodes.Select_ForgetVerifyCode(username, email, verifycode));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
// 检查验证码是否过期 // 检查验证码是否过期
DateTime SendTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_SendTime]; DateTime SendTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_SendTime];
@ -546,7 +543,7 @@ namespace Milimoe.FunGame.Server.Model
{ {
ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 验证码已过期"); ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 验证码已过期");
msg = "此验证码已过期，请重新找回密码。"; msg = "此验证码已过期，请重新找回密码。";
SQLHelper.Execute(ForgetVerifyCodes.Delete_ForgetVerifyCode(username, email), out _); SQLHelper.Execute(ForgetVerifyCodes.Delete_ForgetVerifyCode(username, email));
} }
else else
{ {
@ -570,8 +567,8 @@ namespace Milimoe.FunGame.Server.Model
else else
{ {
// 检查验证码是否发送过 // 检查验证码是否发送过
SQLHelper.ExecuteDataSet(ForgetVerifyCodes.Select_HasSentForgetVerifyCode(username, email), out SQLResult result); SQLHelper.ExecuteDataSet(ForgetVerifyCodes.Select_HasSentForgetVerifyCode(username, email));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
DateTime SendTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_SendTime]; DateTime SendTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_SendTime];
string ForgetVerifyCode = (string)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_ForgetVerifyCode]; string ForgetVerifyCode = (string)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_ForgetVerifyCode];
@ -582,10 +579,10 @@ namespace Milimoe.FunGame.Server.Model
else else
{ {
// 发送验证码，需要先删除之前过期的验证码 // 发送验证码，需要先删除之前过期的验证码
SQLHelper.Execute(ForgetVerifyCodes.Delete_ForgetVerifyCode(username, email), out _); SQLHelper.Execute(ForgetVerifyCodes.Delete_ForgetVerifyCode(username, email));
ForgetVerify = Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 6); ForgetVerify = Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 6);
SQLHelper.Execute(ForgetVerifyCodes.Insert_ForgetVerifyCode(username, email, ForgetVerify), out result); SQLHelper.Execute(ForgetVerifyCodes.Insert_ForgetVerifyCode(username, email, ForgetVerify));
if (result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
if (MailSender != null) if (MailSender != null)
{ {
@ -661,7 +658,7 @@ namespace Milimoe.FunGame.Server.Model
{ {
LogoutTime = DateTime.Now.Ticks; LogoutTime = DateTime.Now.Ticks;
int TotalMinutes = Convert.ToInt32((new DateTime(LogoutTime) - new DateTime(LoginTime)).TotalMinutes); int TotalMinutes = Convert.ToInt32((new DateTime(LogoutTime) - new DateTime(LoginTime)).TotalMinutes);
SQLHelper.Execute(UserQuery.Update_GameTime(User.Username, TotalMinutes), out SQLResult result); SQLHelper.Execute(UserQuery.Update_GameTime(User.Username, TotalMinutes));
if (SQLHelper.Result == SQLResult.Success) if (SQLHelper.Result == SQLResult.Success)
{ {
ServerHelper.WriteLine("OnlinePlayers: 玩家 " + User.Username + " 本次已游玩" + TotalMinutes + "分钟"); ServerHelper.WriteLine("OnlinePlayers: 玩家 " + User.Username + " 本次已游玩" + TotalMinutes + "分钟");
@ -724,7 +721,7 @@ namespace Milimoe.FunGame.Server.Model
{ {
// 每两小时触发一次SQL服务器的心跳查询，防止SQL服务器掉线 // 每两小时触发一次SQL服务器的心跳查询，防止SQL服务器掉线
Thread.Sleep(2 * 1000 * 3600); Thread.Sleep(2 * 1000 * 3600);
SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistUsername(UserName), out _); SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistUsername(UserName));
} }
} }

20
FunGame.Server/Utility/DataUtility/MySQLHelper.cs
View File

@ -39,14 +39,13 @@ namespace Milimoe.FunGame.Server.Utility
/// </summary> /// </summary>
/// <param name="Result">执行结果</param> /// <param name="Result">执行结果</param>
/// <returns>影响的行数</returns> /// <returns>影响的行数</returns>
public override int Execute(out SQLResult Result) public override int Execute()
{ {
// _IsOneTime = true需要手动创建连接和关闭 // _IsOneTime = true需要手动创建连接和关闭
if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo); if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo);
ServerHelper.WriteLine("SQLQuery -> " + Script); ServerHelper.WriteLine("SQLQuery -> " + Script);
_DataSet = new DataSet(); _DataSet = new DataSet();
_UpdateRows = MySQLManager.Execute(this, out Result); _UpdateRows = MySQLManager.Execute(this, out _Result);
_Result = Result;
if (_IsOneTime) Close(); if (_IsOneTime) Close();
return _UpdateRows; return _UpdateRows;
} }
@ -57,15 +56,14 @@ namespace Milimoe.FunGame.Server.Utility
/// <param name="Script">命令</param> /// <param name="Script">命令</param>
/// <param name="Result">执行结果</param> /// <param name="Result">执行结果</param>
/// <returns>影响的行数</returns> /// <returns>影响的行数</returns>
public override int Execute(string Script, out SQLResult Result) public override int Execute(string Script)
{ {
// _IsOneTime = true需要手动创建连接和关闭 // _IsOneTime = true需要手动创建连接和关闭
if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo); if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo);
ServerHelper.WriteLine("SQLQuery -> " + Script); ServerHelper.WriteLine("SQLQuery -> " + Script);
this.Script = Script; this.Script = Script;
_DataSet = new DataSet(); _DataSet = new DataSet();
_UpdateRows = MySQLManager.Execute(this, out Result); _UpdateRows = MySQLManager.Execute(this, out _Result);
_Result = Result;
if (_IsOneTime) Close(); if (_IsOneTime) Close();
return _UpdateRows; return _UpdateRows;
} }
@ -75,13 +73,12 @@ namespace Milimoe.FunGame.Server.Utility
/// </summary> /// </summary>
/// <param name="Result">执行结果</param> /// <param name="Result">执行结果</param>
/// <returns>结果集</returns> /// <returns>结果集</returns>
public override DataSet ExecuteDataSet(out SQLResult Result) public override DataSet ExecuteDataSet()
{ {
// _IsOneTime = true需要手动创建连接和关闭 // _IsOneTime = true需要手动创建连接和关闭
if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo); if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo);
ServerHelper.WriteLine("SQLQuery -> " + Script); ServerHelper.WriteLine("SQLQuery -> " + Script);
_DataSet = MySQLManager.ExecuteDataSet(this, out Result, out _UpdateRows); _DataSet = MySQLManager.ExecuteDataSet(this, out _Result, out _UpdateRows);
_Result = Result;
if (_IsOneTime) Close(); if (_IsOneTime) Close();
return DataSet; return DataSet;
} }
@ -92,14 +89,13 @@ namespace Milimoe.FunGame.Server.Utility
/// <param name="Script">命令</param> /// <param name="Script">命令</param>
/// <param name="Result">执行结果</param> /// <param name="Result">执行结果</param>
/// <returns>结果集</returns> /// <returns>结果集</returns>
public override DataSet ExecuteDataSet(string Script, out SQLResult Result) public override DataSet ExecuteDataSet(string Script)
{ {
// _IsOneTime = true需要手动创建连接和关闭 // _IsOneTime = true需要手动创建连接和关闭
if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo); if (_IsOneTime) _Connection = new MySQLConnection(out _ServerInfo);
ServerHelper.WriteLine("SQLQuery -> " + Script); ServerHelper.WriteLine("SQLQuery -> " + Script);
this.Script = Script; this.Script = Script;
_DataSet = MySQLManager.ExecuteDataSet(this, out Result, out _UpdateRows); _DataSet = MySQLManager.ExecuteDataSet(this, out _Result, out _UpdateRows);
_Result = Result;
if (_IsOneTime) Close(); if (_IsOneTime) Close();
return DataSet; return DataSet;
} }