From 94f939d6f405e84329881f6ff4825bc77d0227ad Mon Sep 17 00:00:00 2001
From: niushuai233 <niushuai951101@gmail.com>
Date: Sun, 18 Sep 2022 17:05:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.config                 | 35 ++++++++-----------------------
 Properties/AssemblyInfo.cs |  2 ++
 RepositorySync.csproj      |  6 ++++++
 Util/LogUtil.cs            |  2 +-
 log4net.config             | 42 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 27 deletions(-)
 create mode 100644 log4net.config

diff --git a/App.config b/App.config
index c2c2b0c..54802eb 100644
--- a/App.config
+++ b/App.config
@@ -1,31 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
+    <startup>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-
-  <!-- log4net 配置 -->
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
-  </configSections>
-  <log4net>
-    <appender name="Console" type="log4net.Appender.ConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="%d [%10t] %-5p %C %c [%x] - %m%n"  />
-      </layout>
-    </appender>
-    <logger name="RepoSync">
-      <level value="ALL"/>
-      <appender-ref ref="Console" />
-    </logger>
-  </log4net>
-  
+    <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <dependentAssembly>
+          <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+          <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        </dependentAssembly>
+      </assemblyBinding>
+    </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index d75974f..c46d270 100644
--- a/Properties/AssemblyInfo.cs
+++ b/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", Watch = true)]
\ No newline at end of file
diff --git a/RepositorySync.csproj b/RepositorySync.csproj
index 7822e26..79e61eb 100644
--- a/RepositorySync.csproj
+++ b/RepositorySync.csproj
@@ -228,6 +228,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Util\LogUtil.cs" />
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -254,6 +255,11 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="log4net.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="packages\Fody.6.6.3\build\Fody.targets" Condition="Exists('packages\Fody.6.6.3\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Util/LogUtil.cs b/Util/LogUtil.cs
index 13c6f62..5a26052 100644
--- a/Util/LogUtil.cs
+++ b/Util/LogUtil.cs
@@ -8,7 +8,7 @@ namespace Util
         /// <summary>
         /// 默认log实例
         /// </summary>
-        private static ILog LOG = LogManager.GetLogger("Console");
+        private static ILog LOG = LogManager.GetLogger("ALL");
 
         /// <summary>
         /// 默认控制台logger debug
diff --git a/log4net.config b/log4net.config
new file mode 100644
index 0000000..2ee8952
--- /dev/null
+++ b/log4net.config
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!-- log4net 配置 -->
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
+  </configSections>
+  <log4net>
+    
+    <!-- 控制台输出 -->
+    <appender name="Console" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="%d [%10thread] %-5p %c %l - %m%n"  />
+      </layout>
+    </appender>
+    
+    <!-- 文件输出 -->
+    <appender name="FileAppender" type="log4net.Appender.RollingFileAppender">
+      <file value="Log\\" />
+      <appendToFile value="true" />
+      <maxSizeRollBackups value="10" />
+      <maxFileSize value="10240" />
+      <staticLogFileName value="false" />
+      <datePattern value="'RepoSync_ALL_'yyyyMMdd'.log'" />
+      <rollingStyle value="Date" />
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="%d [%10thread] %-5p %c %l - %m%n"  />
+      </layout>
+    </appender>
+    
+    
+    <logger name="Console">
+      <level value="ALL"/>
+      <appender-ref ref="Console" />
+    </logger>
+
+    <logger name="ALL">
+      <level value="ALL"/>
+      <appender-ref ref="Console" />
+      <appender-ref ref="FileAppender" />
+    </logger>
+  </log4net>
+</configuration>
\ No newline at end of file