Merge branch 'master' of https://git.e1soft.co.kr/T001084/DDUtility

TibSimulator Patch:: AutoReply Enable의 경우, 텍스트박스에 출력하지 않고 메시지 즉시전송

DDUtilityApp/LOGPARSER/PARSER/EisParser0.cs

@@ -99,6 +99,7 @@ namespace DDUtilityApp.LOGPARSER.PARSER
             Parser parser = null;
             try
             {
+                // 0.LogLevel 1.DateTime 2.Server
                 if (string.IsNullOrWhiteSpace(strLine)) return parser;
                 if (strLine.Length < this.LogDTime.Length) return parser;
                 string[] strValues = this.GetHeaderValues(strLine);
@@ -132,6 +133,10 @@ namespace DDUtilityApp.LOGPARSER.PARSER
                 {
                     parser = this.MES_Parser;
                 }
+                else if (strValues[2].Trim() == "TRACE")
+                {
+                    return null;
+                }
                 else if (strValues[2].Trim() == "ADD" || strValues[1].Trim() == "DISPOSE")
                 {
                     parser = this.TID_Parser;

DDUtilityApp/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2025.03.25.0")]
-[assembly: AssemblyFileVersion("2025.03.25.0")]
+[assembly: AssemblyVersion("2025.03.27.0")]
+[assembly: AssemblyFileVersion("2025.03.27.0")]

DDUtilityApp/TIBRENDEZVOUS/FrmSimulator01.cs

@@ -997,7 +997,6 @@ namespace DDUtilityApp.TIBRENDEZVOUS
 
             this.Logger.Info($"Started");
             this.tboxSettingInfo.Text = sb.ToString();
-            this.Text = $"TibSimulator - {this.cboxServer.Text} :: {this.cboxTarget.Text}";
 
             List<Control.ControlCollection> lstControls = new List<Control.ControlCollection>();
             lstControls.Add(this.gboxTransport.Controls);
@@ -1113,26 +1112,23 @@ namespace DDUtilityApp.TIBRENDEZVOUS
 
                 foreach (XmlMessage xmlReply in xmlReplys)
                 {
-                    this.cboxSendSubject.Text = xmlReply.XmlData.SendSubjectName;
-                    this.tboxSendMessage.Text = xmlReply.XmlData.GetText();
-                    this.tboxSendMessage.Tag = xmlReply;
-
-                    xmlReply.SendSubject = this.cboxSendSubject.Text;
-
-                    if (xmlReply.IsReply && xmlReply.RequestMessage != null)
-                        if (!string.IsNullOrEmpty(xmlReply.RequestMessage.ReplySubject)) this.SendButtons_Focus(this.btnSendReply);
-                        else this.SendButtons_Focus(this.btnSend);
-                    //else if (xmlReply.SendRequestFlag) this.SendButtons_Focus(this.btnSendRequest);
-                    else this.SendButtons_Focus(this.btnSend);
 
                     if (xmlReceived.XmlData.MessageName.ToLower().StartsWith("AreYouThereRequest".ToLower()))
                     {
                         if (this.chkSendAreYouThereReply.Checked)
                         {
                             this.TibRendezvous.SendMessage(xmlReply);
-                            this.tboxSendMessage.Clear();
-                            this.tboxSendMessage.Tag = null;
-                            return;
+                        }
+                        else
+                        {
+                            this.cboxSendSubject.Text = xmlReply.SendSubject;
+                            this.tboxSendMessage.Text = xmlReply.XmlData.GetText();
+                            this.tboxSendMessage.Tag = xmlReply;
+
+                            if (xmlReply.IsReply && xmlReply.RequestMessage != null)
+                                if (!string.IsNullOrEmpty(xmlReply.RequestMessage.ReplySubject)) this.SendButtons_Focus(this.btnSendReply);
+                                else this.SendButtons_Focus(this.btnSend);
+                            else this.SendButtons_Focus(this.btnSend);
                         }
                     }
                     else
@@ -1140,9 +1136,17 @@ namespace DDUtilityApp.TIBRENDEZVOUS
                         if (this.chkSendReply.Checked)
                         {
                             this.TibRendezvous.SendMessage(xmlReply);
-                            this.tboxSendMessage.Clear();
-                            this.tboxSendMessage.Tag = null;
-                            return;
+                        }
+                        else
+                        {
+                            this.cboxSendSubject.Text = xmlReply.SendSubject;
+                            this.tboxSendMessage.Text = xmlReply.XmlData.GetText();
+                            this.tboxSendMessage.Tag = xmlReply;
+
+                            if (xmlReply.IsReply && xmlReply.RequestMessage != null)
+                                if (!string.IsNullOrEmpty(xmlReply.RequestMessage.ReplySubject)) this.SendButtons_Focus(this.btnSendReply);
+                                else this.SendButtons_Focus(this.btnSend);
+                            else this.SendButtons_Focus(this.btnSend);
                         }
                     }
                 }

JWH/TIB/MessageParser.cs

@@ -60,8 +60,8 @@ namespace JWH.TIB
                 XmlMessage xmlMessage = new XmlMessage(xmlData);
                 if (isValueSetting) 
                 {
-                    this.SetMessageValue(xmlMessage.XmlData.Header);
-                    this.SetMessageValue(xmlMessage.XmlData.Body);
+                    this.SetMessageBodyValue(xmlMessage.XmlData.Header);
+                    this.SetMessageBodyValue(xmlMessage.XmlData.Body);
                 }
 
                 return xmlMessage;
@@ -90,11 +90,11 @@ namespace JWH.TIB
                 DirectoryInfo directoryInfo = new DirectoryInfo(this.PathMessageReply);
                 foreach (FileInfo fileInfo in directoryInfo.GetFiles($"{xmlRequest.XmlData.MessageName}_*.xml"))
                 {
-                    StreamReader reader = new StreamReader(fileInfo.FullName, Encoding.UTF8, true);
+                    StreamReader reader = new StreamReader(fileInfo.FullName, Encoding.Default, true);
                     strReply = reader.ReadToEnd();
                     xmlReply = new XmlMessage(strReply);
-                    xmlReply.SetRequstMessage(xmlRequest);
-                    this.SetMessageValue(xmlReply.XmlData.Body, xmlRequest);
+                    xmlReply.SetSubjectName(xmlRequest);
+                    this.SetMessageBodyValue(xmlReply.XmlData.Body, xmlRequest);
 
                     lstReply.Add(xmlReply);
                 }
@@ -131,8 +131,11 @@ namespace JWH.TIB
 
             XmlMessage xmlReply = new XmlMessage(xmlRequest.XmlData.GetText());
             xmlReply.XmlData.MessageName += "Reply";
+            xmlReply.XmlData.SendRequestFlag = false;
             xmlReply.XmlData.ReplySubjectName = xmlRequest.XmlData.SendSubjectName;
             xmlReply.XmlData.SendSubjectName = xmlRequest.XmlData.ReplySubjectName;
+            xmlReply.SendSubject = xmlReply.XmlData.SendSubjectName;
+            xmlReply.SendRequestFlag = xmlReply.XmlData.SendRequestFlag;
 
             xmlReply.RequestMessage = xmlRequest;
             if (xmlRequest.SendRequestFlag) xmlReply.IsReply = true;
@@ -150,10 +153,12 @@ namespace JWH.TIB
             if (xmlRequest == null) return null;
 
             XmlMessage xmlReply = new XmlMessage(xmlRequest.XmlData.GetText());
-            xmlReply.XmlData.SendRequestFlag = false;
             xmlReply.XmlData.MessageName += "Reply";
+            xmlReply.XmlData.SendRequestFlag = false;
             xmlReply.XmlData.ReplySubjectName = xmlRequest.XmlData.SendSubjectName;
             xmlReply.XmlData.SendSubjectName = xmlRequest.XmlData.ReplySubjectName;
+            xmlReply.SendSubject = xmlReply.XmlData.SendSubjectName;
+            xmlReply.SendRequestFlag = xmlReply.XmlData.SendRequestFlag;
 
             XmlNode nodeReturn = xmlReply.XmlData.Message.CreateChildNode("return");
             nodeReturn.CreateChildNode("returncode", "0");
@@ -176,7 +181,7 @@ namespace JWH.TIB
         /// </summary>
         /// <param name="node"></param>
         /// <param name="srcMessage">RequestMessage</param>
-        private void SetMessageValue(XmlNode node, XmlMessage srcMessage = null)
+        private void SetMessageBodyValue(XmlNode node, XmlMessage srcMessage = null)
         {
             // MessageValue(UI)
             if (node.GetText() == string.Empty)
@@ -220,7 +225,7 @@ namespace JWH.TIB
             foreach (XmlNode child in node.ChildNodes)
             {
                 if (child.GetType() == typeof(XmlText)) continue;
-                this.SetMessageValue(child, srcMessage);
+                this.SetMessageBodyValue(child, srcMessage);
             }
         }
 

JWH/TIB/XmlData.cs

@@ -175,7 +175,7 @@ namespace JWH.TIB
         #region [ Method ] ====================================================
 
         /// <summary>
-        /// FromString
+        /// 전달된 메시지(문자열)로 속성을 셋팅한다.
         /// </summary>
         /// <param name="xmlData"></param>
         public void FromString(string xmlData)

JWH/TIB/XmlMessage.cs

@@ -174,7 +174,11 @@ namespace JWH.TIB
 
         #region [ Public Method ] =============================================
 
-        public void SetRequstMessage(XmlMessage xmlRequest)
+        /// <summary>
+        /// Set Value of SendSubject, ReplySubject
+        /// </summary>
+        /// <param name="xmlRequest"></param>
+        public void SetSubjectName(XmlMessage xmlRequest)
         {
             this.RequestMessage = xmlRequest;
             this.IsReply = true;