From 6dd870e74c90d39c6ef2443f2f6c058f5973af62 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:59:59 +0800
Subject: [PATCH] 修复点播端口为空
---
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 2
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 83 +++++++++++++++++++++++++----------------
src/main/resources/application.yml | 2
3 files changed, 52 insertions(+), 35 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..eac7c11 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -212,41 +212,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() {
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
index 6473c42..d34657f 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
@@ -27,7 +27,7 @@
"flv_port," +
"flv_ssl_port," +
"ws_flv_port," +
- "ws_flv_ssl__port," +
+ "ws_flv_ssl_port," +
"rtsp_ssl_port,"+
"auto_config,"+
"secret,"+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3d36b84..3f47844 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@
application:
name: wvp
profiles:
- active: abl
\ No newline at end of file
+ active: local
\ No newline at end of file
--
Gitblit v1.8.0