From 858093fe9a1c23d2be22ecb75ceab1139931454e Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期三, 09 六月 2021 10:22:41 +0800
Subject: [PATCH] 国标级联兼容大华NVR
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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..48f1af5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -14,6 +14,9 @@
@Value("${media.hookIp:${sip.ip}}")
private String hookIp;
+ @Value("${sip.ip}")
+ private String sipIp;
+
@Value("${media.sdpIp:${media.ip}}")
private String sdpIp;
@@ -68,7 +71,12 @@
}
public String getHookIp() {
- return hookIp;
+ if (StringUtils.isEmpty(hookIp)){
+ return sipIp;
+ }else {
+ return hookIp;
+ }
+
}
public void setHookIp(String hookIp) {
@@ -76,7 +84,11 @@
}
public String getSdpIp() {
- return sdpIp;
+ if (StringUtils.isEmpty(sdpIp)){
+ return ip;
+ }else {
+ return sdpIp;
+ }
}
public void setSdpIp(String sdpIp) {
@@ -84,7 +96,11 @@
}
public String getStreamIp() {
- return streamIp;
+ if (StringUtils.isEmpty(streamIp)){
+ return ip;
+ }else {
+ return streamIp;
+ }
}
public void setStreamIp(String streamIp) {
--
Gitblit v1.8.0