diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java index 90a58936..7a506282 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java @@ -239,7 +239,7 @@ public class NotifyRequestForCatalogProcessor extends SIPRequestProcessorParent } private void executeSave(){ - System.out.println("定时存储数据"); + executeSaveForAdd(); executeSaveForUpdate(); executeSaveForDelete(); executeSaveForOnline(); diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java index 72a1b5da..8a1d079d 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java @@ -120,11 +120,17 @@ public class ApiStreamController { result.put("ChannelName", deviceChannel.getName()); result.put("ChannelCustomName", ""); result.put("FLV", streamInfo.getFlv().getUrl()); + result.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl()); result.put("WS_FLV", streamInfo.getWs_flv().getUrl()); + result.put("WSS_FLV", streamInfo.getWss_flv().getUrl()); result.put("RTMP", streamInfo.getRtmp().getUrl()); + result.put("RTMPS", streamInfo.getRtmps().getUrl()); result.put("HLS", streamInfo.getHls().getUrl()); + result.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl()); result.put("RTSP", streamInfo.getRtsp().getUrl()); + result.put("RTSPS", streamInfo.getRtsps().getUrl()); result.put("WEBRTC", streamInfo.getRtc().getUrl()); + result.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl()); result.put("CDN", ""); result.put("SnapURL", ""); result.put("Transport", device.getTransport());