From f331b0b0d3dc72e3489f6c241b02475d3323e124 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 18 七月 2024 14:08:05 +0800
Subject: [PATCH] Merge pull request #1524 from ZhaoYandong00/master
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 14 +++++++++++---
1 files changed, 11 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 0770172..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,7 +27,7 @@
@Value("${media.ip}")
private String ip;
- @Value("${media.wan_ip}")
+ @Value("${media.wan_ip:}")
private String wanIp;
@Value("${media.hook-ip:127.0.0.1}")
@@ -36,10 +36,10 @@
@Value("${sip.domain}")
private String sipDomain;
- @Value("${media.sdp-ip:${media.wan_ip}}")
+ @Value("${media.sdp-ip:${media.wan_ip:}}")
private String sdpIp;
- @Value("${media.stream-ip:${media.wan_ip}}")
+ @Value("${media.stream-ip:${media.wan_ip:}}")
private String streamIp;
@Value("${media.http-port:0}")
@@ -283,4 +283,12 @@
}
return false;
}
+
+ public String getWanIp() {
+ return wanIp;
+ }
+
+ public void setWanIp(String wanIp) {
+ this.wanIp = wanIp;
+ }
}
--
Gitblit v1.8.0