Merge branch 'wvp-28181-2.0' into 结构优化

src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java

@@ -84,7 +84,7 @@ public class MediaConfig{
     @Value("${media.record-day:7}")
     private Integer recordDay;
 
-    @Value("${media.record-path}")
+    @Value("${media.record-path:}")
     private String recordPath;
 
     public String getId() {

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

@@ -678,13 +678,10 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
             dynamicTask.startDelay(callIdHeader.getCallId(), () -> {
                 logger.info("[ app={}, stream={} ] 等待设备开始推流超时", gbStream.getApp(), gbStream.getStream());
                 try {
+                    redisPushStreamResponseListener.removeEvent(gbStream.getApp(), gbStream.getStream());
                     mediaListManager.removedChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream());
                     responseAck(request, Response.REQUEST_TIMEOUT); // 超时
-                } catch (SipException e) {
-                    logger.error("未处理的异常 ", e);
-                } catch (InvalidArgumentException e) {
-                    logger.error("未处理的异常 ", e);
-                } catch (ParseException e) {
+                } catch (SipException | InvalidArgumentException | ParseException e) {
                     logger.error("未处理的异常 ", e);
                 }
             }, userSetting.getPlatformPlayTimeout());
@@ -695,6 +692,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
             // 添加在本机上线的通知
             mediaListManager.addChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream(), (app, stream, serverId) -> {
                 dynamicTask.stop(callIdHeader.getCallId());
+                redisPushStreamResponseListener.removeEvent(gbStream.getApp(), gbStream.getStream());
                 if (serverId.equals(userSetting.getServerId())) {
                     SendRtpItem sendRtpItem = zlmServerFactory.createSendRtpItem(mediaServerItem, addressStr, finalPort, ssrc, requesterId,
                             app, stream, channelId, mediaTransmissionTCP, platform.isRtcp());

src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -594,7 +594,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
             param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
         }
 
-        if (mediaServerItem.getRecordPath() != null) {
+        if (!ObjectUtils.isEmpty(mediaServerItem.getRecordPath())) {
             File recordPathFile = new File(mediaServerItem.getRecordPath());
             param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath());
             param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath());

src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java

@@ -145,7 +145,7 @@ public class PlatformServiceImpl implements IPlatformService {
         dynamicTask.stop(registerTaskKey);
         // 注销旧的
         try {
-            if (parentPlatformOld.isStatus()) {
+            if (parentPlatformOld.isStatus() && parentPlatformCatchOld != null) {
                 logger.info("保存平台{}时发现旧平台在线，发送注销命令", parentPlatformOld.getServerGBId());
                 commanderForPlatform.unregister(parentPlatformOld, parentPlatformCatchOld.getSipTransactionInfo(), null, eventResult -> {
                     logger.info("[国标级联] 注销成功， 平台：{}", parentPlatformOld.getServerGBId());

web_src/src/components/common/jessibuca.vue

@@ -1,6 +1,6 @@
 <template>
   <div ref="container" @dblclick="fullscreenSwich"
-       style="width:100%;height:100%;background-color: #000000;margin:0 auto;position: relative;">
+       style="width:100%;height:100%;min-height: 200px;background-color: #000000;margin:0 auto;position: relative;">
     <div class="buttons-box" id="buttonsBox">
       <div class="buttons-box-left">
         <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
@@ -80,9 +80,10 @@ export default {
         height = clientHeight
         width = (16 / 9) * height
       }
-
-      dom.style.width = width + 'px';
-      dom.style.height = height + "px";
+      if (width > 0 && height > 0) {
+        dom.style.width = width + 'px';
+        dom.style.height = height + "px";
+      }
     },
     create() {
       let options = {