From a59095db0c240987028d4d05ab561665ed8fe7ea Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期五, 29 七月 2022 15:16:39 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java |   89 ++++++++++++++++++++++++++++++--------------
 1 files changed, 61 insertions(+), 28 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 5196f4c..db4ab76 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,7 +1,6 @@
 package com.genersoft.iot.vmp.media.zlm;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import org.springframework.util.StringUtils;
 
 public class ZLMServerConfig {
 
@@ -33,13 +32,16 @@
     private String generalMaxStreamWaitMS;
 
     @JSONField(name = "general.streamNoneReaderDelayMS")
-    private String generalStreamNoneReaderDelayMS;
+    private int generalStreamNoneReaderDelayMS;
 
+    @JSONField(name = "ip")
     private String ip;
 
     private String sdpIp;
 
     private String streamIp;
+
+    private String hookIp;
 
     private String updateTime;
 
@@ -63,11 +65,14 @@
     @JSONField(name = "hook.admin_params")
     private String hookAdminParams;
 
+    @JSONField(name = "hook.alive_interval")
+    private int hookAliveInterval;
+
     @JSONField(name = "hook.enable")
     private String hookEnable;
 
     @JSONField(name = "hook.on_flow_report")
-    private Integer hookOnFlowReport;
+    private String hookOnFlowReport;
 
     @JSONField(name = "hook.on_http_access")
     private String hookOnHttpAccess;
@@ -118,7 +123,7 @@
     private String httpNotFound;
 
     @JSONField(name = "http.port")
-    private Integer httpPort;
+    private int httpPort;
 
     @JSONField(name = "http.rootPath")
     private String httpRootPath;
@@ -127,7 +132,7 @@
     private String httpSendBufSize;
 
     @JSONField(name = "http.sslport")
-    private Integer httpSSLport;
+    private int httpSSLport;
 
     @JSONField(name = "multicast.addrMax")
     private String multicastAddrMax;
@@ -160,10 +165,10 @@
     private String rtmpModifyStamp;
 
     @JSONField(name = "rtmp.port")
-    private Integer rtmpPort;
+    private int rtmpPort;
 
     @JSONField(name = "rtmp.sslport")
-    private Integer rtmpSslPort;
+    private int rtmpSslPort;
 
     @JSONField(name = "rtp.audioMtuSize")
     private String rtpAudioMtuSize;
@@ -187,7 +192,10 @@
     private String rtpProxyDumpDir;
 
     @JSONField(name = "rtp_proxy.port")
-    private Integer rtpProxyPort;
+    private int rtpProxyPort;
+
+    @JSONField(name = "rtp_proxy.port_range")
+    private String portRange;
 
     @JSONField(name = "rtp_proxy.timeoutSec")
     private String rtpProxyTimeoutSec;
@@ -202,16 +210,25 @@
     private String rtspKeepAliveSecond;
 
     @JSONField(name = "rtsp.port")
-    private Integer rtspPort;
+    private int rtspPort;
 
     @JSONField(name = "rtsp.sslport")
-    private Integer rtspSSlport;
+    private int rtspSSlport;
 
     @JSONField(name = "shell.maxReqSize")
     private String shellMaxReqSize;
 
     @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;
@@ -285,11 +302,11 @@
         this.generalMaxStreamWaitMS = generalMaxStreamWaitMS;
     }
 
-    public String getGeneralStreamNoneReaderDelayMS() {
+    public int getGeneralStreamNoneReaderDelayMS() {
         return generalStreamNoneReaderDelayMS;
     }
 
-    public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
+    public void setGeneralStreamNoneReaderDelayMS(int generalStreamNoneReaderDelayMS) {
         this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
     }
 
@@ -389,11 +406,11 @@
         this.hookEnable = hookEnable;
     }
 
-    public Integer getHookOnFlowReport() {
+    public String getHookOnFlowReport() {
         return hookOnFlowReport;
     }
 
-    public void setHookOnFlowReport(Integer hookOnFlowReport) {
+    public void setHookOnFlowReport(String hookOnFlowReport) {
         this.hookOnFlowReport = hookOnFlowReport;
     }
 
@@ -525,11 +542,11 @@
         this.httpNotFound = httpNotFound;
     }
 
-    public Integer getHttpPort() {
+    public int getHttpPort() {
         return httpPort;
     }
 
-    public void setHttpPort(Integer httpPort) {
+    public void setHttpPort(int httpPort) {
         this.httpPort = httpPort;
     }
 
@@ -549,11 +566,11 @@
         this.httpSendBufSize = httpSendBufSize;
     }
 
-    public Integer getHttpSSLport() {
+    public int getHttpSSLport() {
         return httpSSLport;
     }
 
-    public void setHttpSSLport(Integer httpSSLport) {
+    public void setHttpSSLport(int httpSSLport) {
         this.httpSSLport = httpSSLport;
     }
 
@@ -637,19 +654,19 @@
         this.rtmpModifyStamp = rtmpModifyStamp;
     }
 
-    public Integer getRtmpPort() {
+    public int getRtmpPort() {
         return rtmpPort;
     }
 
-    public void setRtmpPort(Integer rtmpPort) {
+    public void setRtmpPort(int rtmpPort) {
         this.rtmpPort = rtmpPort;
     }
 
-    public Integer getRtmpSslPort() {
+    public int getRtmpSslPort() {
         return rtmpSslPort;
     }
 
-    public void setRtmpSslPort(Integer rtmpSslPort) {
+    public void setRtmpSslPort(int rtmpSslPort) {
         this.rtmpSslPort = rtmpSslPort;
     }
 
@@ -709,11 +726,11 @@
         this.rtpProxyDumpDir = rtpProxyDumpDir;
     }
 
-    public Integer getRtpProxyPort() {
+    public int getRtpProxyPort() {
         return rtpProxyPort;
     }
 
-    public void setRtpProxyPort(Integer rtpProxyPort) {
+    public void setRtpProxyPort(int rtpProxyPort) {
         this.rtpProxyPort = rtpProxyPort;
     }
 
@@ -749,19 +766,19 @@
         this.rtspKeepAliveSecond = rtspKeepAliveSecond;
     }
 
-    public Integer getRtspPort() {
+    public int getRtspPort() {
         return rtspPort;
     }
 
-    public void setRtspPort(Integer rtspPort) {
+    public void setRtspPort(int rtspPort) {
         this.rtspPort = rtspPort;
     }
 
-    public Integer getRtspSSlport() {
+    public int getRtspSSlport() {
         return rtspSSlport;
     }
 
-    public void setRtspSSlport(Integer rtspSSlport) {
+    public void setRtspSSlport(int rtspSSlport) {
         this.rtspSSlport = rtspSSlport;
     }
 
@@ -780,4 +797,20 @@
     public void setShellPhell(String shellPhell) {
         this.shellPhell = shellPhell;
     }
+
+    public int getHookAliveInterval() {
+        return hookAliveInterval;
+    }
+
+    public void setHookAliveInterval(int hookAliveInterval) {
+        this.hookAliveInterval = hookAliveInterval;
+    }
+
+    public String getPortRange() {
+        return portRange;
+    }
+
+    public void setPortRange(String portRange) {
+        this.portRange = portRange;
+    }
 }

--
Gitblit v1.8.0