From f635f9c3003ae10f7be8e934b81bc480c82617ba Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: Wed, 20 Apr 2022 13:56:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=95=E5=83=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=9A=E5=AE=9E=E6=B5=8B=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8E=82=E5=AE=B6=EF=BC=88TP-Link=20IPC43AW=EF=BC=89=E5=BD=95?=
 =?UTF-8?q?=E5=83=8F=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84xml=E6=8A=A5=E6=96=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=AD=E6=9C=89=E5=A4=9A=E4=BD=99=E7=9A=84=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=A7=A3=E6=9E=90String=E4=B8=BAInt?=
 =?UTF-8?q?eger=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0trim=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../genersoft/iot/vmp/gb28181/utils/XmlUtil.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index ba6eed5f..09e7a04f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -20,8 +20,8 @@ import java.util.*;
 
 /**
  * 基于dom4j的工具包
- * 
- * 
+ *
+ *
  */
 public class XmlUtil {
     /**
@@ -31,9 +31,9 @@ public class XmlUtil {
 
     /**
      * 解析XML为Document对象
-     * 
+     *
      * @param xml 被解析的XMl
-     * 
+     *
      * @return Document
      */
     public static Element parseXml(String xml) {
@@ -51,7 +51,7 @@ public class XmlUtil {
 
     /**
      * 获取element对象的text的值
-     * 
+     *
      * @param em  节点的对象
      * @param tag 节点的tag
      * @return 节点
@@ -62,12 +62,12 @@ public class XmlUtil {
         }
         Element e = em.element(tag);
         //
-        return null == e ? null : e.getText();
+        return null == e ? null : e.getText().trim();
     }
 
     /**
      * 递归解析xml节点，适用于 多节点数据
-     * 
+     *
      * @param node     node
      * @param nodeName nodeName
      * @return List<Map<String, Object>>
@@ -106,7 +106,7 @@ public class XmlUtil {
 
     /**
      * xml转json
-     * 
+     *
      * @param element
      * @param json
      */

From 4dcc7df555e0027adcea89aa2590eb56605398c2 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: Thu, 21 Apr 2022 10:03:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=B8=80=E5=A4=84v-for=E6=B2=A1=E6=9C=89key=E7=9A=84=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/src/components/control.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue
index 9a0a97e0..742b0917 100644
--- a/web_src/src/components/control.vue
+++ b/web_src/src/components/control.vue
@@ -41,7 +41,7 @@
                             <template slot="extra">
                               <el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy"  title="点击拷贝" v-clipboard="JSON.stringify(wvpServerConfig.sip)|| ''" @success="$message({type:'success', message:'成功拷贝到粘贴板'})"></el-button>
                             </template>
-                            <el-descriptions-item v-for="(value, key, index) in wvpServerConfig.sip">
+                            <el-descriptions-item v-for="(value, key, index) in wvpServerConfig.sip" :key="key">
                               <template slot="label">
                                 {{ getNameFromKey(key) }}
                               </template>

From 3def634a270947e27d9705d2d41130e1ed6562ea Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: Thu, 21 Apr 2022 10:11:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B6=8A=E7=95=8C=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/src/components/live.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue
index 82575276..fbe52465 100644
--- a/web_src/src/components/live.vue
+++ b/web_src/src/components/live.vue
@@ -4,7 +4,7 @@
       <el-header>
         <uiHeader></uiHeader>
       </el-header>
-      <el-container v-loading="loading" element-loading-text="拼命加载中">
+      <el-container v-loading="loading" element-loading-text="拼命加载中" style="margin: 0 20px;">
         <el-aside width="300px" style="background-color: #ffffff">
           <div style="text-align: center;padding-top: 20px;">设备列表</div>
           <el-menu  v-loading="loading">