From 42d8fff57403500b880886e13093e1841bf47e54 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 03 十二月 2021 10:18:50 +0800
Subject: [PATCH] 兼容流注销时流产生类型错误的问题
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 334 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 260 insertions(+), 74 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 d928d87..3e7d5c4 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
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
@@ -14,10 +15,11 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
import com.genersoft.iot.vmp.utils.redis.JedisUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import okhttp3.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +27,9 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -45,7 +49,7 @@
private boolean sslEnabled;
@Value("${server.port}")
- private String serverPort;
+ private Integer serverPort;
@Autowired
private MediaConfig mediaConfig;
@@ -55,9 +59,6 @@
@Autowired
private MediaServerMapper mediaServerMapper;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
@Autowired
private VideoStreamSessionManager streamSession;
@@ -81,9 +82,12 @@
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.getSipDomain());
+ SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
mediaServerItem.setSsrcConfig(ssrcConfig);
redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId(), mediaServerItem);
}
@@ -97,7 +101,14 @@
@Override
public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId) {
- if (mediaServerItem == null || mediaServerItem.getId() == null) return null;
+ return openRTPServer(mediaServerItem, streamId, false);
+ }
+
+ @Override
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback) {
+ if (mediaServerItem == null || mediaServerItem.getId() == null) {
+ return null;
+ }
// 鑾峰彇mediaServer鍙敤鐨剆src
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId();
@@ -106,8 +117,16 @@
logger.info("media server [ {} ] ssrcConfig is null", mediaServerItem.getId());
return null;
}else {
- String ssrc = ssrcConfig.getPlaySsrc();
- if (streamId == null) streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
+ String ssrc = null;
+ if (isPlayback) {
+ ssrc = ssrcConfig.getPlayBackSsrc();
+ }else {
+ ssrc = ssrcConfig.getPlaySsrc();
+ }
+
+ if (streamId == null) {
+ streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
+ }
int rtpServerPort = mediaServerItem.getRtpProxyPort();
if (mediaServerItem.isRtpEnable()) {
rtpServerPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId);
@@ -122,7 +141,7 @@
String mediaServerId = streamSession.getMediaServerId(device.getDeviceId(), channelId);
MediaServerItem mediaServerItem = this.getOne(mediaServerId);
if (mediaServerItem != null) {
- String streamId = String.format("%s/%s", device.getDeviceId(), channelId);
+ String streamId = String.format("%s_%s", device.getDeviceId(), channelId);
zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
releaseSsrc(mediaServerItem, streamSession.getSSRC(device.getDeviceId(), channelId));
}
@@ -131,7 +150,9 @@
@Override
public void releaseSsrc(MediaServerItem mediaServerItem, String ssrc) {
- if (mediaServerItem == null || ssrc == null) return;
+ if (mediaServerItem == null || ssrc == null) {
+ return;
+ }
SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
ssrcConfig.releaseSsrc(ssrc);
mediaServerItem.setSsrcConfig(ssrcConfig);
@@ -141,11 +162,10 @@
/**
* zlm 閲嶅惎鍚庨噸缃粬鐨勬帹娴佷俊鎭紝 TODO 缁欐鍦ㄤ娇鐢ㄧ殑璁惧鍙戦�佸仠姝㈠懡浠�
- * @param mediaServerItem
*/
@Override
public void clearRTPServer(MediaServerItem mediaServerItem) {
- mediaServerItem.setSsrcConfig(new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getSipDomain()));
+ mediaServerItem.setSsrcConfig(new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain()));
redisUtil.zAdd(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX, mediaServerItem.getId(), 0);
}
@@ -162,7 +182,7 @@
new SsrcConfig(
mediaServerItemInDataBase.getId(),
null,
- sipConfig.getSipDomain()
+ sipConfig.getDomain()
)
);
}
@@ -174,10 +194,25 @@
public List<MediaServerItem> getAll() {
List<MediaServerItem> result = new ArrayList<>();
List<Object> mediaServerKeys = redisUtil.scan(String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX));
- for (int i = 0; i < mediaServerKeys.size(); i++) {
- String key = (String) mediaServerKeys.get(i);
- result.add((MediaServerItem)redisUtil.get(key));
+ String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ for (Object mediaServerKey : mediaServerKeys) {
+ String key = (String) mediaServerKey;
+ MediaServerItem mediaServerItem = (MediaServerItem) redisUtil.get(key);
+ // 妫�鏌ョ姸鎬�
+ if (redisUtil.zScore(onlineKey, mediaServerItem.getId()) != null) {
+ mediaServerItem.setStatus(true);
+ }
+ result.add(mediaServerItem);
}
+ result.sort((serverItem1, serverItem2)->{
+ int sortResult = 0;
+ try {
+ sortResult = format.parse(serverItem1.getCreateTime()).compareTo(format.parse(serverItem2.getCreateTime()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return sortResult;
+ });
return result;
}
@@ -208,7 +243,9 @@
*/
@Override
public MediaServerItem getOne(String mediaServerId) {
- if (mediaServerId == null) return null;
+ if (mediaServerId == null) {
+ return null;
+ }
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerId;
return (MediaServerItem)redisUtil.get(key);
}
@@ -219,14 +256,52 @@
}
@Override
+ public MediaServerItem getDefaultMediaServer() {
+ return mediaServerMapper.queryDefault();
+ }
+
+ @Override
public void clearMediaServerForOnline() {
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
redisUtil.del(key);
}
@Override
- public void add(MediaServerItem mediaSerItem) {
- mediaServerMapper.add(mediaSerItem);
+ public WVPResult<String> add(MediaServerItem mediaServerItem) {
+ WVPResult<String> result = new WVPResult<>();
+ mediaServerItem.setCreateTime(this.format.format(System.currentTimeMillis()));
+ mediaServerItem.setUpdateTime(this.format.format(System.currentTimeMillis()));
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ if (responseJSON != null) {
+ JSONArray data = responseJSON.getJSONArray("data");
+ if (data != null && data.size() > 0) {
+ ZLMServerConfig zlmServerConfig= JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ if (mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()) != null) {
+ result.setCode(-1);
+ result.setMsg("淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ return result;
+ }
+ mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
+ zlmServerConfig.setIp(mediaServerItem.getIp());
+ mediaServerMapper.add(mediaServerItem);
+ handLeZLMServerConfig(zlmServerConfig);
+ result.setCode(0);
+ result.setMsg("success");
+ }else {
+ result.setCode(-1);
+ result.setMsg("杩炴帴澶辫触");
+ }
+
+ }else {
+ result.setCode(-1);
+ result.setMsg("杩炴帴澶辫触");
+ }
+ return result;
+ }
+
+ @Override
+ public int addToDatabase(MediaServerItem mediaSerItem) {
+ return mediaServerMapper.add(mediaSerItem);
}
/**
@@ -235,62 +310,96 @@
*/
@Override
public void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig) {
- logger.info("[ {} ]-[ {}:{} ]宸茶繛鎺�",
+ logger.info("[ ZLM锛歿} ]-[ {}:{} ]宸茶繛鎺�",
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
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.getSipDomain()));
- }
- redisUtil.set(key, serverItemFromConfig);
- }else {
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
- serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getSipDomain()));
- 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.getSipIp());
- serverItem.setCreateTime(now);
- serverItem.setUpdateTime(now);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
- serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getSipDomain()));
- 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());
+ }
+ if (redisUtil.get(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId()) == null) {
+ SsrcConfig ssrcConfig = new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain());
+ serverItem.setSsrcConfig(ssrcConfig);
+ 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
@@ -319,9 +428,10 @@
@Override
public void addCount(String mediaServerId) {
- if (mediaServerId == null) return;
+ if (mediaServerId == null) {
+ return;
+ }
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
- Double aDouble = redisUtil.zScore(key, mediaServerId);
redisUtil.zIncrScore(key, mediaServerId, 1);
}
@@ -359,7 +469,7 @@
*/
@Override
public void setZLMConfig(MediaServerItem mediaServerItem) {
- logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm",
+ logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
String protocol = sslEnabled ? "https" : "http";
String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
@@ -384,19 +494,95 @@
param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
+ param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
param.put("hook.timeoutSec","20");
param.put("general.streamNoneReaderDelayMS","-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
if (responseJSON != null && responseJSON.getInteger("code") == 0) {
- logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm鎴愬姛",
+ logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm鎴愬姛",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}else {
- logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm澶辫触",
+ logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm澶辫触",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}
}
+ @Override
+ public WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret) {
+ WVPResult<MediaServerItem> result = new WVPResult<>();
+ if (mediaServerMapper.queryOneByHostAndPort(ip, port) != null) {
+ result.setCode(-1);
+ result.setMsg("姝よ繛鎺ュ凡瀛樺湪");
+ return result;
+ }
+ MediaServerItem mediaServerItem = new MediaServerItem();
+ mediaServerItem.setIp(ip);
+ mediaServerItem.setHttpPort(port);
+ mediaServerItem.setSecret(secret);
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ if (responseJSON == null) {
+ result.setCode(-1);
+ result.setMsg("杩炴帴澶辫触");
+ return result;
+ }
+ JSONArray data = responseJSON.getJSONArray("data");
+ ZLMServerConfig zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ if (zlmServerConfig == null) {
+ result.setCode(-1);
+ result.setMsg("璇诲彇閰嶇疆澶辫触");
+ return result;
+ }
+ if (mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()) != null) {
+ result.setCode(-1);
+ result.setMsg("濯掍綋鏈嶅姟ID [" + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ return result;
+ }
+ mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpPort());
+ mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort());
+ mediaServerItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+ mediaServerItem.setRtspPort(zlmServerConfig.getRtspPort());
+ mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+ mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+ mediaServerItem.setStreamIp(ip);
+ mediaServerItem.setHookIp(sipConfig.getIp());
+ mediaServerItem.setSdpIp(ip);
+ mediaServerItem.setStreamNoneReaderDelayMS(zlmServerConfig.getGeneralStreamNoneReaderDelayMS());
+ result.setCode(0);
+ result.setMsg("鎴愬姛");
+ result.setData(mediaServerItem);
+ return result;
+ }
+
+ @Override
+ public boolean checkMediaRecordServer(String ip, int port) {
+ boolean result = false;
+ OkHttpClient client = new OkHttpClient();
+ String url = String.format("http://%s:%s/index/api/record", ip, port);
+
+ FormBody.Builder builder = new FormBody.Builder();
+
+ Request request = new Request.Builder()
+ .get()
+ .url(url)
+ .build();
+ try {
+ Response response = client.newCall(request).execute();
+ if (response != null) {
+ result = true;
+ }
+ } catch (Exception e) {}
+
+ return result;
+ }
+
+ @Override
+ public void delete(String id) {
+ redisUtil.zRemove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX, id);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + id;
+ redisUtil.del(key);
+ mediaServerMapper.delOne(id);
+ }
}
--
Gitblit v1.8.0