From b63a89a0a83dfddab0d714bb9aad90114ab9d514 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 18 八月 2023 14:06:39 +0800
Subject: [PATCH] 修复发流参数错误
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
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 5381a3a..90b0c2f 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
@@ -26,7 +26,7 @@
* API鍏煎锛氬疄鏃剁洿鎾�
*/
@SuppressWarnings(value = {"rawtypes", "unchecked"})
-@CrossOrigin
+
@RestController
@RequestMapping(value = "/api/v1/stream")
public class ApiStreamController {
@@ -120,11 +120,34 @@
result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName", "");
result.put("FLV", streamInfo.getFlv().getUrl());
+ if (streamInfo.getHttps_flv() != null) {
+ result.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
+ }
+
result.put("WS_FLV", streamInfo.getWs_flv().getUrl());
+ if (streamInfo.getWss_flv() != null) {
+ result.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
+ }
+
result.put("RTMP", streamInfo.getRtmp().getUrl());
+ if (streamInfo.getRtmps() != null) {
+ result.put("RTMPS", streamInfo.getRtmps().getUrl());
+ }
+
result.put("HLS", streamInfo.getHls().getUrl());
+ if (streamInfo.getHttps_hls() != null) {
+ result.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
+ }
result.put("RTSP", streamInfo.getRtsp().getUrl());
+ if (streamInfo.getRtsps() != null) {
+ result.put("RTSPS", streamInfo.getRtsps().getUrl());
+ }
+
result.put("WEBRTC", streamInfo.getRtc().getUrl());
+ if (streamInfo.getRtcs() != null) {
+ result.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
+ }
+
result.put("CDN", "");
result.put("SnapURL", "");
result.put("Transport", device.getTransport());
--
Gitblit v1.8.0