dotnet/Doc/UpgradeLog/Sers2.1.1.txt

@@ -65,6 +65,11 @@ ApiClient
 ------------------------------------------------------------------------------------------------------------------
 优化ApiLoader效率，减少不必要的SsApiDesc的构建
 
-
-[tag]Sers2.1.1.294
+[tag]Sers2.1.1.296
 ------------------------------------------------------------------------------------------------------------------
+SersKit修复邮件在linux中不能发送的bug
+
+ServiceCenter添加强制关闭服务站点功能
+
+[tag]Sers2.1.1.297
+------------------------------------------------------------------------------------------------------------------

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

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

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

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

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

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

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

@@ -4,7 +4,7 @@ using Sers.Core.CL.MessageDelivery;
 
 namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
 {
-    public class OrganizeConnection:IOrganizeConnection
+    public class OrganizeConnection : IOrganizeConnection
     {
         public string connTag { get; set; }
 
@@ -30,8 +30,15 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
         }
         public bool SendRequest(List<ArraySegment<byte>> requestData, out List<ArraySegment<byte>> replyData)
         {
-           return requestAdaptor.SendRequest(this,requestData, out replyData);
+            return requestAdaptor.SendRequest(this, requestData, out replyData);
         }
+
+        public void Close() 
+        {
+            deliveryConn?.Close();
+            deliveryConn = null;
+        }
+
     }
 
 

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

@@ -634,11 +634,8 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
             {
                 if (info.IsDisconnected(heartBeatRetryCount))
                 {
-                    var deliveryConn = conn.GetDeliveryConn();
-                    if (deliveryConn!= null){
-                        Logger.Info("[CL.RequestAdaptor]HeartBeat,conn disconnected. connTag:" + conn.connTag);
-                        deliveryConn.Close();
-                    }
+                    Logger.Info("[CL.RequestAdaptor]HeartBeat,conn disconnected. connTag:" + conn.connTag);
+                    conn.Close();                    
                     return;
                 }
             }

dotnet/Sers/Sers.Core/Sers.Core/CL/MessageOrganize/IOrganizeConnection.cs

@@ -12,5 +12,8 @@ namespace Sers.Core.CL.MessageOrganize
 
         void SendRequestAsync(Object sender, List<ArraySegment<byte>> requestData, Action<object, List<ArraySegment<byte>>> callback);
         bool SendRequest(List<ArraySegment<byte>> requestData, out List<ArraySegment<byte>> replyData);
+
+
+        void Close();
     }
 }

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

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

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/Sers/Sers.ServiceCenter/Sers.Gover/Base/GoverManage.cs

@@ -249,7 +249,8 @@ namespace Sers.Gover.Base
 
         public override void ServiceStation_Remove(IOrganizeConnection  conn)
         {
-            var serviceStation = serviceStationMng.ServiceStation_Remove(conn);
+            string connKey = ""+ conn.GetHashCode();
+            var serviceStation = serviceStationMng.ServiceStation_Remove(connKey);
             if (serviceStation != null)
             {
                 Logger.Info("[ApiCenterService]Remove serviceStation,stationName:" + serviceStation?.serviceStationInfo?.serviceStationName);
@@ -276,6 +277,18 @@ namespace Sers.Gover.Base
             }
             return serviceStation != null; 
         }
+
+        public bool ServiceStation_Stop(string connKey)
+        {
+            var serviceStation = serviceStationMng.ServiceStation_Remove(connKey);
+            if (serviceStation != null)
+            {
+                Logger.Info("[ApiCenterService]Stop serviceStation,stationName:" + serviceStation?.serviceStationInfo?.serviceStationName);
+                serviceStation.connection.Close();
+            }
+            return serviceStation != null;
+        }
+
         #endregion
 
 

dotnet/Sers/Sers.ServiceCenter/Sers.Gover/Base/ServiceStationMng.cs

@@ -115,9 +115,9 @@ namespace Sers.Gover.Base
 
 
 
