guzijian / wvp-GB28181-pro · Commits

Commit a39ac45bcc7fbddbb578e0ab39fd109e30d214a4

Authored by 648540858
1 parent cb24ce13

扩展兼容接口，支持HTTPS接口

Inline Side-by-side
Showing 2 changed files with 7 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
  View file @a39ac45
@@ -239,7 +239,7 @@ public class NotifyRequestForCatalogProcessor extends SIPRequestProcessorParent @@ -239,7 +239,7 @@ public class NotifyRequestForCatalogProcessor extends SIPRequestProcessorParent
239 } 239 }
240 240
241 private void executeSave(){ 241 private void executeSave(){
242 - System.out.println("定时存储数据"); 242 + executeSaveForAdd();
243 executeSaveForUpdate(); 243 executeSaveForUpdate();
244 executeSaveForDelete(); 244 executeSaveForDelete();
245 executeSaveForOnline(); 245 executeSaveForOnline();
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
  View file @a39ac45
@@ -120,11 +120,17 @@ public class ApiStreamController { @@ -120,11 +120,17 @@ public class ApiStreamController {
120 result.put("ChannelName", deviceChannel.getName()); 120 result.put("ChannelName", deviceChannel.getName());
121 result.put("ChannelCustomName", ""); 121 result.put("ChannelCustomName", "");
122 result.put("FLV", streamInfo.getFlv().getUrl()); 122 result.put("FLV", streamInfo.getFlv().getUrl());
  123 + result.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
123 result.put("WS_FLV", streamInfo.getWs_flv().getUrl()); 124 result.put("WS_FLV", streamInfo.getWs_flv().getUrl());
  125 + result.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
124 result.put("RTMP", streamInfo.getRtmp().getUrl()); 126 result.put("RTMP", streamInfo.getRtmp().getUrl());
  127 + result.put("RTMPS", streamInfo.getRtmps().getUrl());
125 result.put("HLS", streamInfo.getHls().getUrl()); 128 result.put("HLS", streamInfo.getHls().getUrl());
  129 + result.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
126 result.put("RTSP", streamInfo.getRtsp().getUrl()); 130 result.put("RTSP", streamInfo.getRtsp().getUrl());
  131 + result.put("RTSPS", streamInfo.getRtsps().getUrl());
127 result.put("WEBRTC", streamInfo.getRtc().getUrl()); 132 result.put("WEBRTC", streamInfo.getRtc().getUrl());
  133 + result.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
128 result.put("CDN", ""); 134 result.put("CDN", "");
129 result.put("SnapURL", ""); 135 result.put("SnapURL", "");
130 result.put("Transport", device.getTransport()); 136 result.put("Transport", device.getTransport());