Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
648540858 2021-10-27 16:48:51 +08:00
commit 46b1885cbd
3 changed files with 13 additions and 14458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
String mediaServerId = gbStream.getMediaServerId(); String mediaServerId = gbStream.getMediaServerId();
mediaServerItem = mediaServerService.getOne(mediaServerId); mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem == null) { 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"); responseAck(evt, Response.GONE, "media server not found");
return; return;
} }

14467
web_src/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
web_src/src/components/PushVideoList.vue
View File

@ -154,7 +154,7 @@
console.log(row) console.log(row)
}, },
addToGB: function(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){ removeFromGB: function(row){
var that = this; var that = this;