From 0c8f609e8208409df125cf1840d83b3b868ac83e Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Mon, 30 Aug 2021 15:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=9F=AD=E4=BF=A1=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/api/SMSPROXY_ITF.XML             | 50 ++++++++++++++----------
 cap/etc/channel/monitor/SCAALERT_ITF.XML |  7 ++++
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/cap/etc/api/SMSPROXY_ITF.XML b/cap/etc/api/SMSPROXY_ITF.XML
index 4b9210c..6c8514e 100644
--- a/cap/etc/api/SMSPROXY_ITF.XML
+++ b/cap/etc/api/SMSPROXY_ITF.XML
@@ -1,25 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Application name="CAP" server="SCAHRO2" timeout="36000">
-    <GetTxnCode>
-        <Item type="xml" value="code"/>
-    </GetTxnCode>
-    <Transaction code="SENDSMS" service="SendSms" desc="短信代理" log_switch="1" timeout="60">
-        <Request>
-            <ReadElement name="status" ETF_name="status" necessary="no"/> <!-- 状态-->
-            <ReadElement name="phoneSplits" ETF_name="phoneSplits" necessary="no"/> <!-- 状态-->
-            <ReadElement name="commonLabels" necessary="no">
-                <ReadElement name="alertname" ETF_name="alertname" necessary="no"/> <!-- 报警名称-->
-            </ReadElement>
+   <GetTxnCode>
+      <Item type="xml" value="code"/>
+   </GetTxnCode>
+   <Transaction code="SENDSMS" service="SendSms" desc="短信代理" log_switch="1" timeout="60">
+      <Request>       
+         <ReadElement name="status" ETF_name="status" necessary="no"/> <!-- 状态-->
+         <ReadElement name="phoneSplits" ETF_name="phoneSplits" necessary="no"/> <!-- 状态-->
+         <ReadElement name="commonLabels" necessary="no">
+            <ReadElement name="alertname" ETF_name="alertname" necessary="no"/> <!-- 报警名称-->
+         </ReadElement>
 
-            <ReadElement name="commonAnnotations" necessary="no">
-                <ReadElement name="summary" ETF_name="summary" necessary="no"/> <!-- 概述-->
-                <ReadElement name="description" ETF_name="text" necessary="no"/> <!-- 概述-->
+         <ReadElement name="commonAnnotations" necessary="no">
+            <ReadElement name="summary" ETF_name="summary" necessary="no"/>
+            <ReadElement name="description" ETF_name="description" necessary="no"/>
+         </ReadElement>
+         <AddItem name="ROOT.text"  value=" "/>      
+         <ReadGroupElement name="alerts" ETF_name="alerts" necessary="no">
+            <ReadElement name="annotations"  necessary="no">
+               <ReadElement name="summary" ETF_name="summary" necessary="no"/>
+               <ReadElement name="description" ETF_name="description" necessary="no"/>
+               <AddItem name="ROOT.text"  expression="STRCAT($description,\r\n,$ROOT.text)" />
             </ReadElement>
-        </Request>
-        <Response>
-            <WriteElement name="Response">
-                <ReadElement name="code" ETF_name="code" value="success" necessary="no"/>
-            </WriteElement>
-        </Response>
-    </Transaction>
+            <ReadElement name="status" ETF_name="status" necessary="no"/>
+         </ReadGroupElement>
+
+      </Request>
+      <Response>
+         <WriteElement name="Response">
+            <WriteElement name="code" ETF_name="code" value="success" necessary="no"/>
+         </WriteElement>
+      </Response>
+   </Transaction>
 </Application>
diff --git a/cap/etc/channel/monitor/SCAALERT_ITF.XML b/cap/etc/channel/monitor/SCAALERT_ITF.XML
index 6d16dc3..b01ca8a 100644
--- a/cap/etc/channel/monitor/SCAALERT_ITF.XML
+++ b/cap/etc/channel/monitor/SCAALERT_ITF.XML
@@ -21,6 +21,13 @@
                 <WriteElement name="startsAt"       ETF_name="startsAt"     necessary="no" />
                 <WriteElement name="endsAt"         ETF_name="endsAt"       necessary="no" />
                 <WriteElement name="generatorURL"   ETF_name="generatorURL" necessary="no" />
+
+	        	<WriteElement name="alerts" ETF_name="alerts" necessary="no">
+                     <WriteElement  name="annotations"  necessary="no">
+               	          <WriteElement name="summary" ETF_name="SUMMARY" necessary="no"/>
+                          <WriteElement name="description" ETF_name="DESCRIPTION" necessary="no"/> 
+                     </WriteElement>
+                </WriteElement>  
             </WriteElement>
         </Request>
         <Response necessary="no">