From 2c15fa662ad2e235c2fcde00b5b5a909027f5d9b Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Mon, 8 Jan 2024 15:21:07 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9LogHelper?=
 =?UTF-8?q?=E5=88=B0=E8=BE=BE=E5=8F=AF=E7=94=A8=E7=8A=B6=E6=80=81=20?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HighWayIot.Log4net/HighWayIot.Log4net.csproj  | 4 +++-
 HighWayIot.Log4net/LogHelper.cs               | 2 +-
 HighWayIot.Log4net/Properties/AssemblyInfo.cs | 2 ++
 HighWayIot.TouchSocket/TcpServer.cs           | 6 +++---
 RFIDSocket/Program.cs                         | 6 +++++-
 RFIDSocket/Properties/AssemblyInfo.cs         | 2 +-
 RFIDSocket/RFIDSocket.csproj                  | 4 ++++
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/HighWayIot.Log4net/HighWayIot.Log4net.csproj b/HighWayIot.Log4net/HighWayIot.Log4net.csproj
index 9a4f9a5..c93efb5 100644
--- a/HighWayIot.Log4net/HighWayIot.Log4net.csproj
+++ b/HighWayIot.Log4net/HighWayIot.Log4net.csproj
@@ -49,7 +49,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="config\log4net.config" />
+    <None Include="config\log4net.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/HighWayIot.Log4net/LogHelper.cs b/HighWayIot.Log4net/LogHelper.cs
index 64cd586..efb5e3b 100644
--- a/HighWayIot.Log4net/LogHelper.cs
+++ b/HighWayIot.Log4net/LogHelper.cs
@@ -32,7 +32,7 @@ namespace HighWayIot.Log4net
          * 
          */
         //private readonly string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log4net.config");
-        private readonly string fileName = "\\config\\log4net.config";
+        private readonly string fileName = "D:\\Code\\Work\\RFIDAccess\\HighWayIot.Log4net\\config\\log4net.config";
 
         private LogHelper()
         {
diff --git a/HighWayIot.Log4net/Properties/AssemblyInfo.cs b/HighWayIot.Log4net/Properties/AssemblyInfo.cs
index 1f83578..2683727 100644
--- a/HighWayIot.Log4net/Properties/AssemblyInfo.cs
+++ b/HighWayIot.Log4net/Properties/AssemblyInfo.cs
@@ -34,3 +34,5 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config", ConfigFileExtension = "config", Watch = true)]
\ No newline at end of file
diff --git a/HighWayIot.TouchSocket/TcpServer.cs b/HighWayIot.TouchSocket/TcpServer.cs
index ac23f9d..27cd413 100644
--- a/HighWayIot.TouchSocket/TcpServer.cs
+++ b/HighWayIot.TouchSocket/TcpServer.cs
@@ -51,9 +51,9 @@ namespace HighWayIot.TouchSocket
                 };//有客户端断开连接
                 service.Received = (client, e) =>
                 {
-                    //从客户端收到信息
-                    var mes = Encoding.ASCII.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len
-                    logHelper.Info($"已从{client.IP}:{client.Port}接收到信息：{mes}");
+                    ////从客户端收到信息
+                    //var mes = Encoding.ASCII.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len
+                    //logHelper.Info($"已从{client.IP}:{client.Port}接收到信息：{mes}");
 
                     BufferMemory(BufferAnalysis.SplitByteArray(e.ByteBlock.Buffer, 0, e.ByteBlock.Len));
 
diff --git a/RFIDSocket/Program.cs b/RFIDSocket/Program.cs
index 270dad3..abd71dc 100644
--- a/RFIDSocket/Program.cs
+++ b/RFIDSocket/Program.cs
@@ -1,4 +1,5 @@
-using System;
+using HighWayIot.Log4net;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -8,6 +9,8 @@ namespace RFIDSocket
 {
     internal static class Program
     {
+        private static LogHelper logger = LogHelper.Instance;
+
         /// <summary>
         /// 应用程序的主入口点。
         /// </summary>
@@ -16,6 +19,7 @@ namespace RFIDSocket
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+            logger.Info("初始化启动");
             Application.Run(new RFIDSocket());
         }
     }
diff --git a/RFIDSocket/Properties/AssemblyInfo.cs b/RFIDSocket/Properties/AssemblyInfo.cs
index 5f8e8e7..64546d8 100644
--- a/RFIDSocket/Properties/AssemblyInfo.cs
+++ b/RFIDSocket/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/RFIDSocket/RFIDSocket.csproj b/RFIDSocket/RFIDSocket.csproj
index 0183451..f2c678d 100644
--- a/RFIDSocket/RFIDSocket.csproj
+++ b/RFIDSocket/RFIDSocket.csproj
@@ -104,6 +104,10 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HighWayIot.Log4net\HighWayIot.Log4net.csproj">
+      <Project>{DEABC30C-EC6F-472E-BD67-D65702FDAF74}</Project>
+      <Name>HighWayIot.Log4net</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HighWayIot.Repository\HighWayIot.Repository.csproj">
       <Project>{d0dc3cfb-6748-4d5e-b56a-76fdc72ab4b3}</Project>
       <Name>HighWayIot.Repository</Name>