Commit 86cd03ce701555483e32bd3f5e21bd2614a859ab
1 parent
d68f9c81
修复rtsp端口配置未从zlm获取的问题
Showing
1 changed file
with
21 additions
and
0 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
| @@ -322,6 +322,27 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR | @@ -322,6 +322,27 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR | ||
| 322 | logger.warn("[未注册的zlm] 拒接接入:来自{}:{}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() ); | 322 | logger.warn("[未注册的zlm] 拒接接入:来自{}:{}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() ); |
| 323 | return; | 323 | return; |
| 324 | } | 324 | } |
| 325 | + if (serverItem.getHttpPort() == 0) { | ||
| 326 | + serverItem.setHttpPort(zlmServerConfig.getHttpPort()); | ||
| 327 | + } | ||
| 328 | + if (serverItem.getHttpSSlPort() == 0) { | ||
| 329 | + serverItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport()); | ||
| 330 | + } | ||
| 331 | + if (serverItem.getRtmpPort() == 0) { | ||
| 332 | + serverItem.setRtmpPort(zlmServerConfig.getRtmpPort()); | ||
| 333 | + } | ||
| 334 | + if (serverItem.getRtmpSSlPort() == 0) { | ||
| 335 | + serverItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort()); | ||
| 336 | + } | ||
| 337 | + if (serverItem.getRtspPort() == 0) { | ||
| 338 | + serverItem.setRtspPort(zlmServerConfig.getRtspPort()); | ||
| 339 | + } | ||
| 340 | + if (serverItem.getRtspSSLPort() == 0) { | ||
| 341 | + serverItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport()); | ||
| 342 | + } | ||
| 343 | + if (serverItem.getRtpProxyPort() == 0) { | ||
| 344 | + serverItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort()); | ||
| 345 | + } | ||
| 325 | if (StringUtils.isEmpty(serverItem.getId())) { | 346 | if (StringUtils.isEmpty(serverItem.getId())) { |
| 326 | serverItem.setId(zlmServerConfig.getGeneralMediaServerId()); | 347 | serverItem.setId(zlmServerConfig.getGeneralMediaServerId()); |
| 327 | mediaServerMapper.updateByHostAndPort(serverItem); | 348 | mediaServerMapper.updateByHostAndPort(serverItem); |