lith před 4 roky
rodič
revize
88b45271bf
39 změnil soubory, kde provedl 157 přidání a 78 odebrání
  1. 6 0
      dotnet/Doc/Publish/pack sers_lib.bat
  2. 4 0
      dotnet/Doc/UpgradeLog/Sers2.1.1.txt
  3. 1 1
      dotnet/Sers/ApiLoader/Sers.NetcoreLoader/Sers.NetcoreLoader.csproj
  4. 1 1
      dotnet/Sers/ApiLoader/Sers.Serslot/Sers.Serslot.csproj
  5. 1 1
      dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryClient.cs
  6. 2 2
      dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/Sers.CL.Ipc.NamedPipe - 额外命名管道/Sers.CL.Ipc.NamedPipe.csproj
  7. 16 0
      dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/readme.txt
  8. 2 3
      dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj
  9. 1 1
      dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj
  10. 1 1
      dotnet/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj
  11. 1 1
      dotnet/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj
  12. 22 21
      dotnet/Sers/Sers.CL/Test/CommunicationManage/Client/appsettings.json
  13. 18 19
      dotnet/Sers/Sers.CL/Test/CommunicationManage/Server/appsettings.json
  14. 1 1
      dotnet/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj
  15. 1 1
      dotnet/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj
  16. 1 1
      dotnet/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj
  17. 1 1
      dotnet/Sers/Sers.Core/Sers.Core/Sers.Core.csproj
  18. 1 1
      dotnet/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj
  19. 1 1
      dotnet/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj
  20. 1 1
      dotnet/Sers/Sers.Ioc/Sers.Ioc/Sers.Ioc.csproj
  21. 1 1
      dotnet/Sers/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/Sers.Gover.Apm.Zipkin.csproj
  22. 1 1
      dotnet/Sers/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj
  23. 3 2
      dotnet/Sers/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj
  24. 2 1
      dotnet/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj
  25. 1 1
      dotnet/StationDemo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj
  26. 18 2
      dotnet/StationDemo/SersLoader/Did.SersLoader.Demo/appsettings.json
  27. 1 1
      dotnet/StationDemo/SersLoader/Did.SersLoader.HelloWorld/Did.SersLoader.HelloWorld.csproj
  28. 1 1
      dotnet/Vit/Vit.Core/Vit.Core/Vit.Core.csproj
  29. 1 1
      dotnet/Vit/Vit.Ioc/Vit.Ioc/Vit.Ioc.csproj
  30. 1 1
      dotnet/Vit/Vit.Net.Http.FormFile/Vit.Net.Http.FormFile.csproj
  31. 1 1
      dotnet/Vit/Vit.WebHost/Vit.WebHost.csproj
  32. 1 1
      dotnet/netcore/Gateway/App.Gateway/App.Gateway.csproj
  33. 1 1
      dotnet/netcore/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj
  34. 7 0
      dotnet/netcore/ServiceCenter/App.Gover.Gateway/appsettings.json
  35. 1 1
      dotnet/netcore/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj
  36. 13 0
      dotnet/netcore/ServiceCenter/App.ServiceCenter/appsettings.json
  37. 1 1
      dotnet/netcore/Station/App.Ioc.Station/App.Ioc.Station.csproj
  38. 1 1
      dotnet/netcore/Station/App.Robot.Station/App.Robot.Station.csproj
  39. 18 2
      dotnet/netcore/Station/App.Robot.Station/appsettings.json

+ 6 - 0
dotnet/Doc/Publish/pack sers_lib.bat

@@ -51,6 +51,12 @@ cd /d ../../../
 
 
 
+echo 'pack Sers.CL.Ipc.NamedPipe'
+cd /d Sers\Sers.CL\Ipc\Sers.CL.Ipc.NamedPipe
+dotnet build --configuration Release
+dotnet pack --configuration Release --output ..\..\..\..\Doc\Publish\nuget
+cd /d ../../../../
+
 echo 'pack Sers.CL.Socket.Iocp'
 cd /d Sers\Sers.CL\Socket\Sers.CL.Socket.Iocp
 dotnet build --configuration Release

+ 4 - 0
dotnet/Doc/UpgradeLog/Sers2.1.1.txt

@@ -109,4 +109,8 @@ ServiceCenter
 
 [tag]Sers2.1.1.346
 ------------------------------------------------------------------------------------------------------------------
+增加高效可靠的命名管道通讯方式。Sers.CL.Ipc.NamedPipe
+
+[tag]Sers2.1.1.351
+------------------------------------------------------------------------------------------------------------------
 

+ 1 - 1
dotnet/Sers/ApiLoader/Sers.NetcoreLoader/Sers.NetcoreLoader.csproj

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

+ 1 - 1
dotnet/Sers/ApiLoader/Sers.Serslot/Sers.Serslot.csproj

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

