diff --git a/DDUtilityApp/DDUtilityApp.csproj b/DDUtilityApp/DDUtilityApp.csproj index e9b17f7..1871271 100644 --- a/DDUtilityApp/DDUtilityApp.csproj +++ b/DDUtilityApp/DDUtilityApp.csproj @@ -34,8 +34,8 @@ true index.htm true - 1 - 2025.04.24.1 + 0 + 2025.05.01.0 false true true diff --git a/DDUtilityApp/LOGPARSER/DATA/EisEquipment.cs b/DDUtilityApp/LOGPARSER/DATA/EisEquipment.cs index cea72bc..ed3caab 100644 --- a/DDUtilityApp/LOGPARSER/DATA/EisEquipment.cs +++ b/DDUtilityApp/LOGPARSER/DATA/EisEquipment.cs @@ -58,13 +58,13 @@ namespace DDUtilityApp.LOGPARSER.DATA { get { - string value = string.Empty; - foreach(string name in this.DisplayNameOrder.Split(';')) - { - value = this.PropertyGet(name).ToString(); - if (!string.IsNullOrEmpty(value)) break; - } - return value; + //string value = string.Empty; + //foreach(string name in this.DisplayNameOrder.Split(';')) + //{ + // value = this.PropertyGet(name).ToString(); + // if (!string.IsNullOrEmpty(value)) break; + //} + return this.MesName; } } diff --git a/DDUtilityApp/LOGPARSER/FrmEqSelector.cs b/DDUtilityApp/LOGPARSER/FrmEqSelector.cs index 9a3650a..e111c79 100644 --- a/DDUtilityApp/LOGPARSER/FrmEqSelector.cs +++ b/DDUtilityApp/LOGPARSER/FrmEqSelector.cs @@ -1001,7 +1001,7 @@ namespace DDUtilityApp.LOGPARSER #region [ EIS.B2 ] logServer = new LogServer("EIS.B2"); - logServer.DBConnectionString = $@"server=192.168.8.217;database=EIS;uid=EIS_Service;pwd=Yi^d!3dqpc%m;"; + logServer.DBConnectionString = $@"server=192.168.8.214;database=EIS;uid=EIS_Service;pwd=Yi^d!3dqpc%m;"; logServer.DBGetEquipments = sbEquipments.ToString(); logServer.DBGetModelDetails = sbModelDetails.ToString(); logServer.DBGetModelInfo = sbModelInfo.ToString(); diff --git a/DDUtilityApp/LOGPARSER/FrmLogParser.cs b/DDUtilityApp/LOGPARSER/FrmLogParser.cs index 60d921c..7f66d3d 100644 --- a/DDUtilityApp/LOGPARSER/FrmLogParser.cs +++ b/DDUtilityApp/LOGPARSER/FrmLogParser.cs @@ -34,6 +34,8 @@ namespace DDUtilityApp.LOGPARSER private bool IsLogFolderOpen { get; set; } = false; + private XLogger Logger { get; set; } = null; + #endregion #region [ Properties ] ------------------------------------------------ @@ -75,6 +77,8 @@ namespace DDUtilityApp.LOGPARSER public FrmLogParser() { InitializeComponent(); + + XLogger.Instance = new XLogger("LogViewer"); this.SetLayout(); this.SetEventHandler(); diff --git a/DDUtilityApp/Properties/AssemblyInfo.cs b/DDUtilityApp/Properties/AssemblyInfo.cs index 48b5f94..1865a52 100644 --- a/DDUtilityApp/Properties/AssemblyInfo.cs +++ b/DDUtilityApp/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2025.04.24.1")] -[assembly: AssemblyFileVersion("2025.04.24.1")] +[assembly: AssemblyVersion("2025.05.01.0")] +[assembly: AssemblyFileVersion("2025.05.01.0")] diff --git a/DDUtilityApp/log4net.config b/DDUtilityApp/log4net.config index 6585b69..e64b883 100644 --- a/DDUtilityApp/log4net.config +++ b/DDUtilityApp/log4net.config @@ -6,9 +6,9 @@ - + - + @@ -46,6 +46,23 @@ + + + + + + + + + + + + + + + + + diff --git a/JWH/log4net.config b/JWH/log4net.config index 41ec8b9..6d38c6a 100644 --- a/JWH/log4net.config +++ b/JWH/log4net.config @@ -1,29 +1,28 @@  - - + + - + - + + + - - - - + + -