-        public ServiceStation ServiceStation_Remove(IOrganizeConnection  conn)
+        public ServiceStation ServiceStation_Remove(string connKey)
         {           
-            if (!serviceStation_ConnKey_Map.TryRemove(conn.GetHashCode(), out var serviceStation))
+            if (!serviceStation_ConnKey_Map.TryRemove(int.Parse(connKey), out var serviceStation))
             {
                 return null;
             }

dotnet/Sers/Sers.ServiceCenter/Sers.Gover/Controller/ApiControllers/ServerStationController.cs

@@ -52,10 +52,22 @@ namespace Sers.Gover.Controller.ApiControllers
         {
             return new ApiReturn { success = GoverManage.Instance.ServiceStation_Start(connKey) };
         }
-         
 
 
-     
+
+        /// <summary>
+        /// 启用指定的服务站点
+        /// </summary>
+        /// <returns></returns>
+        [SsRoute("serviceStation/stop")]
+        [SsCallerSource(ECallerSource.Internal)]
+        //[CallFromGover]
+        [SsName("启用指定的服务站点")]
+        public ApiReturn Stop(string connKey)
+        {
+            return new ApiReturn { success = GoverManage.Instance.ServiceStation_Stop(connKey) };
+        }
+
 
 
 

dotnet/Sers/Sers.ServiceCenter/Sers.ServiceCenter/ServiceCenter.cs

@@ -110,6 +110,10 @@ namespace Sers.ServiceCenter
             {
                 MessageClient.Instance.OnGetMessage(this, message.ByteDataToArraySegment());
             }
+            public void Close() 
+            {
+            }
+
         }
 
 

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

@@ -3,7 +3,7 @@
  
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.1.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

dotnet/netcore/ServiceCenter/App.Gover.Gateway/wwwroot/_gover_/Scripts/Sers/sers.apiClient.js

@@ -120,7 +120,9 @@
         obj.post({ api: '/_gover_/serviceStation/pause', arg: { connKey: connKey }, onSuc: onSuc });  
     };
 
-
+    obj.serviceStation_stop = function (connKey, onSuc) {
+        obj.post({ api: '/_gover_/serviceStation/stop', arg: { connKey: connKey }, onSuc: onSuc });
+    };
 
 
     obj.apiStation_getAll = function (onSuc) {
@@ -135,6 +137,7 @@
         obj.post({ api: '/_gover_/apiStation/pause', arg: { stationName: stationName }, onSuc: onSuc });  
     };
 
+   
 
 
 })('undefined' != typeof (sers) ? sers : (sers = {}));

dotnet/netcore/ServiceCenter/App.Gover.Gateway/wwwroot/_gover_/ServiceStationMng.html

@@ -31,7 +31,7 @@
             {{station.apiStationNames}} <br />
             stationVersion：{{ (station.serviceStationInfo||{}).stationVersion }}<br />
             状态：{{station.status}}（正常、暂停）<br />
-            操作：  <a href="#" @click="start(station)">打开</a>   <a href="#" @click="pause(station)">暂停</a><br />
+            操作：  <a href="#" @click="start(station)">打开</a>   <a href="#" @click="pause(station)">暂停</a>  <a href="#" @click="stop(station)">强制关闭</a> <br />
             -----------------------<br />
             apiNodeCount:{{station.apiNodeCount}} <br />
             activeApiNodeCount:{{station.activeApiNodeCount}}     <br />
@@ -78,6 +78,11 @@
                     sers.apiClient.serviceStation_pause(station.connKey, function (data) {
                         rendStations();
                     });
+                }, stop: function (station) {
+                    if (!confirm('手动关闭服务站点后，服务站点不一定会自动重新连接，确定继续吗？')) return;
+                    sers.apiClient.serviceStation_stop(station.connKey, function (data) {
+                        rendStations();
+                    });
                 }
             }
         });

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.1.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</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.294</Version>
+    <Version>2.1.1.297</Version>
     <Description>https://github.com/sersms/Sers/tree/2.1.1/release</Description>
   </PropertyGroup>
 

一键发布nuget包并上传.bat

@@ -1,6 +1,7 @@
 cd /d "dotnet\Doc\Release"
 call "pack sers_lib.bat"
 call "push sers_lib to SersNugetServer.bat"
+call "publish sers.bat"
 
 cd /d ../../../