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

648540858

2021-10-27 e259be9268db90b4e73a325abea24ad59ff0e4e3

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 @@
                    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/package-lock.json

Diff too large

 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;