dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryClient.cs

@@ -36,7 +36,7 @@ namespace Sers.CL.Ipc.NamedPipe
 
         public bool Connect()
         {
-            Logger.Info("[CL.DeliveryClient] Ipc.NamedPipe, connecting", new { serverName = serverName, pipeName = pipeName });
+            Logger.Info("[CL.DeliveryClient] Ipc.NamedPipe, connecting", new { serverName, pipeName });
 
             NamedPipeClientStream client;
             try

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

@@ -49,7 +49,7 @@ namespace Sers.CL.Ipc.NamedPipe
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Ipc.NamedPipe, starting", new { pipeName = pipeName });
+                Logger.Info("[CL.DeliveryServer] Ipc.NamedPipe, starting", new { pipeName });
 
                 #region (x.1)检测命名管道是否已经在使用
                 try
@@ -57,7 +57,7 @@ namespace Sers.CL.Ipc.NamedPipe
 
                     if (File.Exists("\\\\.\\pipe\\" + pipeName))
                     {
-                        Logger.Error("[CL.DeliveryServer] Ipc.NamedPipe, not started. pipeName already exists!", new { pipeName = pipeName });
+                        Logger.Error("[CL.DeliveryServer] Ipc.NamedPipe, not started. pipeName already exists!", new { pipeName });
                         return false;
                     }
 

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/DeliveryClient.cs

@@ -44,7 +44,7 @@ namespace Sers.CL.Ipc.SharedMemory
         public bool Connect()
         {
 
-            Logger.Info("[CL.Ipc] Ipc.SharedMemory,connecting", new { name = name });
+            Logger.Info("[CL.Ipc] Ipc.SharedMemory,connecting", new { name });
 
             if (!_conn.InitAsClient(name))
             {

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/DeliveryServer.cs

@@ -81,7 +81,7 @@ namespace Sers.CL.Ipc.SharedMemory
 
         public bool Start()
         {
-            Logger.Info("[CL.Ipc] Ipc.SharedMemory,starting", new { name = name });
+            Logger.Info("[CL.Ipc] Ipc.SharedMemory,starting", new { name });
 
 
             if (!_conn.InitAsServer(name, nodeCount, nodeBufferSize))

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Base/DeliveryServer_Base.cs

@@ -258,12 +258,12 @@ namespace Sers.CL.Socket.Iocp.Base
                     ProcessReceive(e);
                     break;
                 case SocketAsyncOperation.Send:
-                    Logger.Warn("[Iocp]IO_Completed Send", new { RemoteEndPoint = e.RemoteEndPoint, LastOperation = e.LastOperation });
+                    Logger.Warn("[Iocp]IO_Completed Send", new { e.RemoteEndPoint, e.LastOperation });
                     return;
                 //    ProcessSend(e);
                 //    break;
                 default:
-                    Logger.Error("[Iocp]he last operation completed on the socket was not a receive or send", new { RemoteEndPoint = e.RemoteEndPoint, LastOperation = e.LastOperation });
+                    Logger.Error("[Iocp]he last operation completed on the socket was not a receive or send", new { e.RemoteEndPoint, e.LastOperation });
                     throw new ArgumentException("The last operation completed on the socket was not a receive or send");
             }
 

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Simple/DeliveryClient.cs

@@ -12,7 +12,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Simple
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host = host, port = port });
+                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host, port });
 
 
                 if (!base.Connect()) 

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Simple/DeliveryServer.cs

@@ -12,7 +12,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Simple
         {  
             try
             {
-                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host = host, port = port });
+                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host, port });
 
                 if (!base.Start()) 
                 {

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/ThreadWait/DeliveryClient.cs

@@ -38,7 +38,7 @@ namespace Sers.CL.Socket.Iocp.Mode.ThreadWait
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host = host, port = port });
+                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host, port });
 
 
                 if (!base.Connect())

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/ThreadWait/DeliveryServer.cs

