From bf8fb0c51f4e7894a62636dede6c69a2a85d8458 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 27 四月 2021 15:35:22 +0800
Subject: [PATCH] 添加级联平台自动注册时失败自动重新注册

---
 src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java |   88 +++++++++++++++++++++++++++++--------------
 1 files changed, 59 insertions(+), 29 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 738dd3a..e9d158c 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
@@ -22,6 +22,9 @@
     @JSONField(name = "general.enableVhost")
     private String generalEnableVhost;
 
+    @JSONField(name = "general.mediaServerId")
+    private String generalMediaServerId;
+
     @JSONField(name = "general.flowThreshold")
     private String generalFlowThreshold;
 
@@ -31,8 +34,11 @@
     @JSONField(name = "general.streamNoneReaderDelayMS")
     private String generalStreamNoneReaderDelayMS;
 
-    @JSONField(name = "general.localIP")
     private String localIP;
+
+    private String wanIp;
+
+    private long updateTime;
 
     @JSONField(name = "hls.fileBufSize")
     private String hlsFileBufSize;
@@ -270,6 +276,14 @@
 
     public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
         this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
+    }
+
+    public String getLocalIP() {
+        return localIP;
+    }
+
+    public void setLocalIP(String localIP) {
+        this.localIP = localIP;
     }
 
     public String getHlsFileBufSize() {
@@ -624,6 +638,38 @@
         this.rtpVideoMtuSize = rtpVideoMtuSize;
     }
 
+    public String getRtpProxyCheckSource() {
+        return rtpProxyCheckSource;
+    }
+
+    public void setRtpProxyCheckSource(String rtpProxyCheckSource) {
+        this.rtpProxyCheckSource = rtpProxyCheckSource;
+    }
+
+    public String getRtpProxyDumpDir() {
+        return rtpProxyDumpDir;
+    }
+
+    public void setRtpProxyDumpDir(String rtpProxyDumpDir) {
+        this.rtpProxyDumpDir = rtpProxyDumpDir;
+    }
+
+    public String getRtpProxyPort() {
+        return rtpProxyPort;
+    }
+
+    public void setRtpProxyPort(String rtpProxyPort) {
+        this.rtpProxyPort = rtpProxyPort;
+    }
+
+    public String getRtpProxyTimeoutSec() {
+        return rtpProxyTimeoutSec;
+    }
+
+    public void setRtpProxyTimeoutSec(String rtpProxyTimeoutSec) {
+        this.rtpProxyTimeoutSec = rtpProxyTimeoutSec;
+    }
+
     public String getRtspAuthBasic() {
         return rtspAuthBasic;
     }
@@ -680,43 +726,27 @@
         this.shellPhell = shellPhell;
     }
 
-    public String getLocalIP() {
-        return localIP;
+    public String getWanIp() {
+        return wanIp;
     }
 
-    public void setLocalIP(String localIP) {
-        this.localIP = localIP;
+    public void setWanIp(String wanIp) {
+        this.wanIp = wanIp;
     }
 
-    public String getRtpProxyCheckSource() {
-        return rtpProxyCheckSource;
+    public long getUpdateTime() {
+        return updateTime;
     }
 
-    public void setRtpProxyCheckSource(String rtpProxyCheckSource) {
-        this.rtpProxyCheckSource = rtpProxyCheckSource;
+    public void setUpdateTime(long updateTime) {
+        this.updateTime = updateTime;
     }
 
-    public String getRtpProxyDumpDir() {
-        return rtpProxyDumpDir;
+    public String getGeneralMediaServerId() {
+        return generalMediaServerId;
     }
 
-    public void setRtpProxyDumpDir(String rtpProxyDumpDir) {
-        this.rtpProxyDumpDir = rtpProxyDumpDir;
-    }
-
-    public String getRtpProxyPort() {
-        return rtpProxyPort;
-    }
-
-    public void setRtpProxyPort(String rtpProxyPort) {
-        this.rtpProxyPort = rtpProxyPort;
-    }
-
-    public String getRtpProxyTimeoutSec() {
-        return rtpProxyTimeoutSec;
-    }
-
-    public void setRtpProxyTimeoutSec(String rtpProxyTimeoutSec) {
-        this.rtpProxyTimeoutSec = rtpProxyTimeoutSec;
+    public void setGeneralMediaServerId(String generalMediaServerId) {
+        this.generalMediaServerId = generalMediaServerId;
     }
 }

--
Gitblit v1.8.0