From 2f9dfbc2122f5df7f588425447fe8baeb2a5844b Mon Sep 17 00:00:00 2001
From: ryh <renyh@dp2003.com>
Date: Mon, 9 Nov 2020 00:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=8F=91=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 DigitalPlatform.Interfaces/NoticeInterface.cs |  2 ++
 dp2weixin.service/dp2WeiXinService.cs         | 12 +++++++++---
 dp2weixinP2P/dp2weixinWeb.csproj              |  8 ++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c8fc6ef0..7197f895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,3 +198,4 @@ ChordInstaller/*_app/
 /WebZ/DongshifangMessageInterface.dll.config
 /dp2weixinP2P/DongshifangMessageInterface.dll.config
 /dp2Mini/代码签名证书-2019.p12
+/dp2weixinP2P/LmxxReceiveNoticeInterface.dll.config
diff --git a/DigitalPlatform.Interfaces/NoticeInterface.cs b/DigitalPlatform.Interfaces/NoticeInterface.cs
index b9723419..94af2bc9 100644
--- a/DigitalPlatform.Interfaces/NoticeInterface.cs
+++ b/DigitalPlatform.Interfaces/NoticeInterface.cs
@@ -19,8 +19,10 @@ public class NoticeInterface
         /// -1 出错
         /// </returns>
         public virtual int SendNotice(string noticeXml,
+            out string info,
             out string strError)
         {
+            info = "";
             strError = "";
             return 0;
         }
diff --git a/dp2weixin.service/dp2WeiXinService.cs b/dp2weixin.service/dp2WeiXinService.cs
index 6a4ea963..1cf606d8 100644
--- a/dp2weixin.service/dp2WeiXinService.cs
+++ b/dp2weixin.service/dp2WeiXinService.cs
@@ -1105,14 +1105,17 @@ public int InternalDoMessage(MessageRecord record,
             LibModel libCfg= this._areaMgr.GetLibCfg(lib.id, libraryCode);
             if (libCfg !=null &&　string.IsNullOrEmpty(libCfg.noticedll) == false)
             {
-                nRet = this.TransNotice(strBody, libCfg.noticedll, out strError);
+                string tempInfo = "";
+
+                nRet = this.TransNotice(strBody, libCfg.noticedll, out  tempInfo,
+                    out strError);
                 if (nRet == -1)
                 {
-                    WriteErrorLog("向"+libCfg.noticedll+ "转发'"+strType+"'通知出错:" + strError);
+                    WriteErrorLog("向"+libCfg.noticedll+ "转发'"+strType+"'通知出错:" + strError+"["+tempInfo+"]");
                 }
                 else
                 {
-                    WriteDebug("向" + libCfg.noticedll + "转发'" + strType + "'通知成功。");
+                    WriteDebug("向" + libCfg.noticedll + "转发'" + strType + "'通知成功。["+tempInfo+"]");
                     //WriteDebug(strBody);
                 }
             }
@@ -3039,9 +3042,11 @@ private int SendArrived(XmlDocument bodyDom,
         /// <returns></returns>
         public int TransNotice(string noticeXml,
             string assemblyName,
+            out string info,
             out string strError)
         {
             strError = "";
+            info = "";
             int nRet = 0;
             //string assemblyName = "LmxxReceiveNoticeInterface";
             if (string.IsNullOrEmpty(assemblyName) == true)
@@ -3064,6 +3069,7 @@ public int TransNotice(string noticeXml,
 
                 // 外部接口发送通知
                 nRet = external_interface.SendNotice(noticeXml,
+                    out info,
                     out strError);
                 if (nRet == -1)
                 {
diff --git a/dp2weixinP2P/dp2weixinWeb.csproj b/dp2weixinP2P/dp2weixinWeb.csproj
index 56e81590..1068fe79 100644
--- a/dp2weixinP2P/dp2weixinWeb.csproj
+++ b/dp2weixinP2P/dp2weixinWeb.csproj
@@ -205,9 +205,6 @@
     <Content Include="Content\themes\base\tabs.css" />
     <Content Include="Content\themes\base\theme.css" />
     <Content Include="Content\themes\base\tooltip.css" />
-    <Content Include="DongshifangMessageInterface.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
     <Content Include="img\1.jpg" />
@@ -240,7 +237,10 @@
     <Content Include="img\search2.jfif" />
     <Content Include="img\wait2.gif" />
     <Content Include="fonts\mui-icons-extra.ttf" />
-    <Content Include="DongshifangMessageInterface.dll.config">
+    <Content Include="LmxxReceiveNoticeInterface.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="LmxxReceiveNoticeInterface.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="Scripts\jquery-3.4.1.intellisense.js" />