Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

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
      */

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>

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">