From cf8a22f50b81fa30abaa518bdce660cd65deabea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 15 一月 2021 15:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
index 8c101b4..76390e4 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
@@ -31,8 +31,9 @@
@JSONField(name = "general.streamNoneReaderDelayMS")
private String generalStreamNoneReaderDelayMS;
- @JSONField(name = "general.localIP")
private String localIP;
+
+ private String wanIp;
@JSONField(name = "hls.fileBufSize")
private String hlsFileBufSize;
@@ -719,4 +720,12 @@
public void setShellPhell(String shellPhell) {
this.shellPhell = shellPhell;
}
+
+ public String getWanIp() {
+ return wanIp;
+ }
+
+ public void setWanIp(String wanIp) {
+ this.wanIp = wanIp;
+ }
}
--
Gitblit v1.8.0