From b24be12405ac4db1e9874367ae27c81aae172495 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 28 六月 2021 17:22:08 +0800
Subject: [PATCH] 修复级联注册bug
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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..3158025 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;
@@ -13,6 +12,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 +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