+ 1 - 1
dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryClient.cs

@@ -25,7 +25,7 @@ namespace Sers.CL.Ipc.NamedPipe
 
 
         /// <summary>
-        /// 默认 "."
+        /// 服务端机器名或者ip地址(如 103.23.23.23 、win10f),默认 "."
         /// </summary>
         public string serverName = ".";
         /// <summary>

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

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

+ 16 - 0
dotnet/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/readme.txt

@@ -0,0 +1,16 @@
+浅谈 windows 命名管道  (管道安全限制)
+
+https://www.ershicimi.com/p/84c05a972b6d9be8ab0211f623651771
+
+
+
+
+
+
+
+
+win10如何禁用限制对命名管道和共享的匿名访问
+
+https://jingyan.baidu.com/article/09ea3edec478a981afde3941.html
+
+gpedit.msc   Windows设置 安全设置 本地策略 安全选项         网络访问: 限制对命名管道和共享的匿名访问 禁用

+ 2 - 3
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 
@@ -16,8 +16,7 @@
     <Compile Remove="Doc\**" />
     <EmbeddedResource Remove="Doc\**" />
     <None Remove="Doc\**" />
-  </ItemGroup>
- 
+  </ItemGroup> 
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Sers.Core\Sers.Core\Sers.Core.csproj" />

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 22 - 21
dotnet/Sers/Sers.CL/Test/CommunicationManage/Client/appsettings.json

