From 1b677c6dc79b8e3b650acd94da7fc770c3d2718d Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 04 六月 2021 16:31:45 +0800
Subject: [PATCH] 增加zlm代理的secret自动添加， 增加配置文件的默认值，缺少非关键参数不会无法启动，简化配置文件给新手带来的压力，前端使用wvp代理流。
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
index b20437b..10b368c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
@@ -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 @@
@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 @@
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 @@
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 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;
+ }
}
--
Gitblit v1.8.0