From 2f108a46d05e34981d52b447d73f0cfd8e8c30fd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 16:24:31 +0800
Subject: [PATCH] Merge pull request #232 from chenparty/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java |  147 +++++++++++++++++++++++++++++-------------------
 1 files changed, 89 insertions(+), 58 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..c1a9bd2 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
@@ -34,11 +34,18 @@
     @JSONField(name = "general.streamNoneReaderDelayMS")
     private String generalStreamNoneReaderDelayMS;
 
-    private String localIP;
+    @JSONField(name = "ip")
+    private String ip;
 
-    private String wanIp;
+    private String sdpIp;
 
-    private long updateTime;
+    private String streamIp;
+
+    private String hookIp;
+
+    private String updateTime;
+
+    private String createTime;
 
     @JSONField(name = "hls.fileBufSize")
     private String hlsFileBufSize;
@@ -113,7 +120,7 @@
     private String httpNotFound;
 
     @JSONField(name = "http.port")
-    private String httpPort;
+    private int httpPort;
 
     @JSONField(name = "http.rootPath")
     private String httpRootPath;
@@ -122,7 +129,7 @@
     private String httpSendBufSize;
 
     @JSONField(name = "http.sslport")
-    private String httpSSLport;
+    private int httpSSLport;
 
     @JSONField(name = "multicast.addrMax")
     private String multicastAddrMax;
@@ -155,10 +162,10 @@
     private String rtmpModifyStamp;
 
     @JSONField(name = "rtmp.port")
-    private String rtmpPort;
+    private int rtmpPort;
 
     @JSONField(name = "rtmp.sslport")
-    private String rtmpSslPort;
+    private int rtmpSslPort;
 
     @JSONField(name = "rtp.audioMtuSize")
     private String rtpAudioMtuSize;
@@ -182,7 +189,7 @@
     private String rtpProxyDumpDir;
 
     @JSONField(name = "rtp_proxy.port")
-    private String rtpProxyPort;
+    private int rtpProxyPort;
 
     @JSONField(name = "rtp_proxy.timeoutSec")
     private String rtpProxyTimeoutSec;
@@ -197,10 +204,10 @@
     private String rtspKeepAliveSecond;
 
     @JSONField(name = "rtsp.port")
-    private String rtspPort;
+    private int rtspPort;
 
     @JSONField(name = "rtsp.sslport")
-    private String rtspSSlport;
+    private int rtspSSlport;
 
     @JSONField(name = "shell.maxReqSize")
     private String shellMaxReqSize;
@@ -208,6 +215,14 @@
     @JSONField(name = "shell.shell")
     private String shellPhell;
 
+
+    public String getHookIp() {
+        return hookIp;
+    }
+
+    public void setHookIp(String hookIp) {
+        this.hookIp = hookIp;
+    }
 
     public String getApiDebug() {
         return apiDebug;
@@ -257,6 +272,14 @@
         this.generalEnableVhost = generalEnableVhost;
     }
 
+    public String getGeneralMediaServerId() {
+        return generalMediaServerId;
+    }
+
+    public void setGeneralMediaServerId(String generalMediaServerId) {
+        this.generalMediaServerId = generalMediaServerId;
+    }
+
     public String getGeneralFlowThreshold() {
         return generalFlowThreshold;
     }
@@ -281,12 +304,44 @@
         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 getSdpIp() {
+        return sdpIp;
+    }
+
+    public void setSdpIp(String sdpIp) {
+        this.sdpIp = sdpIp;
+    }
+
+    public String getStreamIp() {
+        return streamIp;
+    }
+
+    public void setStreamIp(String streamIp) {
+        this.streamIp = streamIp;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 
     public String getHlsFileBufSize() {
@@ -481,11 +536,11 @@
         this.httpNotFound = httpNotFound;
     }
 
-    public String getHttpPort() {
+    public int getHttpPort() {
         return httpPort;
     }
 
-    public void setHttpPort(String httpPort) {
+    public void setHttpPort(int httpPort) {
         this.httpPort = httpPort;
     }
 
@@ -505,11 +560,11 @@
         this.httpSendBufSize = httpSendBufSize;
     }
 
-    public String getHttpSSLport() {
+    public int getHttpSSLport() {
         return httpSSLport;
     }
 
-    public void setHttpSSLport(String httpSSLport) {
+    public void setHttpSSLport(int httpSSLport) {
         this.httpSSLport = httpSSLport;
     }
 
@@ -593,12 +648,20 @@
         this.rtmpModifyStamp = rtmpModifyStamp;
     }
 
-    public String getRtmpPort() {
+    public int getRtmpPort() {
         return rtmpPort;
     }
 
-    public void setRtmpPort(String rtmpPort) {
+    public void setRtmpPort(int rtmpPort) {
         this.rtmpPort = rtmpPort;
+    }
+
+    public int getRtmpSslPort() {
+        return rtmpSslPort;
+    }
+
+    public void setRtmpSslPort(int rtmpSslPort) {
+        this.rtmpSslPort = rtmpSslPort;
     }
 
     public String getRtpAudioMtuSize() {
@@ -657,11 +720,11 @@
         this.rtpProxyDumpDir = rtpProxyDumpDir;
     }
 
-    public String getRtpProxyPort() {
+    public int getRtpProxyPort() {
         return rtpProxyPort;
     }
 
-    public void setRtpProxyPort(String rtpProxyPort) {
+    public void setRtpProxyPort(int rtpProxyPort) {
         this.rtpProxyPort = rtpProxyPort;
     }
 
@@ -697,19 +760,19 @@
         this.rtspKeepAliveSecond = rtspKeepAliveSecond;
     }
 
-    public String getRtspPort() {
+    public int getRtspPort() {
         return rtspPort;
     }
 
-    public void setRtspPort(String rtspPort) {
+    public void setRtspPort(int rtspPort) {
         this.rtspPort = rtspPort;
     }
 
-    public String getRtspSSlport() {
+    public int getRtspSSlport() {
         return rtspSSlport;
     }
 
-    public void setRtspSSlport(String rtspSSlport) {
+    public void setRtspSSlport(int rtspSSlport) {
         this.rtspSSlport = rtspSSlport;
     }
 
@@ -727,37 +790,5 @@
 
     public void setShellPhell(String shellPhell) {
         this.shellPhell = shellPhell;
-    }
-
-    public String getWanIp() {
-        return wanIp;
-    }
-
-    public void setWanIp(String wanIp) {
-        this.wanIp = wanIp;
-    }
-
-    public long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(long updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getGeneralMediaServerId() {
-        return generalMediaServerId;
-    }
-
-    public void setGeneralMediaServerId(String generalMediaServerId) {
-        this.generalMediaServerId = generalMediaServerId;
-    }
-
-    public String getRtmpSslPort() {
-        return rtmpSslPort;
-    }
-
-    public void setRtmpSslPort(String rtmpSslPort) {
-        this.rtmpSslPort = rtmpSslPort;
     }
 }

--
Gitblit v1.8.0