Merge branch 'wvp-28181-2.0'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java

web_src/src/components/CloudRecord.vue

@@ -1,7 +1,11 @@
 <template>
 	<div id="app" style="width: 100%">
     <div class="page-header">
-      <div class="page-title">云端录像</div>
+      <div class="page-title">
+        <el-page-header v-if="recordDetail" @back="backToList" content="云端录像"></el-page-header>
+        <div v-if="!recordDetail">云端录像</div>
+      </div>
+
       <div class="page-header-btn">
         节点选择:
         <el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="请选择" :disabled="recordDetail">
@@ -183,7 +187,7 @@
         }).catch(function (error) {
           console.log(error);
         });
-      }
+      },
 
 
 		}

web_src/src/components/CloudRecordDetail.vue

@@ -1,7 +1,9 @@
 <template>
 	<div id="recordDetail">
 		<el-container>
+
       <el-aside width="300px">
+
         <div class="record-list-box-box">
           <el-date-picker size="mini" v-model="chooseDate" :picker-options="pickerOptions" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()"></el-date-picker>
           <div class="record-list-box" :style="recordListStyle">
@@ -423,6 +425,9 @@
         }).catch(function (error) {
           console.log(error);
         });
+      },
+      goBack(){
+        this.$router.push('/cloudRecord');
       }
 		}
 	};

web_src/src/components/Login.vue

@@ -66,10 +66,6 @@ export default {
 
   	//登录请求
   	toLogin(){
-
-  		//一般要跟后端了解密码的加密规则
-  		//这里例子用的哈希算法来自./js/sha1.min.js
-
   		//需要想后端发送的登录参数
   		let loginParam = {
   			username: this.username,
@@ -78,12 +74,17 @@ export default {
       var that = this;
       //设置在登录状态
       this.isLoging = true;
+      let timeoutTask = setTimeout(()=>{
+        that.$message.error("登录超时");
+        that.isLoging = false;
+      }, 1000)
 
       this.$axios({
       	method: 'get',
         url:"/api/user/login",
         params: loginParam
       }).then(function (res) {
+        window.clearTimeout(timeoutTask)
         console.log(JSON.stringify(res));
           if (res.data.code === 0 ) {
             that.$cookies.set("session", {"username": that.username,"roleId":res.data.data.role.id}) ;
@@ -99,6 +100,8 @@ export default {
               });
           }
       }).catch(function (error) {
+        console.log(error)
+        window.clearTimeout(timeoutTask)
         that.$message.error(error.response.data.msg);
         that.isLoging = false;
       });

web_src/src/components/dialog/MediaServerEdit.vue

@@ -357,7 +357,7 @@ export default {
       var result = false;
       var that = this;
       await that.$axios({
-        method: 'post',
+        method: 'get',
         url:`/api/platform/exit/${deviceGbId}`
       }).then(function (res) {
         result = res.data;

web_src/src/components/dialog/StreamProxyEdit.vue

@@ -263,7 +263,7 @@ export default {
       var result = false;
       var that = this;
       await that.$axios({
-        method: 'post',
+        method: 'get',
         url:`/api/platform/exit/${deviceGbId}`
       }).then(function (res) {
         result = res.data;

web_src/src/components/dialog/devicePlayer.vue

@@ -386,7 +386,7 @@ export default {
             if (tab.name === "codec") {
                 this.$axios({
                     method: 'get',
-                    url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
+                    url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&app='+ this.app +'&stream='+ this.streamId
                 }).then(function (res) {
                     that.tracksLoading = false;
                     if (res.data.code == 0 && res.data.tracks) {

web_src/src/components/dialog/platformEdit.vue

@@ -268,30 +268,29 @@ export default {
       }
     },
     saveForm: function (){
-      var that = this;
-      that.$axios({
+      this.$axios({
         method: 'post',
         url: this.saveUrl,
-        data: that.platform
-      }).then(function (res) {
+        data: this.platform
+      }).then((res) =>{
         if (res.data.code === 0) {
-          that.$message({
+          this.$message({
             showClose: true,
             message: "保存成功",
             type: "success",
           });
-          that.showDialog = false;
-          if (that.listChangeCallback != null) {
-            that.listChangeCallback();
+          this.showDialog = false;
+          if (this.listChangeCallback != null) {
+            this.listChangeCallback();
           }
         }else {
-          that.$message({
+          this.$message({
             showClose: true,
             message: res.data.msg,
             type: "error",
           });
         }
-      }).catch(function (error) {
+      }).catch((error)=> {
         console.log(error);
       });
     },
@@ -328,7 +327,7 @@ export default {
       var result = false;
       var that = this;
       await that.$axios({
-                method: 'post',
+                method: 'get',
                 url:`/api/platform/exit/${deviceGbId}`})
         .then(function (res) {
             if (res.data.code === 0) {

web_src/src/components/dialog/pushStreamEdit.vue

@@ -158,7 +158,7 @@ export default {
       var result = false;
       var that = this;
       await that.$axios({
-        method:"post",
+        method:"get",
         url:`/api/platform/exit/${deviceGbId}`
       }).then(function (res) {
         result = res.data;