dotnet/Doc/UpgradeLog/Sers2.1.1.txt

@@ -117,4 +117,7 @@ CL通
 
 [tag]Sers2.1.1.354
 ------------------------------------------------------------------------------------------------------------------
+CL通信层 修复密码不匹配时服务端不强制关闭连接的bug
 
+[tag]Sers2.1.1.356
+------------------------------------------------------------------------------------------------------------------

dotnet/Sers/ApiLoader/Sers.NetcoreLoader/Sers.NetcoreLoader.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/ApiLoader/Sers.Serslot/Sers.Serslot.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryServer.cs

@@ -161,7 +161,7 @@ namespace Sers.CL.Ipc.NamedPipe
         private DeliveryConnection Delivery_OnConnected(PipeStream client)
         {
             var conn = new DeliveryConnection();
-            conn.securityManager = securityManager?.Clone();
+            conn.securityManager = securityManager;
             conn.Init(client);
         
             conn.Conn_OnDisconnected = Delivery_OnDisconnected; 

dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/Sers.CL.Ipc.NamedPipe - 额外命名管道/Sers.CL.Ipc.NamedPipe.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/DeliveryServer.cs

@@ -287,7 +287,7 @@ namespace Sers.CL.Socket.Iocp
         private DeliveryConnection Delivery_OnConnected(global::System.Net.Sockets.Socket socket)
         {
             var conn = new DeliveryConnection();
-            conn.securityManager = securityManager?.Clone();
+            conn.securityManager = securityManager;
             conn.Init(socket);           
 
             conn.Conn_OnDisconnected = Delivery_OnDisconnected;

dotnet/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/DeliveryServer.cs

@@ -164,7 +164,7 @@ namespace Sers.CL.Socket.ThreadWait
         private DeliveryConnection Delivery_OnConnected(TcpClient client)
         {
             var conn = new DeliveryConnection();
-            conn.securityManager = securityManager?.Clone();
+            conn.securityManager = securityManager;
             conn.Init(client);
         
             conn.Conn_OnDisconnected = Delivery_OnDisconnected; 

dotnet/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/DeliveryServer.cs

@@ -50,7 +50,7 @@ namespace Sers.CL.WebSocket
                     //string clientUrl = socket.ConnectionInfo.ClientIpAddress + ":" + socket.ConnectionInfo.ClientPort;   
 
                     var conn = new DeliveryServer_Connection();
-                    conn.securityManager = securityManager?.Clone();
+                    conn.securityManager = securityManager;
                     conn.Init(socket);
 
                     socket.OnError = (ex) => 

dotnet/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/DeliveryServer.cs

@@ -178,7 +178,7 @@ namespace Sers.CL.Zmq.FullDuplex
         private DeliveryConnection Delivery_OnConnected(long identityOfWriter)
         {
             var conn = new DeliveryConnection();
-            conn.securityManager = securityManager?.Clone();
+            conn.securityManager = securityManager;
 
             conn.SetIdentity(identityOfWriter >> 1);
 

dotnet/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
   

dotnet/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/DeliveryServer.cs

@@ -160,7 +160,7 @@ namespace Sers.CL.ClrZmq.ThreadWait
         {
             var conn = new DeliveryConnection() { zmqIdentity = connGuid.Int64ToBytes() };
 
-            conn.securityManager = securityManager?.Clone();
+            conn.securityManager = securityManager;
 
             conn.OnSendFrameAsync = Zmq_SendFrameAsync;
             conn.Conn_OnDisconnected = Delivery_OnDisconnected;

dotnet/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
   

dotnet/Sers/Sers.Core/Sers.Core/CL/MessageOrganize/DefaultOrganize/OrganizeClient.cs

@@ -143,18 +143,27 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
 
             //发送身份验证
             Logger.Info("[CL.OrganizeClient] Authentication - sending SecretKey...");
-           
-            if (conn.SendRequest(requestData, out var replyData) && replyData.ByteDataToString() == "true")
+
+            bool success = false;
+            try
             {
-                Logger.Info("[CL.OrganizeClient] Authentication - succeed.");
-                return true;
+                if (conn.SendRequest(requestData, out var replyData) && replyData.ByteDataToString() == "true")
+                {
+                    success = true;
+                    Logger.Info("[CL.OrganizeClient] Authentication - succeed.");
+                    return true;
+                }
+                return false;
             }
-            else
+            finally
             {
-                Logger.Info("[CL.OrganizeClient] Authentication - failed.");
-                return false;
+                if (!success)
+                {
+                    Logger.Info("[CL.OrganizeClient] Authentication - failed.");
+                }
             }
-        }        
+            
+        }
 
         #endregion
 

dotnet/Sers/Sers.Core/Sers.Core/CL/MessageOrganize/DefaultOrganize/RequestAdaptor.cs

@@ -369,6 +369,9 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
                         event_OnGetMessage?.Invoke(conn, msgData);
                         return;
                     }
+                default:
+                    conn.Close();
+                    return;
             }
         }
         #endregion

