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 | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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 8ab34bf..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,52 +10,55 @@
@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}")
+ @Value("${media.http-port}")
private Integer httpPort;
- @Value("${media.httpSSlPort:}")
+ @Value("${media.http-ssl-port:}")
private Integer httpSSlPort;
- @Value("${media.rtmpPort:}")
+ @Value("${media.rtmp-port:}")
private Integer rtmpPort;
- @Value("${media.rtmpSSlPort:}")
+ @Value("${media.rtmp-ssl-port:}")
private Integer rtmpSSlPort;
- @Value("${media.rtpProxyPort:}")
+ @Value("${media.rtp-proxy-port:}")
private Integer rtpProxyPort;
- @Value("${media.rtspPort:}")
+ @Value("${media.rtsp-port:}")
private Integer rtspPort;
- @Value("${media.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}")
+ @Value("${media.record-assist-port:0}")
private Integer recordAssistPort;
public String getIp() {
@@ -68,7 +70,12 @@
}
public String getHookIp() {
- return hookIp;
+ if (StringUtils.isEmpty(hookIp)){
+ return sipIp;
+ }else {
+ return hookIp;
+ }
+
}
public void setHookIp(String hookIp) {
@@ -76,7 +83,11 @@
}
public String getSdpIp() {
- return sdpIp;
+ if (StringUtils.isEmpty(sdpIp)){
+ return ip;
+ }else {
+ return sdpIp;
+ }
}
public void setSdpIp(String sdpIp) {
@@ -84,7 +95,11 @@
}
public String getStreamIp() {
- return streamIp;
+ if (StringUtils.isEmpty(streamIp)){
+ return ip;
+ }else {
+ return streamIp;
+ }
}
public void setStreamIp(String streamIp) {
--
Gitblit v1.8.0