From da2662ab27e5655636bfa6338d8d1f083a99f36f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 六月 2024 18:10:01 +0800
Subject: [PATCH] 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 27 +++++++--------------------
1 files changed, 7 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..0770172 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() {
--
Gitblit v1.8.0