@@ -24,16 +24,32 @@
       },
       /* one conn is one channel.can be multiable */
       "Client": [
+        {
+          // Ipc.NamedPipe
+          /* (x.1) type */
+          /* 在此Assembly中查找Builder */
+          "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
+          /* the class of Builder in assemblyFile  */
+          "className": "Sers.CL.Ipc.NamedPipe.OrganizeClientBuilder",
+
+
+          /* (x.2) config */
+          // 命名管道只支持本机或局域网。
+          /* 服务端机器名或者ip地址(如 103.23.23.23 、win10f),默认 "." */
+          "serverName": ".",
+          /* 命名管道名称。例如: "Sers.CL.Ipc" */
+          "pipeName": "Sers.CL.Ipc"
+        },
         {
           // Socket.Iocp
-          /* (x.1) type - Iocp */
+          /* (x.1) type */
           /* 在此Assembly中查找builder */
           "assemblyFile": "Sers.CL.Socket.Iocp.dll",
           /* the class of builder in assemblyFile  */
           //"className": "Sers.CL.Socket.Iocp.OrganizeClientBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端 host地址。例如: "127.0.0.1"、"sersms.com" */
           "host": "127.0.0.1",
           /* 服务端 监听端口号。例如: 4501 */
@@ -42,7 +58,7 @@
 
         {
           // Socket.ThreadWait
-          /* (x.1) type - ThreadWait */
+          /* (x.1) type */
           /* 在此Assembly中查找builder */
           "assemblyFile": "Sers.CL.Socket.ThreadWait.dll",
           /* the class of builder in assemblyFile  */
@@ -70,14 +86,14 @@
         },
         {
           // WebSocket
-          /* (x.1) type - WebSocket */
+          /* (x.1) type */
           /* 在此Assembly中查找builder */
           "assemblyFile": "Sers.CL.WebSocket.dll",
           /* the class of builder in assemblyFile  */
           //"className": "Sers.CL.WebSocket.OrganizeClientBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端地址(默认为 "ws://127.0.0.1:4503") */
           "host": "ws://127.0.0.1:4503"
 
@@ -99,7 +115,7 @@
 
         {
           // Ipc.SharedMemory
-          /* (x.1) type - Ipc.SharedMemory */
+          /* (x.1) type */
           /* 在此Assembly中查找Builder */
           "assemblyFile": "Sers.CL.Ipc.SharedMemory.dll",
           /* the class of Builder in assemblyFile  */
@@ -109,21 +125,6 @@
           /* (x.2) config */
           /* 共享内存名称。例如: "ipcTest" */
           "name": "ipcForStationDemo"
-        },
-        {
-          // Ipc.SharedMemory
-          /* (x.1) type - Ipc.SharedMemory */
-          /* 在此Assembly中查找Builder */
-          "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
-          /* the class of Builder in assemblyFile  */
-          "className": "Sers.CL.Ipc.NamedPipe.OrganizeClientBuilder",
-
-
-          /* (x.2) config */
-          /* 共享内存名称。例如: "ipcTest" */
-          "serverName": ".",
-          /* 共享内存名称。例如: "ipcTest" */
-          "pipeName": "ipcForStationDemo"
         }
       ]
     }

+ 18 - 19
dotnet/Sers/Sers.CL/Test/CommunicationManage/Server/appsettings.json

@@ -24,16 +24,29 @@
       },
       /* one conn is one channel.can be multiable */
       "Server": [
+        {
+          //Ipc.NamedPipe
+          /* (x.1) type */
+          /* 在此Assembly中查找Builder */
+          "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
+          /* the class of Builder in assemblyFile  */
+          "className": "Sers.CL.Ipc.NamedPipe.OrganizeServerBuilder",
+
+
+          /* (x.2) config */
+          /* 命名管道名称。例如: "Sers.CL.Ipc" */
+          "pipeName": "Sers.CL.Ipc"
+        },
         {
           // Socket.Iocp
-          /* (x.1) type - Iocp */
+          /* (x.1) type */
           /* 在此Assembly中查找builder */
           "assemblyFile": "Sers.CL.Socket.Iocp.dll",
           /* the class of Builder in assemblyFile  */
           //"className": "Sers.CL.Socket.Iocp.OrganizeServerBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端 监听地址。若不指定则监听所有网卡。例如: "127.0.0.1"、"sersms.com"。*/
           //"host": "127.0.0.1",
           /* 服务端 监听端口号。例如: 4501 */
@@ -71,14 +84,14 @@
 
         {
           // WebSocket
-          /* (x.1) type - Iocp */
+          /* (x.1) type */
           /* 在此Assembly中查找builder */
           "assemblyFile": "Sers.CL.WebSocket.dll",
           /* the class of builder in assemblyFile  */
           //"className": "Sers.CL.WebSocket.OrganizeServerBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端地址(默认为 "ws://0.0.0.0:4503") */
           "host": "ws://0.0.0.0:4503"
 
@@ -100,7 +113,7 @@
 
         {
           //Ipc.SharedMemory
-          /* (x.1) type - Ipc.SharedMemory */
+          /* (x.1) type */
           /* 在此Assembly中查找Builder */
           "assemblyFile": "Sers.CL.Ipc.SharedMemory.dll",
           /* the class of Builder in assemblyFile  */
@@ -114,20 +127,6 @@
           "nodeCount": 128,
           /* 共享内存节点大小。例如: 2048 */
           "nodeBufferSize": 102400
-        },
-        {
-          //Ipc.SharedMemory
-          /* (x.1) type - Ipc.SharedMemory */
-          /* 在此Assembly中查找Builder */
-          "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
-          /* the class of Builder in assemblyFile  */
-          "className": "Sers.CL.Ipc.NamedPipe.OrganizeServerBuilder",
-
-
-          /* (x.2) config */
-          /* 共享内存名称。例如: "ipcTest" */
-          "pipeName": "ipcForStationDemo"
-
         }
       ]
     }

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 1 - 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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
   

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
   

+ 1 - 1
dotnet/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

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

+ 1 - 1
dotnet/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

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

+ 1 - 1
dotnet/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj

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

+ 1 - 1
dotnet/Sers/Sers.Ioc/Sers.Ioc/Sers.Ioc.csproj

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

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
   </PropertyGroup>
 
   <PropertyGroup>

+ 1 - 1
dotnet/Sers/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.348</Version>
+    <Version>2.1.1.351</Version>
   </PropertyGroup>
 
   <PropertyGroup>

+ 3 - 2
dotnet/Sers/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.348</Version>
+    <Version>2.1.1.351</Version>
   </PropertyGroup>
 
 
@@ -12,6 +12,7 @@
 
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Sers.CL\Ipc\Sers.CL.Ipc.NamedPipe\Sers.CL.Ipc.NamedPipe.csproj" />
     <ProjectReference Include="..\..\Sers.CL\Socket\Sers.CL.Socket.Iocp\Sers.CL.Socket.Iocp.csproj" />
     <ProjectReference Include="..\..\Sers.CL\Socket\Sers.CL.Socket.ThreadWait\Sers.CL.Socket.ThreadWait.csproj" />
   </ItemGroup>

+ 2 - 1
dotnet/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj

@@ -3,7 +3,7 @@
  
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 
@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Sers.CL\Ipc\Sers.CL.Ipc.NamedPipe\Sers.CL.Ipc.NamedPipe.csproj" />
     <ProjectReference Include="..\..\Sers.CL\Socket\Sers.CL.Socket.Iocp\Sers.CL.Socket.Iocp.csproj" />
     <ProjectReference Include="..\..\Sers.CL\Socket\Sers.CL.Socket.ThreadWait\Sers.CL.Socket.ThreadWait.csproj" />
   </ItemGroup>

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>

+ 18 - 2
dotnet/StationDemo/SersLoader/Did.SersLoader.Demo/appsettings.json

@@ -25,6 +25,22 @@
       },
       /* one conn is one channel.can be multiable */
       "Client": [
+        {
+          // Ipc.NamedPipe
+          /* (x.1) type */
+          /* 在此Assembly中查找Builder */
+          "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
+          /* the class of Builder in assemblyFile  */
+          //"className": "Sers.CL.Ipc.NamedPipe.OrganizeClientBuilder",
+
+
+          /* (x.2) config */
+          // 命名管道只支持本机或局域网。
+          /* 服务端机器名或者ip地址(如 103.23.23.23 、win10f),默认 "." */
+          "serverName": ".",
+          /* 命名管道名称。例如: "Sers.CL.Ipc" */
+          "pipeName": "Sers.CL.Ipc.4501"
+        },
         {
           // Socket.Iocp
           /* (x.1) type - Iocp */
@@ -34,7 +50,7 @@
           "className": "Sers.CL.Socket.Iocp.OrganizeClientBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端 host地址。例如: "127.0.0.1"、"sersms.com" */
           "host": "127.0.0.1",
           /* 服务端 监听端口号。例如: 4501 */
@@ -77,7 +93,7 @@
           //"className": "Sers.CL.WebSocket.OrganizeClientBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端地址(默认为 "ws://127.0.0.1:4503") */
           "host": "ws://127.0.0.1:4503"
 

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 1 - 1
dotnet/Vit/Vit.Core/Vit.Core/Vit.Core.csproj

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

+ 1 - 1
dotnet/Vit/Vit.Ioc/Vit.Ioc/Vit.Ioc.csproj

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

+ 1 - 1
dotnet/Vit/Vit.Net.Http.FormFile/Vit.Net.Http.FormFile.csproj

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

+ 1 - 1
dotnet/Vit/Vit.WebHost/Vit.WebHost.csproj

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

+ 1 - 1
dotnet/netcore/Gateway/App.Gateway/App.Gateway.csproj

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

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 7 - 0
dotnet/netcore/ServiceCenter/App.Gover.Gateway/appsettings.json

@@ -16,6 +16,13 @@
           /* 服务端 监听端口号。例如: 4501 */
           "port": 4501,
 
+          //HeartBeat
+          /* 心跳检测时间间隔(单位ms,默认10000,若指定为0则不进行心跳检测) */
+          "heartBeatIntervalMs": 10000,
+          /* 心跳检测超时时间(单位ms,默认30000) */
+          "heartBeatTimeoutMs": 30000,
+          /* 心跳检测失败重试次数(单位次,默认10) */
+          "heartBeatRetryCount": 10,
 
           /* 连接秘钥,用以验证连接安全性。服务端和客户端必须一致 */
           "secretKey": "SersCL"

+ 1 - 1
dotnet/netcore/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

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

+ 13 - 0
dotnet/netcore/ServiceCenter/App.ServiceCenter/appsettings.json

@@ -25,6 +25,19 @@
       },
       /* one conn is one channel.can be multiable */
       "Server": [
+        {
+          //Ipc.NamedPipe
+          /* (x.1) type */
+          /* 在此Assembly中查找Builder */
+          "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
+          /* the class of Builder in assemblyFile  */
+          //"className": "Sers.CL.Ipc.NamedPipe.OrganizeServerBuilder",
+
+
+          /* (x.2) config */
+          /* 命名管道名称。例如: "Sers.CL.Ipc" */
+          "pipeName": "Sers.CL.Ipc.4501"
+        },
         {
           // Socket.Iocp
           /* (x.1) type - Iocp */

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 1 - 1
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.348</Version>
+    <Version>2.1.1.351</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

+ 18 - 2
dotnet/netcore/Station/App.Robot.Station/appsettings.json

@@ -16,6 +16,22 @@
       },
       /* one conn is one channel.can be multiable */
       "Client": [
+        {
+          // Ipc.NamedPipe
+          /* (x.1) type */
+          /* 在此Assembly中查找Builder */
+          "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
+          /* the class of Builder in assemblyFile  */
+          //"className": "Sers.CL.Ipc.NamedPipe.OrganizeClientBuilder",
+
+
+          /* (x.2) config */
+          // 命名管道只支持本机或局域网。
+          /* 服务端机器名或者ip地址(如 103.23.23.23 、win10f),默认 "." */
+          "serverName": ".",
+          /* 命名管道名称。例如: "Sers.CL.Ipc" */
+          "pipeName": "Sers.CL.Ipc.4501"
+        },
         {
           // Socket.Iocp
           /* (x.1) type - Iocp */
@@ -25,7 +41,7 @@
           "className": "Sers.CL.Socket.Iocp.OrganizeClientBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端 host地址。例如: "127.0.0.1"、"sersms.com" */
           "host": "127.0.0.1",
           /* 服务端 监听端口号。例如: 4501 */
@@ -68,7 +84,7 @@
           //"className": "Sers.CL.WebSocket.OrganizeClientBuilder",
 
 
-          /* (x.2) conn config */
+          /* (x.2) config */
           /* 服务端地址(默认为 "ws://127.0.0.1:4503") */
           "host": "ws://127.0.0.1:4503"