XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/master-通道结构重构

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
This commit is contained in:
648540858
2024-09-18 09:10:12 +08:00
parent 80912d8a2c 3e1f31dab4
commit 550b90b157
10 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
View File

@@ -233,6 +233,12 @@ public class ZLMMediaServerStatusManger {
if (mediaServerItem.getRtpProxyPort() == 0) {
mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
}
if (mediaServerItem.getFlvSSLPort() == 0) {
mediaServerItem.setFlvSSLPort(zlmServerConfig.getHttpSSLport());
}
if (mediaServerItem.getWsFlvSSLPort() == 0) {
mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport());
}
mediaServerItem.setHookAliveInterval(10F);
}