From 362c38834ad9b5d21a05769e2daf96b3ffcd7888 Mon Sep 17 00:00:00 2001 From: wangyueyang <645583145@qq.com> Date: Tue, 17 Sep 2024 22:57:28 +0800 Subject: [PATCH] =?UTF-8?q?tcp=E6=97=A5=E5=BF=97=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common/lib/HybirdFrameworkDriver.dll | Bin 38400 -> 38912 bytes Service/Padar/Client/PadarClient.cs | 8 ++++++-- Service/Plc/Client/PlcClient.cs | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Common/lib/HybirdFrameworkDriver.dll b/Common/lib/HybirdFrameworkDriver.dll index 5f9fa0f25456602dfaaa5c15b8b677b447dcc527..eeedaf34e98de19a24412cf8a7419e16a08e2e06 100644 GIT binary patch delta 12040 zcmbt)dwf*Ywg1}ZJsneZ~a1x*N)1i=CkEDDksp-_>5go+ZwB%o9f z^R*Wcyde!P}QV_*k6{=QLlu#c9i`ENXu@>RC);cF4YVRMv&z;X_zGr>c zT6^ua_t~#=W|~^1rl+J0clUngOvN9;{&Yg`s7nk4*nkSnQuf}narboZ>rVjuloag% zC*_T~0e2^W8~M>zfNRWLso0z$`Z{CxqAH5t4dxmV7n{syL|?JR{804Hl=h$+KNa|u zK!pb;0+dz*2y@E%VQrJ8@p|NIkmOhpzzI@pDP9t{A>{Xy3*x=>^C^Yk6e-dyh2o zxC#OT6_`yG(Ffy&dwAcDvYbfo#`yK;fNAU_dUQ7V!06vPB(<5Gw{6?d9 z)O^6%XBKCEsiwrwFNIG}++me�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 delta 11781 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 diff --git a/Service/Padar/Client/PadarClient.cs b/Service/Padar/Client/PadarClient.cs index 1ed3f16..03ae3c4 100644 --- a/Service/Padar/Client/PadarClient.cs +++ b/Service/Padar/Client/PadarClient.cs @@ -1,8 +1,7 @@ -using System.Text; using HybirdFrameworkCore.Autofac.Attribute; using HybirdFrameworkCore.Entity; -using log4net; using HybirdFrameworkDriver.TcpClient; +using log4net; using Decoder = Service.Padar.Codec.Decoder; using Encoder = Service.Padar.Codec.Encoder; @@ -29,6 +28,11 @@ public class PadarClient : TcpClient Log.Info($"padar connect succeed"); return Connected; } + + public override ILog Logger() + { + return Log; + } /// /// 0-关闭雷达 1-开启 diff --git a/Service/Plc/Client/PlcClient.cs b/Service/Plc/Client/PlcClient.cs index f31bbcc..4aa98f9 100644 --- a/Service/Plc/Client/PlcClient.cs +++ b/Service/Plc/Client/PlcClient.cs @@ -1,4 +1,4 @@ -using HybirdFrameworkCore.Autofac.Attribute; +using HybirdFrameworkCore.Autofac.Attribute; using HybirdFrameworkCore.Entity; using HybirdFrameworkDriver.Session; using HybirdFrameworkDriver.TcpClient; @@ -342,6 +342,11 @@ public class PlcClient : TcpClient DisassembleDone = false; SwapStart = false; } + + public override ILog Logger() + { + return Log(); + } private ILog Log() { var name = "Plc" + this.Sn;