From d34e6365096fcb395d47ad74a37b0d39ee1d9e8e Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 7 Dec 2023 16:59:53 +0800
Subject: [PATCH] =?UTF-8?q?change-=E6=97=A5=E5=BF=97=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucma.Scada.UI/Aucma.Scada.UI.csproj          |   3 +
 .../{bin/Debug/config => }/log4net.config     |   0
 HighWayIot.Log4net/HighWayIot.Log4net.csproj  |   3 -
 HighWayIot.Log4net/LogHelper.cs               |   4 +-
 HighWayIot.Log4net/config/log4net.config      | 153 ------------------
 5 files changed, 5 insertions(+), 158 deletions(-)
 rename Aucma.Scada.UI/{bin/Debug/config => }/log4net.config (100%)
 delete mode 100644 HighWayIot.Log4net/config/log4net.config

diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj
index cf12fd11..8a5c1f41 100644
--- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj
+++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj
@@ -254,6 +254,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <Content Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Aucma.Scada.UI/bin/Debug/config/log4net.config b/Aucma.Scada.UI/log4net.config
similarity index 100%
rename from Aucma.Scada.UI/bin/Debug/config/log4net.config
rename to Aucma.Scada.UI/log4net.config
diff --git a/HighWayIot.Log4net/HighWayIot.Log4net.csproj b/HighWayIot.Log4net/HighWayIot.Log4net.csproj
index 034984b8..a4788d81 100644
--- a/HighWayIot.Log4net/HighWayIot.Log4net.csproj
+++ b/HighWayIot.Log4net/HighWayIot.Log4net.csproj
@@ -48,8 +48,5 @@
     <Compile Include="LogHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="config\log4net.config" />
-  </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 6ecec10a..2c307b2b 100644
--- a/HighWayIot.Log4net/LogHelper.cs
+++ b/HighWayIot.Log4net/LogHelper.cs
@@ -27,8 +27,8 @@ namespace HighWayIot.Log4net
          * 配置文件路径
          * 
          */
-        //private readonly string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log4net.config");
-        private readonly string fileName = "E:\\桌面\\澳柯玛MES项目\\程序设计\\Aucma.Scada\\HighWayIot.Log4net\\config\\log4net.config";
+        private readonly string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log4net.config");
+     //   private readonly string fileName = "E:\\桌面\\澳柯玛MES项目\\程序设计\\Aucma.Scada\\HighWayIot.Log4net\\config\\log4net.config";
 
         private LogHelper()
         {
diff --git a/HighWayIot.Log4net/config/log4net.config b/HighWayIot.Log4net/config/log4net.config
deleted file mode 100644
index c3c4ef30..00000000
--- a/HighWayIot.Log4net/config/log4net.config
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <!--错误日志类-->
-    <logger name="logerror">
-      <level value="ALL" />
-      <appender-ref ref="ErrorAppender" />
-    </logger>
-
-    <!--信息日志类-->
-    <logger name="loginfo">
-      <level value="ALL" />
-      <appender-ref ref="InfoAppender" />
-    </logger>
-
-    <!--PLC日志类-->
-    <logger name="plclog">
-      <level value="ALL" />
-      <appender-ref ref="PlcAppender" />
-    </logger>
-
-    <!--RFID日志类-->
-    <logger name="rfidlog">
-      <level value="ALL" />
-      <appender-ref ref="RfidAppender" />
-    </logger>
-
-    <!--RFID日志类-->
-    <logger name="viewlog">
-      <level value="ALL" />
-      <appender-ref ref="ViewAppender" />
-    </logger>
-
-    <!--Sql日志类-->
-    <logger name="sqllog">
-      <level value="ALL" />
-      <appender-ref ref="SqlAppender" />
-    </logger>
-
-    <!--信号量日志类-->
-    <logger name="semaphorelog">
-      <level value="ALL" />
-      <appender-ref ref="SemaphoreAppender" />
-    </logger>
-
-    <!--错误日志附加介质-->
-    <appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="Log\" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxSizeRollBackups" value="100" />
-      <param name="MaxFileSize" value="10240" />
-      <param name="StaticLogFileName" value="false" />
-      <param name="DatePattern" value='yyyy-MM-dd/"LogError.html"'/>
-      <param name="RollingStyle" value="Date" />
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="&lt;HR COLOR=red&gt;%n异常时间：%d [%t] &lt;BR&gt;%n异常级别：%-5p &lt;BR&gt;%n异 常 类：%c [%x] &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;"  />
-      </layout>
-    </appender>
-
-    <!--信息日志附加介质-->
-    <appender name="InfoAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="Log\" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxFileSize" value="10240" />
-      <param name="MaxSizeRollBackups" value="100" />
-      <param name="StaticLogFileName" value="false" />
-      <param name="DatePattern" value='yyyy-MM-dd/"LogInfo.txt"' />
-      <param name="RollingStyle" value="Date" />
-      <!--信息日志布局-->
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
-      </layout>
-    </appender>
-
-    <!--PLC日志附加介质-->
-    <appender name="PlcAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="Log\" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxFileSize" value="10240" />
-      <param name="MaxSizeRollBackups" value="100" />
-      <param name="StaticLogFileName" value="false" />
-      <param name="DatePattern" value='yyyy-MM-dd/"PlcLog.txt"' />
-      <param name="RollingStyle" value="Date" />
-      <!--信息日志布局-->
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
-      </layout>
-    </appender>
-
-    <!--Rfid日志附加介质-->
-    <appender name="RfidAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="Log\" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxFileSize" value="10240" />
-      <param name="MaxSizeRollBackups" value="100" />
-      <param name="StaticLogFileName" value="false" />
-      <param name="DatePattern" value='yyyy-MM-dd/"RfidLog.txt"' />
-      <param name="RollingStyle" value="Date" />
-      <!--信息日志布局-->
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
-      </layout>
-    </appender>
-
-    <appender name="ViewAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="Log\" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxFileSize" value="10240" />
-      <param name="MaxSizeRollBackups" value="100" />
-      <param name="StaticLogFileName" value="false" />
-      <param name="DatePattern" value='yyyy-MM-dd/"ViewLog.txt"' />
-      <param name="RollingStyle" value="Date" />
-      <!--信息日志布局-->
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
-      </layout>
-    </appender>
-
-    <appender name="SqlAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="Log\" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxFileSize" value="10240" />
-      <param name="MaxSizeRollBackups" value="100" />
-      <param name="StaticLogFileName" value="false" />
-      <param name="DatePattern" value='yyyy-MM-dd/"SqlLog.txt"' />
-      <param name="RollingStyle" value="Date" />
-      <!--信息日志布局-->
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
-      </layout>
-    </appender>
-
-    <appender name="SemaphoreAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="Log\" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxFileSize" value="10240" />
-      <param name="MaxSizeRollBackups" value="100" />
-      <param name="StaticLogFileName" value="false" />
-      <param name="DatePattern" value='yyyy-MM-dd/"SemaphoreLog.txt"' />
-      <param name="RollingStyle" value="Date" />
-      <!--信息日志布局-->
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="&lt;--------------&gt;%n日志时间：%d [%t] %n日志级别：%-5p %n日志内容：%m %n "  />
-      </layout>
-    </appender>
-
-  </log4net>
-</configuration>
\ No newline at end of file