From 2a1f979651340fbf9b530ab2d2f9e5857cbeeb1a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 17:37:29 +0800
Subject: [PATCH] 简化zlm节点接入逻辑
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 148 ++++++++++++++++++++++++++++--------------------
1 files changed, 86 insertions(+), 62 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 51f99d9..e457a33 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
@@ -27,6 +27,7 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -80,6 +81,9 @@
logger.info("Media Server 缂撳瓨鍒濆鍖�");
List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
for (MediaServerItem mediaServerItem : mediaServerItemList) {
+ if (StringUtils.isEmpty(mediaServerItem.getId())) {
+ continue;
+ }
// 鏇存柊
if (mediaServerItem.getSsrcConfig() == null) {
SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
@@ -283,6 +287,11 @@
return result;
}
+ @Override
+ public int addToDatabase(MediaServerItem mediaSerItem) {
+ return mediaServerMapper.add(mediaSerItem);
+ }
+
/**
* 澶勭悊zlm涓婄嚎
* @param zlmServerConfig zlm涓婄嚎鎼哄甫鐨勫弬鏁�
@@ -296,69 +305,84 @@
if (serverItem == null) {
serverItem = mediaServerMapper.queryOneByHostAndPort(zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
}
- if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
- || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
- // 閰嶇疆鏂囦欢鐨剒lm
- // 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
- // docker閮ㄧ讲涓嶄細浣跨敤zlm閰嶇疆鐨勭鍙ｅ彿涓嶆槸榛樿鐨勫垯涓嶅仛鏇存柊锛� 閰嶇疆淇敼闇�瑕佽嚜琛屼慨鏀箂erver閰嶇疆;
- MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
- serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
- if (mediaConfig.getHttpPort() == 0) {
- serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
- }
- if (mediaConfig.getHttpSSlPort() == 0) {
- serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- }
- if (mediaConfig.getRtmpPort() == 0) {
- serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
- }
- if (mediaConfig.getRtmpSSlPort() == 0) {
- serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- }
- if (mediaConfig.getRtspPort() == 0) {
- serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
- }
- if (mediaConfig.getRtspSSLPort() == 0) {
- serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- }
- if (mediaConfig.getRtpProxyPort() == 0) {
- serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- }
- if (serverItem != null){
- mediaServerMapper.delDefault();
- mediaServerMapper.add(serverItemFromConfig);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
- MediaServerItem serverItemInRedis = (MediaServerItem)redisUtil.get(key);
- if (serverItemInRedis != null) {
- serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
- }else {
- serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
- }
- redisUtil.set(key, serverItemFromConfig);
- }else {
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
- serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
- redisUtil.set(key, serverItemFromConfig);
- mediaServerMapper.add(serverItemFromConfig);
- }
- resetOnlineServerItem(serverItemFromConfig);
- setZLMConfig(serverItemFromConfig);
- }else {
- String now = this.format.format(System.currentTimeMillis());
- if (serverItem == null){
- // 涓�涓柊鐨剒lm鎺ュ叆wvp
- serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
- serverItem.setCreateTime(now);
- serverItem.setUpdateTime(now);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
- serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
- redisUtil.set(key, serverItem);
- // 瀛樺叆鏁版嵁搴�
- mediaServerMapper.add(serverItem);
- setZLMConfig(serverItem);
- }
- resetOnlineServerItem(serverItem);
+ if (serverItem == null) {
+ logger.warn("[鏈敞鍐岀殑zlm] 鎷掓帴鎺ュ叆锛氭潵鑷獅}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+ return;
}
+ if (StringUtils.isEmpty(serverItem.getId())) {
+ serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
+ redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId(), serverItem);
+ }
+ serverItem.setStatus(true);
+ mediaServerMapper.update(serverItem);
+ resetOnlineServerItem(serverItem);
+ setZLMConfig(serverItem);
+
+// if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
+// || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
+// // 閰嶇疆鏂囦欢鐨剒lm
+// // 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
+// // wvp浜掓儬淇敼zlm鐨勭鍙ｏ紝闇�瑕佽嚜琛岄厤缃��
+// MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
+// serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
+// if (mediaConfig.getHttpPort() == 0) {
+// serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
+// }
+// if (mediaConfig.getHttpSSlPort() == 0) {
+// serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
+// }
+// if (mediaConfig.getRtmpPort() == 0) {
+// serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
+// }
+// if (mediaConfig.getRtmpSSlPort() == 0) {
+// serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+// }
+// if (mediaConfig.getRtspPort() == 0) {
+// serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
+// }
+// if (mediaConfig.getRtspSSLPort() == 0) {
+// serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+// }
+// if (mediaConfig.getRtpProxyPort() == 0) {
+// serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+// }
+// if (serverItem != null){
+// mediaServerMapper.delDefault();
+// mediaServerMapper.add(serverItemFromConfig);
+// String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+// MediaServerItem serverItemInRedis = (MediaServerItem)redisUtil.get(key);
+// if (serverItemInRedis != null) {
+// serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
+// }else {
+// serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
+// }
+// redisUtil.set(key, serverItemFromConfig);
+// }else {
+// String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+// serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
+// redisUtil.set(key, serverItemFromConfig);
+// mediaServerMapper.add(serverItemFromConfig);
+// }
+// resetOnlineServerItem(serverItemFromConfig);
+// setZLMConfig(serverItemFromConfig);
+// }
+ // 绉婚櫎鏈坊鍔犵殑zlm鐨勬帴鍏ワ紝鎵�鏈夌殑zlm蹇呴』鍏堟坊鍔犲悗鎵嶅彲浠ュ姞鍏ヤ娇鐢�
+// else {
+// String now = this.format.format(System.currentTimeMillis());
+// if (serverItem == null){
+// // 涓�涓柊鐨剒lm鎺ュ叆wvp
+// serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
+// serverItem.setCreateTime(now);
+// serverItem.setUpdateTime(now);
+// String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
+// serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
+// redisUtil.set(key, serverItem);
+// // 瀛樺叆鏁版嵁搴�
+// mediaServerMapper.add(serverItem);
+// setZLMConfig(serverItem);
+// }
+// resetOnlineServerItem(serverItem);
+// }
}
@Override
--
Gitblit v1.8.0