dotnet/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.Core/Sers.Core/Util/StreamSecurity/ISecurity.cs

@@ -4,8 +4,7 @@ using System;
 namespace Sers.Core.Util.StreamSecurity
 {
     public interface ISecurity
-    {
-        ISecurity Clone();
+    {   
         void Init(JObject config);
 
         void Encryption(ArraySegment<byte> data);  

dotnet/Sers/Sers.Core/Sers.Core/Util/StreamSecurity/Security/SampleSecurity.cs

@@ -7,12 +7,7 @@ namespace Sers.Core.Util.StreamSecurity.Security
 {
     public unsafe class SampleSecurity : ISecurity
     {
-        public ISecurity Clone()
-        {
-            return new SampleSecurity { secretKey= secretKey };
-        }
-
-
+ 
         public void Init(JObject config)
         {
             secretKey = config["secret"].ConvertToString();
@@ -49,6 +44,14 @@ namespace Sers.Core.Util.StreamSecurity.Security
                 }
                 secretBytes = value.StringToBytes();
                 secretLength = secretBytes.Length;
+
+                //均匀化秘钥
+                //防止 在秘钥仅有部分匹配时，却能解析部分正确的原文
+                byte temp = 0;
+                for (var t = 0; t < secretLength; t++) temp ^= secretBytes[t];
+                for (var t = 0; t < secretLength; t++) secretBytes[t] ^= temp;
+
+               
             }
         }
 

dotnet/Sers/Sers.Core/Sers.Core/Util/StreamSecurity/SecurityManager.cs

@@ -65,15 +65,7 @@ namespace Sers.Core.Util.StreamSecurity
             }
         }
 
-        public SecurityManager Clone()
-        {
-            return new SecurityManager { securitys= securitys.Select(s=>s.Clone()).ToArray()  };
-        }
-
+ 
         ISecurity[] securitys;
-
-        
-
-
     }
 }

dotnet/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.Ioc/Sers.Ioc/Sers.Ioc.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/Sers.Gover.Apm.Zipkin.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
   </PropertyGroup>
 
   <PropertyGroup>

dotnet/Sers/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
   </PropertyGroup>
 
   <PropertyGroup>

dotnet/Sers/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
   </PropertyGroup>
 
 

dotnet/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj

@@ -3,7 +3,7 @@
  
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/StationDemo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>

dotnet/StationDemo/SersLoader/Did.SersLoader.HelloWorld/Did.SersLoader.HelloWorld.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Vit/Vit.Core/Vit.Core/Vit.Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Vit/Vit.Ioc/Vit.Ioc/Vit.Ioc.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Vit/Vit.Net.Http.FormFile/Vit.Net.Http.FormFile.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Vit/Vit.WebHost/Vit.WebHost.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/netcore/Gateway/App.Gateway/App.Gateway.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/netcore/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/netcore/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/netcore/Station/App.Ioc.Station/App.Ioc.Station.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/netcore/Station/App.Robot.Station/App.Robot.Station.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
-    <Version>2.1.1.353</Version>
+    <Version>2.1.1.356</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>