修改dp2sipclient接管消息异常

DigitalPlatform · Sep 13, 2022 · 46ab4bf · 46ab4bf
1 parent 22d84d4
commit 46ab4bf
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 34 deletions.
diff --git a/dp-library b/dp-library
diff --git a/dp2SIPClient/MainForm.cs b/dp2SIPClient/MainForm.cs
@@ -567,27 +567,37 @@ private void sendCmd()
                 return;
             }
 
-            string requestText = this.txtMsg.Text.Trim() + new string((char)13, 1);   // 2018/7/28
-            string responseText = "";
-            string error = "";
+            try
+            {
 
-            this.Print("send:" + requestText);
-            LogManager.Logger.Info("send:" + requestText);
-            BaseMessage response = null;
-            int nRet = SCHelper.Instance.SendAndRecvMessage(requestText,
-                out response,
-                out responseText,
-                out error);
-            if (nRet == -1)
+                string requestText = this.txtMsg.Text.Trim() + new string((char)13, 1);   // 2018/7/28
+                string responseText = "";
+                string error = "";
+
+                this.Print("send:" + requestText);
+                LogManager.Logger.Info("send:" + requestText);
+                BaseMessage response = null;
+                int nRet = SCHelper.Instance.SendAndRecvMessage(requestText,
+                    out response,
+                    out responseText,
+                    out error);
+                if (nRet == -1)
+                {
+                    MessageBox.Show(error);
+                    this.Print("error:" + error);
+                    LogManager.Logger.Error("error:" + error);
+                    return;
+                }
+
+                this.Print("recv:" + responseText);
+                LogManager.Logger.Info("recv:" + responseText);
+            }
+            catch (Exception ex)
             {
-                MessageBox.Show(error);
-                this.Print("error:" + error);
-                LogManager.Logger.Error("error:" + error);
+                MessageBox.Show(this,ex.Message);
                 return;
             }
 
-            this.Print("recv:" + responseText);
-            LogManager.Logger.Info("recv:" + responseText);
 
         }
 
@@ -1205,20 +1215,28 @@ private void button1_Click(object sender, EventArgs e)
 
         public void SendMessage()
         {
-            string cmdText = this.textBox_message.Text.Trim();//this.textBox_barcodes.Text.Trim();
-            this.Print("send:" + cmdText);
-            BaseMessage response = null;
-            int nRet = SCHelper.Instance.SendAndRecvMessage(cmdText,
-                out response,
-                out string responseText,
-                out string error);
-            if (nRet == -1)
+            try
             {
-                MessageBox.Show(error);
-                this.Print("error:" + error);
-            }
+                string cmdText = this.textBox_message.Text.Trim();//this.textBox_barcodes.Text.Trim();
+                this.Print("send:" + cmdText);
+                BaseMessage response = null;
+                int nRet = SCHelper.Instance.SendAndRecvMessage(cmdText,
+                    out response,
+                    out string responseText,
+                    out string error);
+                if (nRet == -1)
+                {
+                    MessageBox.Show(error);
+                    this.Print("error:" + error);
+                }
 
-            this.Print("recv:" + responseText);
+                this.Print("recv:" + responseText);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(this,ex.Message);
+                return;
+            }
         }
 
 

diff --git a/dp2SIPClient/dp2SIPClient.csproj b/dp2SIPClient/dp2SIPClient.csproj
@@ -65,7 +65,7 @@
     <ManifestCertificateThumbprint>57CE53D10A26B55C487F4A07A2D6B3BCCB573D75</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>数字平台（北京）软件有限责任公司_2022.pfx</ManifestKeyFile>
+    <ManifestKeyFile>数字平台（北京）软件有限责任公司.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -77,8 +77,8 @@
     <ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -175,7 +175,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <None Include="数字平台（北京）软件有限责任公司.pfx" />
-    <None Include="数字平台（北京）软件有限责任公司_2022.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="delete.txt" />

diff --git a/dp2SIPClient/packages.config b/dp2SIPClient/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.12" targetFramework="net461" />
+  <package id="log4net" version="2.0.15" targetFramework="net472" />
 </packages>
+91 −0		DigitalPlatform.Core/Cryptography.cs
+1 −1		DigitalPlatform.Core/DigitalPlatform.Core.csproj
+5 −2		DigitalPlatform.Core/IsbnSplitter.cs
+49 −0		DigitalPlatform.Core/Result.cs
+20 −14		DigitalPlatform.Core/StringUtil.cs
+270 −0		DigitalPlatform.Core/XML/XmlExtension.cs
+3 −0		DigitalPlatform.MarcQuery/MarcQuery.cs
+13 −6		DigitalPlatform.SIP/BaseMessage.cs
+1 −1		DigitalPlatform.SIP/DigitalPlatform.SIP.csproj
+1 −1		DigitalPlatform.Z3950/DigitalPlatform.Z3950.csproj
+5 −5		UnitTestCompactLog/UnitTestCompactLog.csproj
+193 −0		UnitTestCompactLog/UnitTestStringUtil.cs
+4 −4		UnitTestMarcQuery/UnitTestMarcQuery.csproj
+4 −4		UnitTestSIP/UnitTestSIP.csproj