From abd569d79a346d9066c4b239dbc452861b26a6cb Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期二, 08 六月 2021 14:43:03 +0800
Subject: [PATCH] 添加注册失败时回复403避免陷入401循环

---
 src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java |  141 +++++++++++++---------------------------------
 1 files changed, 41 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index 2d0647a..c6b50b0 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,7 +1,9 @@
 package com.genersoft.iot.vmp.conf;
 
+import io.netty.util.internal.StringUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
 
 @Configuration("mediaConfig")
 public class MediaConfig {
@@ -9,40 +11,43 @@
     @Value("${media.ip}")
     private String ip;
 
-    @Value("${media.wanIp}")
-    private String wanIp;
-
-    @Value("${media.hookIp}")
+    @Value("${media.hookIp:${sip.ip}}")
     private String hookIp;
+
+    @Value("${media.sdpIp:${media.ip}}")
+    private String sdpIp;
+
+    @Value("${media.streamIp:${media.ip}}")
+    private String streamIp;
 
     @Value("${media.httpPort}")
     private String httpPort;
 
-    @Value("${media.httpSSlPort}")
+    @Value("${media.httpSSlPort:}")
     private String httpSSlPort;
 
-    @Value("${media.rtmpPort}")
+    @Value("${media.rtmpPort:}")
     private String rtmpPort;
 
-    @Value("${media.rtmpSSlPort}")
+    @Value("${media.rtmpSSlPort:}")
     private String rtmpSSlPort;
 
-    @Value("${media.rtpProxyPort}")
+    @Value("${media.rtpProxyPort:}")
     private String rtpProxyPort;
 
-    @Value("${media.rtspPort}")
+    @Value("${media.rtspPort:}")
     private String rtspPort;
 
-    @Value("${media.rtspSSLPort}")
+    @Value("${media.rtspSSLPort:}")
     private String rtspSSLPort;
 
-    @Value("${media.autoConfig}")
+    @Value("${media.autoConfig:true}")
     private boolean autoConfig;
 
     @Value("${media.secret}")
     private String secret;
 
-    @Value("${media.streamNoneReaderDelayMS}")
+    @Value("${media.streamNoneReaderDelayMS:18000}")
     private String streamNoneReaderDelayMS;
 
     @Value("${media.rtp.enable}")
@@ -58,131 +63,67 @@
         return ip;
     }
 
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public String getWanIp() {
-        return wanIp;
-    }
-
-    public void setWanIp(String wanIp) {
-        this.wanIp = wanIp;
-    }
-
     public String getHookIp() {
         return hookIp;
     }
 
-    public void setHookIp(String hookIp) {
-        this.hookIp = hookIp;
+    public String getSdpIp() {
+        return sdpIp;
+    }
+
+    public String getStreamIp() {
+        return streamIp;
     }
 
     public String getHttpPort() {
         return httpPort;
     }
 
-    public void setHttpPort(String httpPort) {
-        this.httpPort = httpPort;
-    }
-
-    public boolean isAutoConfig() {
-        return autoConfig;
-    }
-
-    public boolean getAutoConfig() {
-        return autoConfig;
-    }
-
-    public void setAutoConfig(boolean autoConfig) {
-        this.autoConfig = autoConfig;
-    }
-
-    public String getSecret() {
-        return secret;
-    }
-
-    public void setSecret(String secret) {
-        this.secret = secret;
-    }
-
-    public String getStreamNoneReaderDelayMS() {
-        return streamNoneReaderDelayMS;
-    }
-
-    public void setStreamNoneReaderDelayMS(String streamNoneReaderDelayMS) {
-        this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
-    }
-
-    public boolean isRtpEnable() {
-        return rtpEnable;
-    }
-
-    public void setRtpEnable(boolean rtpEnable) {
-        this.rtpEnable = rtpEnable;
-    }
-
-    public String getRtpPortRange() {
-        return rtpPortRange;
-    }
-
-    public void setRtpPortRange(String rtpPortRange) {
-        this.rtpPortRange = rtpPortRange;
-    }
-
     public String getHttpSSlPort() {
         return httpSSlPort;
-    }
-
-    public void setHttpSSlPort(String httpSSlPort) {
-        this.httpSSlPort = httpSSlPort;
     }
 
     public String getRtmpPort() {
         return rtmpPort;
     }
 
-    public void setRtmpPort(String rtmpPort) {
-        this.rtmpPort = rtmpPort;
-    }
-
     public String getRtmpSSlPort() {
         return rtmpSSlPort;
-    }
-
-    public void setRtmpSSlPort(String rtmpSSlPort) {
-        this.rtmpSSlPort = rtmpSSlPort;
     }
 
     public String getRtpProxyPort() {
         return rtpProxyPort;
     }
 
-    public void setRtpProxyPort(String rtpProxyPort) {
-        this.rtpProxyPort = rtpProxyPort;
-    }
-
     public String getRtspPort() {
         return rtspPort;
-    }
-
-    public void setRtspPort(String rtspPort) {
-        this.rtspPort = rtspPort;
     }
 
     public String getRtspSSLPort() {
         return rtspSSLPort;
     }
 
-    public void setRtspSSLPort(String rtspSSLPort) {
-        this.rtspSSLPort = rtspSSLPort;
+    public boolean isAutoConfig() {
+        return autoConfig;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public String getStreamNoneReaderDelayMS() {
+        return streamNoneReaderDelayMS;
+    }
+
+    public boolean isRtpEnable() {
+        return rtpEnable;
+    }
+
+    public String getRtpPortRange() {
+        return rtpPortRange;
     }
 
     public int getRecordAssistPort() {
         return recordAssistPort;
-    }
-
-    public void setRecordAssistPort(int recordAssistPort) {
-        this.recordAssistPort = recordAssistPort;
     }
 }

--
Gitblit v1.8.0