From 2753e1acf3cbe184b686a1e050d8cde0728cdb7f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 06 十二月 2021 14:04:44 +0800
Subject: [PATCH] 拉流代理支持国标级联之间共享
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 3339676..141c7cf 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -322,8 +322,32 @@
logger.warn("[鏈敞鍐岀殑zlm] 鎷掓帴鎺ュ叆锛氭潵鑷獅}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
return;
}
+ if (serverItem.getHttpPort() == 0) {
+ serverItem.setHttpPort(zlmServerConfig.getHttpPort());
+ }
+ if (serverItem.getHttpSSlPort() == 0) {
+ serverItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
+ }
+ if (serverItem.getRtmpPort() == 0) {
+ serverItem.setRtmpPort(zlmServerConfig.getRtmpPort());
+ }
+ if (serverItem.getRtmpSSlPort() == 0) {
+ serverItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+ }
+ if (serverItem.getRtspPort() == 0) {
+ serverItem.setRtspPort(zlmServerConfig.getRtspPort());
+ }
+ if (serverItem.getRtspSSLPort() == 0) {
+ serverItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+ }
+ if (serverItem.getRtpProxyPort() == 0) {
+ serverItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+ }
if (StringUtils.isEmpty(serverItem.getId())) {
serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
+ mediaServerMapper.updateByHostAndPort(serverItem);
+ }else {
+ mediaServerMapper.update(serverItem);
}
if (redisUtil.get(VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + serverItem.getId()) == null) {
SsrcConfig ssrcConfig = new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain());
@@ -332,7 +356,6 @@
}
serverItem.setStatus(true);
- mediaServerMapper.update(serverItem);
resetOnlineServerItem(serverItem);
setZLMConfig(serverItem);
--
Gitblit v1.8.0