Commit 5bf1fe84ec17bd0db3486a099b7c3513a0f5b57d
1 parent
92022f8a
还原#640点播开始后的截图任务，判断启用https后使用https_fmp4流地址
Showing
1 changed file
with
1 additions
and
4 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
| @@ -113,9 +113,6 @@ public class PlayServiceImpl implements IPlayService { | @@ -113,9 +113,6 @@ public class PlayServiceImpl implements IPlayService { | ||
| 113 | @Autowired | 113 | @Autowired |
| 114 | private ThreadPoolTaskExecutor taskExecutor; | 114 | private ThreadPoolTaskExecutor taskExecutor; |
| 115 | 115 | ||
| 116 | - @Value("${server.ssl.enabled}") | ||
| 117 | - private boolean sslEnabled; | ||
| 118 | - | ||
| 119 | @Override | 116 | @Override |
| 120 | public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId, | 117 | public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId, |
| 121 | ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent, | 118 | ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent, |
| @@ -149,7 +146,7 @@ public class PlayServiceImpl implements IPlayService { | @@ -149,7 +146,7 @@ public class PlayServiceImpl implements IPlayService { | ||
| 149 | if (Objects.requireNonNull(wvpResult).getCode() == 0) { | 146 | if (Objects.requireNonNull(wvpResult).getCode() == 0) { |
| 150 | StreamInfo streamInfoForSuccess = (StreamInfo) wvpResult.getData(); | 147 | StreamInfo streamInfoForSuccess = (StreamInfo) wvpResult.getData(); |
| 151 | MediaServerItem mediaInfo = mediaServerService.getOne(streamInfoForSuccess.getMediaServerId()); | 148 | MediaServerItem mediaInfo = mediaServerService.getOne(streamInfoForSuccess.getMediaServerId()); |
| 152 | - String streamUrl = sslEnabled ? streamInfoForSuccess.getHttps_fmp4() : streamInfoForSuccess.getFmp4(); | 149 | + String streamUrl = streamInfoForSuccess.getFmp4(); |
| 153 | 150 | ||
| 154 | // 请求截图 | 151 | // 请求截图 |
| 155 | logger.info("[请求截图]: " + fileName); | 152 | logger.info("[请求截图]: " + fileName); |