修改服务端bug

qiedebeiai · Jan 15, 2018 · aa01c98 · aa01c98
1 parent ecd12c4
commit aa01c98
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 119 deletions.
diff --git a/socket.core.sln b/socket.core.sln
@@ -1,10 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+VisualStudioVersion = 15.0.27130.2020
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "socket.core", "socket.core\socket.core.csproj", "{10943273-9BD8-4EF7-A287-554555384EF5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.window.client", "test.window.client\test.window.client.csproj", "{71178D39-6556-4E10-A4E3-79173F3E0D1B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.window.server", "test.window.server\test.window.server.csproj", "{65436448-ECB4-45D9-9773-67FBA7324B5F}"
@@ -13,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test.linux.client", "test.l
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test.linux.server", "test.linux.server\test.linux.server.csproj", "{6108D056-F7FD-45F3-8D69-D451AAA19D9C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "socket.core", "socket.core\socket.core.csproj", "{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,18 +23,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Debug|x64.Build.0 = Debug|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Debug|x86.Build.0 = Debug|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Release|x64.ActiveCfg = Release|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Release|x64.Build.0 = Release|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{10943273-9BD8-4EF7-A287-554555384EF5}.Release|x86.Build.0 = Release|Any CPU
 		{71178D39-6556-4E10-A4E3-79173F3E0D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71178D39-6556-4E10-A4E3-79173F3E0D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71178D39-6556-4E10-A4E3-79173F3E0D1B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -83,6 +71,18 @@ Global
 		{6108D056-F7FD-45F3-8D69-D451AAA19D9C}.Release|x64.Build.0 = Release|Any CPU
 		{6108D056-F7FD-45F3-8D69-D451AAA19D9C}.Release|x86.ActiveCfg = Release|Any CPU
 		{6108D056-F7FD-45F3-8D69-D451AAA19D9C}.Release|x86.Build.0 = Release|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Debug|x64.Build.0 = Debug|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Debug|x86.Build.0 = Debug|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Release|x64.ActiveCfg = Release|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Release|x64.Build.0 = Release|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Release|x86.ActiveCfg = Release|Any CPU
+		{366D4B2C-3FE5-4DDD-94A4-49913EA812CF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/socket.core/Common/ConnectClient.cs b/socket.core/Common/ConnectClient.cs
@@ -9,11 +9,7 @@ namespace socket.core.Common
     /// 已经连接的客户端
     /// </summary>
     public class ConnectClient
-    {
-        /// <summary>
-        /// 连接ID
-        /// </summary>
-        public Guid connectId { get; set; }
+    {       
         /// <summary>
         /// 套接字
         /// </summary>

diff --git a/socket.core/Server/TcpPackServer.cs b/socket.core/Server/TcpPackServer.cs
@@ -44,17 +44,17 @@ public class TcpPackServer
         /// <summary>
         /// 连接状态下的客户端列表
         /// </summary>
-        public ConcurrentBag<ConnectClient> ConnectClient
-        {
-            get
-            {
-                if (tcpServer == null)
-                {
-                    return null;
-                }
-                return tcpServer.connectClient;
-            }
-        }
+        //public ConcurrentBag<ConnectClient> ConnectClient
+        //{
+        //    get
+        //    {
+        //        if (tcpServer == null)
+        //        {
+        //            return null;
+        //        }
+        //        return tcpServer.connectClient;
+        //    }
+        //}
 
         /// <summary>
         /// 设置基本配置

diff --git a/socket.core/Server/TcpPullServer.cs b/socket.core/Server/TcpPullServer.cs
@@ -42,17 +42,17 @@ public class TcpPullServer
         /// <summary>
         /// 连接状态下的客户端列表
         /// </summary>
-        public ConcurrentBag<ConnectClient> ConnectClient
-        {
-            get
-            {
-                if (tcpServer == null)
-                {
-                    return null;
-                }
-                return tcpServer.connectClient;
-            }
-        }
+        //public ConcurrentBag<ConnectClient> ConnectClient
+        //{
+        //    get
+        //    {
+        //        if (tcpServer == null)
+        //        {
+        //            return null;
+        //        }
+        //        return tcpServer.connectClient;
+        //    }
+        //}
 
         /// <summary>
         /// 设置基本配置

diff --git a/socket.core/Server/TcpPushServer.cs b/socket.core/Server/TcpPushServer.cs
@@ -37,17 +37,17 @@ public class TcpPushServer
         /// <summary>
         /// 连接状态下的客户端列表
         /// </summary>
-        public ConcurrentBag<ConnectClient> ConnectClient
-        {
-            get
-            {
-                if(tcpServer==null)
-                {
-                    return null;
-                }
-                return tcpServer.connectClient;
-            }            
-        }
+        //public ConcurrentBag<ConnectClient> ConnectClient
+        //{
+        //    get
+        //    {
+        //        if(tcpServer==null)
+        //        {
+        //            return null;
+        //        }
+        //        return tcpServer.connectClient;
+        //    }            
+        //}
 
         /// <summary>
         /// 设置基本配置