From 5bf1fe84ec17bd0db3486a099b7c3513a0f5b57d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 十月 2022 22:25:46 +0800
Subject: [PATCH] 还原#640点播开始后的截图任务，判断启用https后使用https_fmp4流地址
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 1c8689b..c57ee17 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -113,9 +113,6 @@
@Autowired
private ThreadPoolTaskExecutor taskExecutor;
- @Value("${server.ssl.enabled}")
- private boolean sslEnabled;
-
@Override
public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId,
ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
@@ -149,7 +146,7 @@
if (Objects.requireNonNull(wvpResult).getCode() == 0) {
StreamInfo streamInfoForSuccess = (StreamInfo) wvpResult.getData();
MediaServerItem mediaInfo = mediaServerService.getOne(streamInfoForSuccess.getMediaServerId());
- String streamUrl = sslEnabled ? streamInfoForSuccess.getHttps_fmp4() : streamInfoForSuccess.getFmp4();
+ String streamUrl = streamInfoForSuccess.getFmp4();
// 璇锋眰鎴浘
logger.info("[璇锋眰鎴浘]: " + fileName);
--
Gitblit v1.8.0