浏览代码

还原#640点播开始后的截图任务,判断启用https后使用https_fmp4流地址

648540858 3 年之前
父节点
当前提交
5bf1fe84ec
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1 4
      src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

+ 1 - 4
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -113,9 +113,6 @@ public class PlayServiceImpl implements IPlayService {
     @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 @@ public class PlayServiceImpl implements IPlayService {
                 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);