guzijian / wvp-GB28181-pro · Commits

Commit 5bf1fe84ec17bd0db3486a099b7c3513a0f5b57d

Authored by 648540858
1 parent 92022f8a

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

Inline Side-by-side
Showing 1 changed file with 1 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
  View file @5bf1fe8
... ... @@ -113,9 +113,6 @@ public class PlayServiceImpl implements IPlayService {
113 113 @Autowired
114 114 private ThreadPoolTaskExecutor taskExecutor;
115 115  
116   - @Value("${server.ssl.enabled}")
117   - private boolean sslEnabled;
118   -
119 116 @Override
120 117 public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId,
121 118 ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
... ... @@ -149,7 +146,7 @@ public class PlayServiceImpl implements IPlayService {
149 146 if (Objects.requireNonNull(wvpResult).getCode() == 0) {
150 147 StreamInfo streamInfoForSuccess = (StreamInfo) wvpResult.getData();
151 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 152 logger.info("[请求截图]: " + fileName);
... ...