From c88681c7ad06391fa8cce0b910f45cf4f479889d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 八月 2024 10:41:54 +0800
Subject: [PATCH] 合并分支
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 118 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 65 insertions(+), 53 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 0dc1ba9..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() {
@@ -212,41 +199,58 @@
}
public MediaServer getMediaSerItem(){
- MediaServer mediaServerItem = new MediaServer();
- mediaServerItem.setId(id);
- mediaServerItem.setIp(ip);
- mediaServerItem.setDefaultServer(true);
- mediaServerItem.setHookIp(getHookIp());
- mediaServerItem.setSdpIp(getSdpIp());
- mediaServerItem.setStreamIp(getStreamIp());
- mediaServerItem.setHttpPort(httpPort);
- mediaServerItem.setFlvPort(flvPort);
- mediaServerItem.setWsFlvPort(wsFlvPort);
- mediaServerItem.setHttpSSlPort(httpSSlPort);
- mediaServerItem.setFlvSSLPort(flvSSlPort);
- mediaServerItem.setWsFlvSSLPort(wsFlvSSlPort);
- mediaServerItem.setRtmpPort(rtmpPort);
- mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
- mediaServerItem.setRtpProxyPort(getRtpProxyPort());
- mediaServerItem.setRtspPort(rtspPort);
- mediaServerItem.setRtspSSLPort(rtspSSLPort);
- mediaServerItem.setAutoConfig(autoConfig);
- mediaServerItem.setSecret(secret);
- mediaServerItem.setRtpEnable(rtpEnable);
- mediaServerItem.setRtpPortRange(rtpPortRange);
- mediaServerItem.setSendRtpPortRange(rtpSendPortRange);
- mediaServerItem.setRecordAssistPort(recordAssistPort);
- mediaServerItem.setHookAliveInterval(10f);
- mediaServerItem.setRecordDay(recordDay);
- mediaServerItem.setStatus(false);
- mediaServerItem.setType(type);
- if (recordPath != null) {
- mediaServerItem.setRecordPath(recordPath);
+ MediaServer mediaServer = new MediaServer();
+ mediaServer.setId(id);
+ mediaServer.setIp(ip);
+ mediaServer.setDefaultServer(true);
+ mediaServer.setHookIp(getHookIp());
+ mediaServer.setSdpIp(getSdpIp());
+ mediaServer.setStreamIp(getStreamIp());
+ mediaServer.setHttpPort(httpPort);
+ if (flvPort == 0) {
+ mediaServer.setFlvPort(httpPort);
+ }else {
+ mediaServer.setFlvPort(flvPort);
}
- mediaServerItem.setCreateTime(DateUtil.getNow());
- mediaServerItem.setUpdateTime(DateUtil.getNow());
+ if (wsFlvPort == 0) {
+ mediaServer.setWsFlvPort(httpPort);
+ }else {
+ mediaServer.setWsFlvPort(wsFlvPort);
+ }
+ if (flvSSlPort == 0) {
+ mediaServer.setFlvSSLPort(httpSSlPort);
+ }else {
+ mediaServer.setFlvSSLPort(flvSSlPort);
+ }
+ if (wsFlvSSlPort == 0) {
+ mediaServer.setWsFlvSSLPort(httpSSlPort);
+ }else {
+ mediaServer.setWsFlvSSLPort(wsFlvSSlPort);
+ }
- return mediaServerItem;
+ mediaServer.setHttpSSlPort(httpSSlPort);
+ mediaServer.setRtmpPort(rtmpPort);
+ mediaServer.setRtmpSSlPort(rtmpSSlPort);
+ mediaServer.setRtpProxyPort(getRtpProxyPort());
+ mediaServer.setRtspPort(rtspPort);
+ mediaServer.setRtspSSLPort(rtspSSLPort);
+ mediaServer.setAutoConfig(autoConfig);
+ mediaServer.setSecret(secret);
+ mediaServer.setRtpEnable(rtpEnable);
+ mediaServer.setRtpPortRange(rtpPortRange);
+ mediaServer.setSendRtpPortRange(rtpSendPortRange);
+ mediaServer.setRecordAssistPort(recordAssistPort);
+ mediaServer.setHookAliveInterval(10f);
+ mediaServer.setRecordDay(recordDay);
+ mediaServer.setStatus(false);
+ mediaServer.setType(type);
+ if (recordPath != null) {
+ mediaServer.setRecordPath(recordPath);
+ }
+ mediaServer.setCreateTime(DateUtil.getNow());
+ mediaServer.setUpdateTime(DateUtil.getNow());
+
+ return mediaServer;
}
public Integer getRecordDay() {
@@ -279,4 +283,12 @@
}
return false;
}
+
+ public String getWanIp() {
+ return wanIp;
+ }
+
+ public void setWanIp(String wanIp) {
+ this.wanIp = wanIp;
+ }
}
--
Gitblit v1.8.0