增加zlm代理的secret自动添加, 增加配置文件的默认值,缺少非关键参数不会无法启动,简化配置文件给新手带来的压力,前端使用wvp代理流。
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.genersoft.iot.vmp.media.zlm;
|
||||
|
||||
import com.alibaba.fastjson.annotation.JSONField;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
public class ZLMServerConfig {
|
||||
|
||||
@@ -34,9 +35,9 @@ public class ZLMServerConfig {
|
||||
@JSONField(name = "general.streamNoneReaderDelayMS")
|
||||
private String generalStreamNoneReaderDelayMS;
|
||||
|
||||
private String localIP;
|
||||
private String ip;
|
||||
|
||||
private String wanIp;
|
||||
private String sdpIp;
|
||||
|
||||
private long updateTime;
|
||||
|
||||
@@ -281,12 +282,12 @@ public class ZLMServerConfig {
|
||||
this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
|
||||
}
|
||||
|
||||
public String getLocalIP() {
|
||||
return localIP;
|
||||
public String getIp() {
|
||||
return ip;
|
||||
}
|
||||
|
||||
public void setLocalIP(String localIP) {
|
||||
this.localIP = localIP;
|
||||
public void setIp(String ip) {
|
||||
this.ip = ip;
|
||||
}
|
||||
|
||||
public String getHlsFileBufSize() {
|
||||
@@ -729,14 +730,6 @@ public class ZLMServerConfig {
|
||||
this.shellPhell = shellPhell;
|
||||
}
|
||||
|
||||
public String getWanIp() {
|
||||
return wanIp;
|
||||
}
|
||||
|
||||
public void setWanIp(String wanIp) {
|
||||
this.wanIp = wanIp;
|
||||
}
|
||||
|
||||
public long getUpdateTime() {
|
||||
return updateTime;
|
||||
}
|
||||
@@ -760,4 +753,16 @@ public class ZLMServerConfig {
|
||||
public void setRtmpSslPort(String rtmpSslPort) {
|
||||
this.rtmpSslPort = rtmpSslPort;
|
||||
}
|
||||
|
||||
public String getSdpIp() {
|
||||
if (StringUtils.isEmpty(sdpIp)) {
|
||||
return ip;
|
||||
}else {
|
||||
return sdpIp;
|
||||
}
|
||||
}
|
||||
|
||||
public void setSdpIp(String sdpIp) {
|
||||
this.sdpIp = sdpIp;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,8 @@ public class ZLMServerManger {
|
||||
|
||||
public void updateServerCatch(ZLMServerConfig zlmServerConfig) {
|
||||
|
||||
zlmServerConfig.setLocalIP(mediaConfig.getIp());
|
||||
zlmServerConfig.setWanIp(StringUtils.isEmpty(mediaConfig.getWanIp())? mediaConfig.getIp(): mediaConfig.getWanIp());
|
||||
zlmServerConfig.setIp(mediaConfig.getIp());
|
||||
zlmServerConfig.setSdpIp(mediaConfig.getSdpIp());
|
||||
zlmServerConfig.setHttpPort(mediaConfig.getHttpPort());
|
||||
|
||||
if(!StringUtils.isEmpty(mediaConfig.getHttpSSlPort()))
|
||||
|
||||
Reference in New Issue
Block a user