修改SQL工具类

FunGame.Core/Api/Data/SQLHelper.cs

@@ -8,7 +8,7 @@ namespace Milimoe.FunGame.Core.Api.Data
     /// 需要在Server中继承此类实现。
     /// Milimoe.FunGame.Core.Service.SQLManager也是
     /// </summary>
-    public class SQLHelper : ISQLHelper
+    public abstract class SQLHelper : ISQLHelper
     {
         public string Script { get; set; } = "";
 
@@ -18,24 +18,10 @@ namespace Milimoe.FunGame.Core.Api.Data
 
         public SQLResult Result { get; }
 
-        public SQLServerInfo ServerInfo { get; }
+        public abstract SQLServerInfo ServerInfo { get; }
 
         public int UpdateRows { get; }
 
-        public static SQLHelper GetHelper(EntityType type)
-        {
-            return new SQLHelper(type);
-        }
-
-        private SQLHelper(EntityType type = EntityType.Empty, SQLServerInfo? info = null, SQLResult result = SQLResult.Success, int rows = 0)
-        {
-            this.EntityType = type;
-            if (info == null) this.ServerInfo = SQLServerInfo.Create();
-            else this.ServerInfo = info;
-            this.Result = result;
-            this.UpdateRows = rows;
-        }
-
         public virtual SQLResult Execute()
         {
             return SQLResult.NotFound;

FunGame.Core/Interface/Base/ISQLHelper.cs

@@ -1,4 +1,5 @@
-using Milimoe.FunGame.Core.Library.Constant;
+using Milimoe.FunGame.Core.Library.Common.Network;
+using Milimoe.FunGame.Core.Library.Constant;
 
 namespace Milimoe.FunGame.Core.Interface.Base
 {
@@ -9,6 +10,6 @@ namespace Milimoe.FunGame.Core.Interface.Base
         public object Entity { get; }
         public SQLResult Result { get; }
         int UpdateRows { get; }
-        public Library.Common.Network.SQLServerInfo ServerInfo { get; }
+        public SQLServerInfo ServerInfo { get; }
     }
 }

FunGame.Core/Service/SQLManager.cs

@@ -1,84 +1,41 @@
-using Milimoe.FunGame.Core.Api.Data;
+using System.Data;
-using Milimoe.FunGame.Core.Library.Constant;
 using System.Text;
+using Milimoe.FunGame.Core.Api.Data;
+using Milimoe.FunGame.Core.Library.Constant;
 
 namespace Milimoe.FunGame.Core.Service
 {
     /// <summary>
     /// 需要在Server中继承此类实现
     /// </summary>
-    public class SQLManager
+    public abstract class SQLManager
     {
-        internal SQLHelper SQLHelper { get; }
+        public SQLHelper? SQLHelper { get; }
 
-        internal SQLManager(SQLHelper SQLHelper)
+        public abstract int Add(StringBuilder sql, ref SQLResult result);
-        {
-            this.SQLHelper = SQLHelper;
-        }
 
-        protected virtual int Add(StringBuilder sql, ref SQLResult result)
+        public abstract int Add(string sql, ref SQLResult result);
-        {
-            return 0;
-        }
 
-        protected virtual int Add(string sql, ref SQLResult result)
+        public abstract SQLResult Execute();
-        {
-            return 0;
-        }
 
-        protected virtual SQLResult Execute()
+        public abstract SQLResult Execute(StringBuilder sql);
-        {
-            return SQLResult.NotFound;
-        }
 
-        protected virtual SQLResult Execute(StringBuilder sql)
+        public abstract SQLResult Execute(string sql);
-        {
-            return SQLResult.NotFound;
-        }
 
-        protected virtual SQLResult Execute(string sql)
+        public abstract DataSet ExecuteDataSet(StringBuilder sql);
-        {
-            return SQLResult.NotFound;
-        }
 
-        protected virtual object Query(EntityType type, StringBuilder sql)
+        public abstract DataSet ExecuteDataSet(string sql);
-        {
-            return General.EntityInstance;
-        }
 
-        protected virtual T? Query<T>(StringBuilder sql)
+        public abstract object Query(EntityType type, StringBuilder sql);
-        {
-            return default;
-        }
 
-        protected virtual object Query(EntityType type, string sql)
+        public abstract object Query(EntityType type, string sql);
-        {
-            return General.EntityInstance;
-        }
 
-        protected virtual T? Query<T>(string sql)
+        public abstract int Remove(StringBuilder sql, ref SQLResult result);
-        {
-            return default;
-        }
 
-        protected virtual int Remove(StringBuilder sql, ref SQLResult result)
+        public abstract int Remove(string sql, ref SQLResult result);
-        {
-            return 0;
-        }
 
-        protected virtual int Remove(string sql, ref SQLResult result)
+        public abstract int Update(StringBuilder sql, ref SQLResult result);
-        {
-            return 0;
-        }
         
-        protected virtual int Update(StringBuilder sql, ref SQLResult result)
+        public abstract int Update(string sql, ref SQLResult result);
-        {
-            return 0;
-        }
-
-        protected virtual int Update(string sql, ref SQLResult result)
-        {
-            return 0;
-        }
     }
 }

FunGame.Core/Service/SocketManager.cs

@@ -9,24 +9,12 @@ namespace Milimoe.FunGame.Core.Service
         /// <summary>
         /// 客户端专用Socket
         /// </summary>
-        internal static Socket? Socket
+        internal static Socket? Socket => _Socket;
-        {
-            get
-            {
-                return _Socket;
-            }
-        }
 
         /// <summary>
         /// 服务器端专用Socket
         /// </summary>
-        internal static Socket? ServerSocket
+        internal static Socket? ServerSocket => _ServerSocket;
-        {
-            get
-            {
-                return _ServerSocket;
-            }
-        }
 
         private static Socket? _Socket = null;
         private static Socket? _ServerSocket = null;

FunGame.Core/Service/ThreadManager.cs

@@ -34,13 +34,7 @@ namespace Milimoe.FunGame.Core.Service
         /// </summary>
         /// <param name="name">Thread的Key</param>
         /// <returns>Thread对象</returns>
-        internal BaseModel this[string name]
+        internal BaseModel this[string name] => Threads[name];
-        {
-            get
-            {
-                return Threads[name];
-            }
-        }
 
         /// <summary>
         /// 向线程管理器中添加Thread

FunGame.Desktop/Model/MainModel.cs

@@ -329,7 +329,6 @@ namespace Milimoe.FunGame.Desktop.Model
                 Main.OnFailedConnectEvent(new GeneralEventArgs());
                 Close();
             }
-
             return result;
         }