From e48ef997c03b49c8090970f5fbb29ce80b0ac6df Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期三, 14 七月 2021 15:57:39 +0800
Subject: [PATCH] 更换播放器， 修正和优化sql脚本，

---
 src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java |  151 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 117 insertions(+), 34 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 c6b50b0..52292a5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,6 +1,5 @@
 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;
@@ -11,119 +10,203 @@
     @Value("${media.ip}")
     private String ip;
 
-    @Value("${media.hookIp:${sip.ip}}")
+    @Value("${media.hook-ip:${sip.ip}}")
     private String hookIp;
 
-    @Value("${media.sdpIp:${media.ip}}")
+    @Value("${sip.ip}")
+    private String sipIp;
+
+    @Value("${media.sdp-ip:${media.ip}}")
     private String sdpIp;
 
-    @Value("${media.streamIp:${media.ip}}")
+    @Value("${media.stream-ip:${media.ip}}")
     private String streamIp;
 
-    @Value("${media.httpPort}")
-    private String httpPort;
+    @Value("${media.http-port}")
+    private Integer httpPort;
 
-    @Value("${media.httpSSlPort:}")
-    private String httpSSlPort;
+    @Value("${media.http-ssl-port:}")
+    private Integer httpSSlPort;
 
-    @Value("${media.rtmpPort:}")
-    private String rtmpPort;
+    @Value("${media.rtmp-port:}")
+    private Integer rtmpPort;
 
-    @Value("${media.rtmpSSlPort:}")
-    private String rtmpSSlPort;
+    @Value("${media.rtmp-ssl-port:}")
+    private Integer rtmpSSlPort;
 
-    @Value("${media.rtpProxyPort:}")
-    private String rtpProxyPort;
+    @Value("${media.rtp-proxy-port:}")
+    private Integer rtpProxyPort;
 
-    @Value("${media.rtspPort:}")
-    private String rtspPort;
+    @Value("${media.rtsp-port:}")
+    private Integer rtspPort;
 
-    @Value("${media.rtspSSLPort:}")
-    private String rtspSSLPort;
+    @Value("${media.rtsp-ssl-port:}")
+    private Integer rtspSSLPort;
 
-    @Value("${media.autoConfig:true}")
+    @Value("${media.auto-config:true}")
     private boolean autoConfig;
 
     @Value("${media.secret}")
     private String secret;
 
-    @Value("${media.streamNoneReaderDelayMS:18000}")
+    @Value("${media.stream-none-reader-delay-ms:18000}")
     private String streamNoneReaderDelayMS;
 
     @Value("${media.rtp.enable}")
     private boolean rtpEnable;
 
-    @Value("${media.rtp.portRange}")
+    @Value("${media.rtp.port-range}")
     private String rtpPortRange;
 
-    @Value("${media.recordAssistPort}")
-    private int recordAssistPort;
+    @Value("${media.record-assist-port:0}")
+    private Integer recordAssistPort;
 
     public String getIp() {
         return ip;
     }
 
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
     public String getHookIp() {
-        return hookIp;
+        if (StringUtils.isEmpty(hookIp)){
+            return sipIp;
+        }else {
+            return hookIp;
+        }
+
+    }
+
+    public void setHookIp(String hookIp) {
+        this.hookIp = hookIp;
     }
 
     public String getSdpIp() {
-        return sdpIp;
+        if (StringUtils.isEmpty(sdpIp)){
+            return ip;
+        }else {
+            return sdpIp;
+        }
+    }
+
+    public void setSdpIp(String sdpIp) {
+        this.sdpIp = sdpIp;
     }
 
     public String getStreamIp() {
-        return streamIp;
+        if (StringUtils.isEmpty(streamIp)){
+            return ip;
+        }else {
+            return streamIp;
+        }
     }
 
-    public String getHttpPort() {
+    public void setStreamIp(String streamIp) {
+        this.streamIp = streamIp;
+    }
+
+    public Integer getHttpPort() {
         return httpPort;
     }
 
-    public String getHttpSSlPort() {
+    public void setHttpPort(Integer httpPort) {
+        this.httpPort = httpPort;
+    }
+
+    public Integer getHttpSSlPort() {
         return httpSSlPort;
     }
 
-    public String getRtmpPort() {
+    public void setHttpSSlPort(Integer httpSSlPort) {
+        this.httpSSlPort = httpSSlPort;
+    }
+
+    public Integer getRtmpPort() {
         return rtmpPort;
     }
 
-    public String getRtmpSSlPort() {
+    public void setRtmpPort(Integer rtmpPort) {
+        this.rtmpPort = rtmpPort;
+    }
+
+    public Integer getRtmpSSlPort() {
         return rtmpSSlPort;
     }
 
-    public String getRtpProxyPort() {
+    public void setRtmpSSlPort(Integer rtmpSSlPort) {
+        this.rtmpSSlPort = rtmpSSlPort;
+    }
+
+    public Integer getRtpProxyPort() {
         return rtpProxyPort;
     }
 
-    public String getRtspPort() {
+    public void setRtpProxyPort(Integer rtpProxyPort) {
+        this.rtpProxyPort = rtpProxyPort;
+    }
+
+    public Integer getRtspPort() {
         return rtspPort;
     }
 
-    public String getRtspSSLPort() {
+    public void setRtspPort(Integer rtspPort) {
+        this.rtspPort = rtspPort;
+    }
+
+    public Integer getRtspSSLPort() {
         return rtspSSLPort;
+    }
+
+    public void setRtspSSLPort(Integer rtspSSLPort) {
+        this.rtspSSLPort = rtspSSLPort;
     }
 
     public boolean isAutoConfig() {
         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 int getRecordAssistPort() {
+    public void setRtpPortRange(String rtpPortRange) {
+        this.rtpPortRange = rtpPortRange;
+    }
+
+    public Integer getRecordAssistPort() {
         return recordAssistPort;
     }
+
+    public void setRecordAssistPort(Integer recordAssistPort) {
+        this.recordAssistPort = recordAssistPort;
+    }
 }

--
Gitblit v1.8.0