From 8985905bbe9307cbe10b49d9efec082eebb45ada Mon Sep 17 00:00:00 2001
From: koisi <kor.coeo@gmail.com>
Date: 星期一, 05 八月 2024 17:06:00 +0800
Subject: [PATCH] Merge pull request #1 from koisi-io/fix2
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 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 eac7c11..a9ea67f 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -27,19 +27,19 @@
@Value("${media.ip}")
private String ip;
- @Value("${media.hook-ip:}")
- private String hookIp;
+ @Value("${media.wan_ip:}")
+ private String wanIp;
- @Value("${sip.ip}")
- private String sipIp;
+ @Value("${media.hook-ip:127.0.0.1}")
+ private String hookIp;
@Value("${sip.domain}")
private String sipDomain;
- @Value("${media.sdp-ip:${media.ip}}")
+ @Value("${media.sdp-ip:${media.wan_ip:}}")
private String sdpIp;
- @Value("${media.stream-ip:${media.ip}}")
+ @Value("${media.stream-ip:${media.wan_ip:}}")
private String streamIp;
@Value("${media.http-port:0}")
@@ -111,20 +111,7 @@
}
public String getHookIp() {
- if (ObjectUtils.isEmpty(hookIp)){
- return sipIp;
- }else {
- return hookIp;
- }
-
- }
-
- public String getSipIp() {
- if (sipIp == null) {
- return this.ip;
- }else {
- return sipIp;
- }
+ return hookIp;
}
public int getHttpPort() {
@@ -296,4 +283,12 @@
}
return false;
}
+
+ public String getWanIp() {
+ return wanIp;
+ }
+
+ public void setWanIp(String wanIp) {
+ this.wanIp = wanIp;
+ }
}
--
Gitblit v1.8.0