@@ -37,7 +37,7 @@ namespace Sers.CL.Socket.Iocp.Mode.ThreadWait
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host = host, port = port });
+                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host, port });
 
                 if (!base.Start())
                 {

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Timer/DeliveryClient.cs

@@ -35,7 +35,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Timer
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host = host, port = port });
+                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host, port });
 
 
                 if (!base.Connect())

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Timer/DeliveryServer.cs

@@ -37,7 +37,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Timer
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host = host, port = port });
+                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host, port });
 
                 if (!base.Start())
                 {

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/DeliveryClient.cs

@@ -35,7 +35,7 @@ namespace Sers.CL.Socket.ThreadWait
 
         public bool Connect()
         {
-            Logger.Info("[CL.DeliveryClient] Socket.ThreadWait,connecting", new { host = host, port = port });
+            Logger.Info("[CL.DeliveryClient] Socket.ThreadWait,connecting", new { host, port });
             TcpClient client = null;
             try
             {

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

@@ -62,7 +62,7 @@ namespace Sers.CL.Socket.ThreadWait
             {
                 if (listener != null) return false;
 
-                Logger.Info("[CL.DeliveryServer] Socket.ThreadWait,starting", new { host = host, port = port });
+                Logger.Info("[CL.DeliveryServer] Socket.ThreadWait,starting", new { host, port });
 
                 // IPEndPoint类将网络标识为IP地址和端口号
                 IPEndPoint localEndPoint = new IPEndPoint(String.IsNullOrEmpty(host) ? IPAddress.Any : NetHelp.ParseToIPAddress(host), port);

dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/DeliveryClient.cs

@@ -31,7 +31,7 @@ namespace Sers.CL.WebSocket
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] WebSocket,connecting", new { host = host });
+                Logger.Info("[CL.DeliveryClient] WebSocket,connecting", new { host });
 
                 ClientWebSocket _webSocket = new ClientWebSocket();
                 _webSocket.ConnectAsync(new Uri(host), new CancellationToken()).GetAwaiter().GetResult();

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

@@ -36,7 +36,7 @@ namespace Sers.CL.WebSocket
 
             try
             {
-                Logger.Info("[CL.DeliveryServer] WebSocket,starting", new { host = host });
+                Logger.Info("[CL.DeliveryServer] WebSocket,starting", new { host });
 
                 connMap.Clear();
 

dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/DeliveryClient.cs

@@ -43,7 +43,7 @@ namespace Sers.CL.Zmq.FullDuplex
             try
             {
 
-                Logger.Info("[CL.DeliveryClient] Zmq.FullDuplex,connecting", new { endpoint = endpoint });
+                Logger.Info("[CL.DeliveryClient] Zmq.FullDuplex,connecting", new { endpoint });
 
                 //(x.1)
                 _conn.OnSendFrameAsync = SendMessageAsync;

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

@@ -43,7 +43,7 @@ namespace Sers.CL.Zmq.FullDuplex
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Zmq.FullDuplex,starting", new { endpoint = endpoint });
+                Logger.Info("[CL.DeliveryServer] Zmq.FullDuplex,starting", new { endpoint });
 
                 //(x.1) create zmq conn
                 socketRouter = new ZSocket(ZSocketType.ROUTER);

dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/DeliveryClient.cs

@@ -42,7 +42,7 @@ namespace Sers.CL.ClrZmq.ThreadWait
             try
             {
 
-                Logger.Info("[CL.DeliveryClient] Zmq.ThreadWait,connecting", new { endpoint = endpoint });
+                Logger.Info("[CL.DeliveryClient] Zmq.ThreadWait,connecting", new { endpoint });
 
                 //(x.1)
                 _conn.OnSendFrameAsync = Zmq_SendMessageAsync;

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

@@ -44,7 +44,7 @@ namespace Sers.CL.ClrZmq.ThreadWait
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Zmq.ThreadWait,starting", new { endpoint = endpoint });
+                Logger.Info("[CL.DeliveryServer] Zmq.ThreadWait,starting", new { endpoint });
 
                 //(x.1) create zmq conn
                 var socket = new ZSocket(ZSocketType.ROUTER);

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

@@ -6,8 +6,6 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
 {
     public class OrganizeConnection : IOrganizeConnection
     {
-        public string connTag { get; set; }
-
         internal IDeliveryConnection deliveryConn { get; private set; }
 
         private RequestAdaptor requestAdaptor;

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

@@ -549,7 +549,7 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
             {
                 if (info.IsDisconnected(heartBeatRetryCount))
                 {
-                    Logger.Info("[CL.RequestAdaptor]HeartBeat,conn disconnected", new { connTag = conn.connTag });
+                    Logger.Info("[CL.RequestAdaptor]HeartBeat,conn disconnected", new { connKey = conn.GetConnKey() });
                     conn.Close();                    
                     return;
                 }

dotnet/Library/Sers/Sers.Core/Sers.Core/CL/MessageOrganize/Extensions/IOrganizeConnectionExtensions.cs

@@ -9,6 +9,14 @@ namespace Vit.Extensions
     public static partial class IOrganizeConnectionExtensions
     {
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int GetConnKey(this IOrganizeConnection conn)
+        {
+            return conn.GetHashCode();
+        }
+
+
+
         #region static curAutoResetEvent
         public static AutoResetEvent curAutoResetEvent =>
             _curAutoResetEvent ?? (_curAutoResetEvent = new AutoResetEvent(false));

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

@@ -4,12 +4,10 @@ namespace Sers.Core.CL.MessageOrganize
 {
     public interface IOrganizeConnection
     {
-        string connTag { get; set; }
-
         void SendMessageAsync(Vit.Core.Util.Pipelines.ByteData message);
 
 
-        void SendRequestAsync(Object sender, Vit.Core.Util.Pipelines.ByteData requestData, Action<object, Vit.Core.Util.Pipelines.ByteData> callback); 
+        void SendRequestAsync(Object sender, Vit.Core.Util.Pipelines.ByteData requestData, Action<object, Vit.Core.Util.Pipelines.ByteData> callback);
 
 
         void Close();

dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/ApiTrace/ApiTracePublisher.cs

@@ -29,7 +29,7 @@ namespace Sers.Core.Module.Api.LocalApi.ApiTrace
 
             if (ApiTraceMng.collectorMap.TryGetValue(collectorName, out collector))
             {
-                Logger.Info("[LocalApiService.ApiTracePublisher]加载成功", new { collectorName = collectorName });
+                Logger.Info("[LocalApiService.ApiTracePublisher]加载成功", new { collectorName });
             }
             else
             {

dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/LocalApiService/LocalApiService.cs

@@ -180,7 +180,7 @@ namespace Sers.Core.Module.Api.LocalApi
                 if (threadCount > 0)
                 {
                     workThread.Start();
-                    Logger.Info("[LocalApiService] Started", new { threadCount = threadCount });
+                    Logger.Info("[LocalApiService] Started", new { threadCount });
 
                 }
                 return true;

dotnet/ServiceCenter/App.ServiceCenter/appsettings.json

@@ -399,7 +399,7 @@
         /* 在此Assembly中加载类 */
         "assemblyFile": "Sers.Gover.dll",
         /* 动态加载的类名，必须继承接口 Sers.Core.Module.App.AppEvent.IAppEvent */
-        "className": "Sers.Gover.Base.AppEvent.ApiTracePublisher",
+        //"className": "Sers.Gover.Base.AppEvent.ApiTracePublisher",
 
         /* 搜集器名称（根据此名称推送到对应的搜集器,搜集器在ApiTrace.Collector中配置）,若不指定则不加载 */
         "collectorName": "default"

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Base/AppEvent/ApiTracePublisher.cs

@@ -52,7 +52,7 @@ namespace Sers.Gover.Base.AppEvent
             Logger.Info("[Gover.ApiTracePublisher]初始化中");
             if (ApiTraceMng.collectorMap.TryGetValue(collectorName, out collector))
             {
-                Logger.Info("[Gover.ApiTracePublisher]已绑定collector", new { collectorName = collectorName });
+                Logger.Info("[Gover.ApiTracePublisher]已绑定collector", new { collectorName });
             }
             else
             {

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

@@ -342,13 +342,13 @@ namespace Sers.Gover.Base
 
         public bool ApiStation_Pause(string stationName)
         {
-            Logger.Info("[ApiCenterService]Pause ApiStation", new { stationName = stationName });
+            Logger.Info("[ApiCenterService]Pause ApiStation", new { stationName });
             return apiStationMng.ApiStation_Pause(stationName);
         }
 
         public bool ApiStation_Start(string stationName)
         {
-            Logger.Info("[ApiCenterService]Start ApiStation", new { stationName = stationName });
+            Logger.Info("[ApiCenterService]Start ApiStation", new { stationName });
             return apiStationMng.ApiStation_Start(stationName);
         }
         #endregion

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Controllers/ServiceStationController.cs

@@ -28,8 +28,6 @@ namespace Sers.ServiceCenter.Controllers
         {
             serviceStation.connection = CommunicationManageServer.CurConn;
 
-            if (serviceStation.connection != null)
-                serviceStation.connection.connTag = serviceStation?.serviceStationInfo?.serviceStationName;
 
             #region (x.2)获取客户端ip地址
             try

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Entity/ServiceStation.cs

@@ -37,7 +37,7 @@ namespace Sers.ServiceCenter.Entity
         public IOrganizeConnection connection { get; set; }
 
         [JsonProperty]
-        public int connKey => connection?.GetHashCode() ?? 0;
+        public int connKey => connection?.GetConnKey() ?? 0;
 
         /// <summary>
         /// 连接客户端的ip

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

@@ -89,7 +89,6 @@ namespace Sers.ServiceCenter
 
         class OrganizeConnection : IOrganizeConnection
         {
-            public string connTag { get; set; }
 
             ILocalApiService localApiService;
             public OrganizeConnection(ILocalApiService localApiService)
@@ -212,7 +211,7 @@ namespace Sers.ServiceCenter
         #region (x.4) StartCenter 
         public bool StartCenter()
         {
-            Logger.Info("[ServiceCenter] starting ...");
+            Logger.Info("[ServiceCenter] starting");
 
             //(x.0) appEvent OnStart
             appEventList?.ForEach(ev => ev.OnStart());
@@ -235,24 +234,24 @@ namespace Sers.ServiceCenter
 
             communicationManage.Conn_OnConnected = (IOrganizeConnection conn) =>
               {
-                  Logger.Info("[CL] OnConnected", new { connTag = conn.connTag });
+                  Logger.Info("[CL] OnConnected", new { connKey = conn.GetConnKey() });
               };
 
             communicationManage.Conn_OnDisconnected = (IOrganizeConnection conn) =>
             {
-                Logger.Info("[CL] OnDisconnected", new { connTag = conn.connTag });
+                Logger.Info("[CL] OnDisconnected", new { connKey = conn.GetConnKey() });
 
                 MessageCenterService.Instance.Conn_OnDisconnected(conn);
 
                 apiCenterService.ServiceStation_Remove(conn);
-            };         
+            };
 
             #endregion
 
 
             #region (x.3)注册 localApiService 到 apiCenterService
             {
-                Logger.Info("[ServiceCenter] regist localApiService to apiCenterService...");
+                Logger.Info("[ServiceCenter] registing localApiService to apiCenterService");
 
 
                 var serviceStationData = new
@@ -303,7 +302,7 @@ namespace Sers.ServiceCenter
 
 
             #region (x.4)CL Start 
-            Logger.Info("[CL] starting...");
+            Logger.Info("[CL] starting");
 
             if (!communicationManage.Start())
             {
@@ -359,7 +358,7 @@ namespace Sers.ServiceCenter
         #region (x.5) StopCenter
         public void StopCenter()
         { 
-            Logger.Info("[ServiceCenter] stop...");
+            Logger.Info("[ServiceCenter] stoping");
 
             //(x.1) appEvent BeforeStop
             appEventList?.ForEach(ev => ev.BeforeStop());
@@ -380,7 +379,7 @@ namespace Sers.ServiceCenter
                 Logger.Info("[CL] stoped");
                 #endregion
 
-                Logger.Info("[LocalApiService] stop...");
+                Logger.Info("[LocalApiService] stoping");
                 try
                 {
                     localApiService.Stop();