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

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java

@@ -104,7 +104,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
 					String mediaServerId = gbStream.getMediaServerId();
 					mediaServerItem = mediaServerService.getOne(mediaServerId);
 					if (mediaServerItem == null) {
-						logger.info("[ app={}, stream={} ]zlm找不到，返回410",gbStream.getApp(), gbStream.getStream());
+						logger.info("[ app={}, stream={} ]找不到zlm {}，返回410",gbStream.getApp(), gbStream.getStream(), mediaServerId);
 						responseAck(evt, Response.GONE, "media server not found");
 						return;
 					}

web_src/src/components/PushVideoList.vue

@@ -154,7 +154,7 @@
 				console.log(row)
 			},
 			addToGB: function(row){
-				this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream}, this.initData);
+				this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
 			},
 			removeFromGB: function(row){
 				var that = this;