林豪 左 3 жил өмнө
parent
commit
4de5317c19

BIN
DLL/PLC.Siemens.dll


+ 4 - 2
Logs/LogHelper.cs

@@ -266,6 +266,8 @@ namespace Logs
             LoggerRepository ??= LogManager.CreateRepository("NETCoreRepository");
             XmlConfigurator.Configure(LoggerRepository, new StreamReader(new MemoryStream(Encoding.ASCII.GetBytes(xmlDoc.OuterXml))).BaseStream);
 
+            xmlDoc.Save("./log4net.config");
+
             if (_cleanSet) return;
             _cleanSet = true;
             _previousCleanDay = DateTime.Now.ToString("yyyyMMdd");
@@ -329,7 +331,7 @@ namespace Logs
                 var layout = xmlDoc.CreateElement("layout");
                 layout.SetAttribute("type", "log4net.Layout.PatternLayout");
                 var conversionPattern = xmlDoc.CreateElement("conversionPattern");
-                conversionPattern.SetAttribute("value", "%date [%thread] %-5level - %message%newline");
+                conversionPattern.SetAttribute("value", "%date || %5level || %logger || %message || %exception || end %newline");
                 layout.AppendChild(conversionPattern);
                 appender.AppendChild(layout);
 
@@ -367,4 +369,4 @@ namespace Logs
 
         #endregion 初始化日志
     }
-}
+}

+ 5 - 3
Logs/Logs.csproj

@@ -3,12 +3,14 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>1.0.0.1</AssemblyVersion>
-    <FileVersion>1.0.0.1</FileVersion>
+    <AssemblyVersion>1.0.0.2</AssemblyVersion>
+    <FileVersion>1.0.0.2</FileVersion>
     <UserSecretsId>0d0d7a9a-e261-49ea-a9ce-953f029a7a13</UserSecretsId>
     <IsPublishable>True</IsPublishable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.1</Version>
+    <Version>1.0.0.2</Version>
+    <Description>尝试适配日志可视化组件</Description>
+    <PackageReleaseNotes>尝试适配日志可视化组件</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

+ 14 - 0
Projects/永冠OPP/WCS.Service/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>D:\XM\Release\WCS</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>

+ 275 - 0
Projects/永冠OPP/WCS.Service/log4net.config

@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <log4net>
+    <appender name="Info_InitAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_Init.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_Init">
+      <level value="ALL" />
+      <appender-ref ref="Info_InitAppender" />
+    </logger>
+    <appender name="Info_SrmAlarmAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_SrmAlarm.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_SrmAlarm">
+      <level value="ALL" />
+      <appender-ref ref="Info_SrmAlarmAppender" />
+    </logger>
+    <appender name="Info_InfoAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_Info.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_Info">
+      <level value="ALL" />
+      <appender-ref ref="Info_InfoAppender" />
+    </logger>
+    <appender name="Info_ErrorAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_Error.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_Error">
+      <level value="ALL" />
+      <appender-ref ref="Info_ErrorAppender" />
+    </logger>
+    <appender name="Info_SRMInfoAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_SRMInfo.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_SRMInfo">
+      <level value="ALL" />
+      <appender-ref ref="Info_SRMInfoAppender" />
+    </logger>
+    <appender name="Info_SyTaskTatusAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_SyTaskTatus.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_SyTaskTatus">
+      <level value="ALL" />
+      <appender-ref ref="Info_SyTaskTatusAppender" />
+    </logger>
+    <appender name="INFO_WMSRequestAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'INFO_WMSRequest.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="INFO_WMSRequest">
+      <level value="ALL" />
+      <appender-ref ref="INFO_WMSRequestAppender" />
+    </logger>
+    <appender name="Info_WarnAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_Warn.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_Warn">
+      <level value="ALL" />
+      <appender-ref ref="Info_WarnAppender" />
+    </logger>
+    <appender name="Info_PlcReadLogAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_PlcReadLog.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_PlcReadLog">
+      <level value="ALL" />
+      <appender-ref ref="Info_PlcReadLogAppender" />
+    </logger>
+    <appender name="Info_TimingAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info_Timing.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info_Timing">
+      <level value="ALL" />
+      <appender-ref ref="Info_TimingAppender" />
+    </logger>
+    <appender name="INFO_I_WCS_GetExcTaskAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'INFO_I_WCS_GetExcTask.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="INFO_I_WCS_GetExcTask">
+      <level value="ALL" />
+      <appender-ref ref="INFO_I_WCS_GetExcTaskAppender" />
+    </logger>
+    <appender name="CreateTaskInAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'CreateTaskIn.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="CreateTaskIn">
+      <level value="ALL" />
+      <appender-ref ref="CreateTaskInAppender" />
+    </logger>
+    <appender name="RgvInfoAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'RgvInfo.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="RgvInfo">
+      <level value="ALL" />
+      <appender-ref ref="RgvInfoAppender" />
+    </logger>
+    <appender name="info_agvAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'info_agv.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="info_agv">
+      <level value="ALL" />
+      <appender-ref ref="info_agvAppender" />
+    </logger>
+    <appender name="InfoAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="Encoding" value="utf-8" />
+      <file value="D:\WCSLog\Info" />
+      <appendToFile value="true" />
+      <rollingStyle value="Composite" />
+      <maxSizeRollBackups value="-1" />
+      <maximumFileSize value="100MB" />
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+      <staticLogFileName value="false" />
+      <DatePattern value="/yyyyMMdd/'Info.log'" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date || %5level || %logger || %message || %exception || end %newline" />
+      </layout>
+    </appender>
+    <logger name="Info">
+      <level value="ALL" />
+      <appender-ref ref="InfoAppender" />
+    </logger>
+  </log4net>
+</configuration>