From a01d4fa74e178f7d17c7f123879a1e125370a93d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 八月 2024 10:49:35 +0800
Subject: [PATCH] 修复前端文件编译错误
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 152 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 101 insertions(+), 51 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 93d265e..a9ea67f 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,6 @@
package com.genersoft.iot.vmp.conf;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.utils.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,26 +27,38 @@
@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}")
+ @Value("${media.http-port:0}")
private Integer httpPort;
+
+ @Value("${media.flv-port:0}")
+ private Integer flvPort = 0;
+
+ @Value("${media.ws-flv-port:0}")
+ private Integer wsFlvPort = 0;
@Value("${media.http-ssl-port:0}")
private Integer httpSSlPort = 0;
+
+ @Value("${media.flv-ssl-port:0}")
+ private Integer flvSSlPort = 0;
+
+ @Value("${media.ws-flv-ssl-port:0}")
+ private Integer wsFlvSSlPort = 0;
@Value("${media.rtmp-port:0}")
private Integer rtmpPort = 0;
@@ -81,6 +93,15 @@
@Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0;
+ @Value("${media.record-day:7}")
+ private Integer recordDay;
+
+ @Value("${media.record-path:}")
+ private String recordPath;
+
+ @Value("${media.type:zlm}")
+ private String type;
+
public String getId() {
return id;
}
@@ -90,20 +111,7 @@
}
public String getHookIp() {
- if (ObjectUtils.isEmpty(hookIp)){
- return sipIp.split(",")[0];
- }else {
- return hookIp;
- }
-
- }
-
- public String getSipIp() {
- if (sipIp == null) {
- return this.ip;
- }else {
- return sipIp;
- }
+ return hookIp;
}
public int getHttpPort() {
@@ -190,33 +198,75 @@
return sipDomain;
}
- public MediaServerItem getMediaSerItem(){
- MediaServerItem mediaServerItem = new MediaServerItem();
- mediaServerItem.setId(id);
- mediaServerItem.setIp(ip);
- mediaServerItem.setDefaultServer(true);
- mediaServerItem.setHookIp(getHookIp());
- mediaServerItem.setSdpIp(getSdpIp());
- mediaServerItem.setStreamIp(getStreamIp());
- mediaServerItem.setHttpPort(httpPort);
- mediaServerItem.setHttpSSlPort(httpSSlPort);
- 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(30.00f);
+ public MediaServer getMediaSerItem(){
+ 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);
+ }
+ 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);
+ }
- mediaServerItem.setCreateTime(DateUtil.getNow());
- mediaServerItem.setUpdateTime(DateUtil.getNow());
+ 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 mediaServerItem;
+ return mediaServer;
+ }
+
+ public Integer getRecordDay() {
+ return recordDay;
+ }
+
+ public void setRecordDay(Integer recordDay) {
+ this.recordDay = recordDay;
+ }
+
+ public String getRecordPath() {
+ return recordPath;
+ }
+
+ public void setRecordPath(String recordPath) {
+ this.recordPath = recordPath;
}
public String getRtpSendPortRange() {
@@ -234,11 +284,11 @@
return false;
}
- public String getRtpSendPortRange() {
- return rtpSendPortRange;
+ public String getWanIp() {
+ return wanIp;
}
- public void setRtpSendPortRange(String rtpSendPortRange) {
- this.rtpSendPortRange = rtpSendPortRange;
+ public void setWanIp(String wanIp) {
+ this.wanIp = wanIp;
}
}
--
Gitblit v1.8.0