From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 580 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 380 insertions(+), 200 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
old mode 100644
new mode 100755
index 27de261..347d0e6
--- 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,46 +1,53 @@
package com.genersoft.iot.vmp.service.impl;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.util.StringUtils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
-import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
-import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
+import com.genersoft.iot.vmp.media.zlm.*;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
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.DateUtil;
+import com.genersoft.iot.vmp.utils.JsonUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
-
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+import java.io.File;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
/**
* 濯掍綋鏈嶅姟鍣ㄨ妭鐐圭鐞�
@@ -50,8 +57,13 @@
private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
+ private final String zlmKeepaliveKeyPrefix = "zlm-keepalive_";
+
@Autowired
private SipConfig sipConfig;
+
+ @Autowired
+ private SSRCFactory ssrcFactory;
@Value("${server.ssl.enabled:false}")
private boolean sslEnabled;
@@ -63,26 +75,47 @@
private UserSetting userSetting;
@Autowired
+ private SendRtpPortManager sendRtpPortManager;
+
+ @Autowired
+ private AssistRESTfulUtils assistRESTfulUtils;
+
+ @Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
private MediaServerMapper mediaServerMapper;
@Autowired
- DataSourceTransactionManager dataSourceTransactionManager;
+ private DataSourceTransactionManager dataSourceTransactionManager;
@Autowired
- TransactionDefinition transactionDefinition;
+ private TransactionDefinition transactionDefinition;
+
@Autowired
- private VideoStreamSessionManager streamSession;
-
- @Autowired
- private ZLMRTPServerFactory zlmrtpServerFactory;
-
+ private ZLMServerFactory zlmServerFactory;
@Autowired
private EventPublisher publisher;
+
+ @Autowired
+ private DynamicTask dynamicTask;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
+
+ @Autowired
+ private RedisTemplate<Object, Object> redisTemplate;
+
+ @Qualifier("taskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
+
+
/**
* 鍒濆鍖�
@@ -91,81 +124,85 @@
public void updateVmServer(List<MediaServerItem> mediaServerItemList) {
logger.info("[zlm] 缂撳瓨鍒濆鍖� ");
for (MediaServerItem mediaServerItem : mediaServerItemList) {
- if (StringUtils.isEmpty(mediaServerItem.getId())) {
+ if (ObjectUtils.isEmpty(mediaServerItem.getId())) {
continue;
}
// 鏇存柊
- if (mediaServerItem.getSsrcConfig() == null) {
- SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
- mediaServerItem.setSsrcConfig(ssrcConfig);
- RedisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId(), mediaServerItem);
+ if (!ssrcFactory.hasMediaServerSSRC(mediaServerItem.getId())) {
+ ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
}
// 鏌ヨredis鏄惁瀛樺湪姝ediaServer
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
- if (!RedisUtil.hasKey(key)) {
- RedisUtil.set(key, mediaServerItem);
+ Boolean hasKey = redisTemplate.hasKey(key);
+ if (hasKey != null && ! hasKey) {
+ redisTemplate.opsForValue().set(key, mediaServerItem);
}
-
}
}
- @Override
- public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck, boolean isPlayback) {
- return openRTPServer(mediaServerItem, streamId, null, ssrcCheck,isPlayback);
- }
@Override
- public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String presetSsrc, boolean ssrcCheck, boolean isPlayback, Integer port) {
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String presetSsrc, boolean ssrcCheck,
+ boolean isPlayback, Integer port, Boolean reUsePort, Integer tcpMode) {
if (mediaServerItem == null || mediaServerItem.getId() == null) {
+ logger.info("[openRTPServer] 澶辫触, mediaServerItem == null || mediaServerItem.getId() == null");
return null;
}
// 鑾峰彇mediaServer鍙敤鐨剆src
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
-
- SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
- if (ssrcConfig == null) {
- logger.info("media server [ {} ] ssrcConfig is null", mediaServerItem.getId());
- return null;
+ String ssrc;
+ if (presetSsrc != null) {
+ ssrc = presetSsrc;
}else {
- String ssrc = null;
- if (presetSsrc != null) {
- ssrc = presetSsrc;
+ if (isPlayback) {
+ ssrc = ssrcFactory.getPlayBackSsrc(mediaServerItem.getId());
}else {
- if (isPlayback) {
- ssrc = ssrcConfig.getPlayBackSsrc();
- }else {
- ssrc = ssrcConfig.getPlaySsrc();
- }
+ ssrc = ssrcFactory.getPlaySsrc(mediaServerItem.getId());
}
-
- if (streamId == null) {
- streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
- }
- int rtpServerPort = mediaServerItem.getRtpProxyPort();
- if (mediaServerItem.isRtpEnable()) {
- rtpServerPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId, ssrcCheck?Integer.parseInt(ssrc):0, port);
- }
- RedisUtil.set(key, mediaServerItem);
- return new SSRCInfo(rtpServerPort, ssrc, streamId);
}
+
+ if (streamId == null) {
+ streamId = String.format("%08x", Long.parseLong(ssrc)).toUpperCase();
+ }
+ int ssrcCheckParam = 0;
+ if (ssrcCheck && tcpMode > 1) {
+ // 鐩墠zlm涓嶆敮鎸� tcp妯″紡鏇存柊ssrc锛屾殏鏃跺叧闂璼src鏍￠獙
+ logger.warn("[openRTPServer] TCP琚姩/TCP涓诲姩鏀舵祦鏃讹紝榛樿鍏抽棴ssrc妫�楠�");
+ }
+ int rtpServerPort;
+ if (mediaServerItem.isRtpEnable()) {
+ rtpServerPort = zlmServerFactory.createRTPServer(mediaServerItem, streamId, (ssrcCheck && tcpMode == 0) ? Long.parseLong(ssrc) : 0, port, reUsePort, tcpMode);
+ } else {
+ rtpServerPort = mediaServerItem.getRtpProxyPort();
+ }
+ return new SSRCInfo(rtpServerPort, ssrc, streamId);
}
@Override
- public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback) {
- return openRTPServer(mediaServerItem, streamId, ssrc, ssrcCheck, isPlayback, null);
+ public void closeRTPServer(MediaServerItem mediaServerItem, String streamId) {
+ if (mediaServerItem == null) {
+ return;
+ }
+ zlmServerFactory.closeRtpServer(mediaServerItem, streamId);
}
@Override
- public void closeRTPServer(String deviceId, String channelId, String stream) {
- String mediaServerId = streamSession.getMediaServerId(deviceId, channelId, stream);
- String ssrc = streamSession.getSSRC(deviceId, channelId, stream);
+ public void closeRTPServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback) {
+ if (mediaServerItem == null) {
+ callback.run(false);
+ return;
+ }
+ zlmServerFactory.closeRtpServer(mediaServerItem, streamId, callback);
+ }
+
+ @Override
+ public void closeRTPServer(String mediaServerId, String streamId) {
MediaServerItem mediaServerItem = this.getOne(mediaServerId);
- if (mediaServerItem != null) {
- String streamId = String.format("%s_%s", deviceId, channelId);
- zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
- releaseSsrc(mediaServerItem.getId(), ssrc);
- }
- streamSession.remove(deviceId, channelId, stream);
+ closeRTPServer(mediaServerItem, streamId);
+ }
+
+ @Override
+ public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
+ return zlmServerFactory.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
}
@Override
@@ -174,11 +211,7 @@
if (mediaServerItem == null || ssrc == null) {
return;
}
- SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
- ssrcConfig.releaseSsrc(ssrc);
- mediaServerItem.setSsrcConfig(ssrcConfig);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
- RedisUtil.set(key, mediaServerItem);
+ ssrcFactory.releaseSsrc(mediaServerItemId, ssrc);
}
/**
@@ -186,8 +219,7 @@
*/
@Override
public void clearRTPServer(MediaServerItem mediaServerItem) {
- mediaServerItem.setSsrcConfig(new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain()));
- RedisUtil.zAdd(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId(), mediaServerItem.getId(), 0);
+ ssrcFactory.reset(mediaServerItem.getId());
}
@@ -197,31 +229,26 @@
mediaServerMapper.update(mediaSerItem);
MediaServerItem mediaServerItemInRedis = getOne(mediaSerItem.getId());
MediaServerItem mediaServerItemInDataBase = mediaServerMapper.queryOne(mediaSerItem.getId());
- if (mediaServerItemInRedis != null && mediaServerItemInRedis.getSsrcConfig() != null) {
- mediaServerItemInDataBase.setSsrcConfig(mediaServerItemInRedis.getSsrcConfig());
- }else {
- mediaServerItemInDataBase.setSsrcConfig(
- new SsrcConfig(
- mediaServerItemInDataBase.getId(),
- null,
- sipConfig.getDomain()
- )
- );
+ if (mediaServerItemInRedis == null || !ssrcFactory.hasMediaServerSSRC(mediaSerItem.getId())) {
+ ssrcFactory.initMediaServerSSRC(mediaServerItemInDataBase.getId(),null);
}
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItemInDataBase.getId();
- RedisUtil.set(key, mediaServerItemInDataBase);
+ redisTemplate.opsForValue().set(key, mediaServerItemInDataBase);
}
@Override
public List<MediaServerItem> getAll() {
List<MediaServerItem> result = new ArrayList<>();
- List<Object> mediaServerKeys = RedisUtil.scan(String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX+ userSetting.getServerId() + "_" ));
+ List<Object> mediaServerKeys = RedisUtil.scan(redisTemplate, String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX+ userSetting.getServerId() + "_" ));
String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
for (Object mediaServerKey : mediaServerKeys) {
String key = (String) mediaServerKey;
- MediaServerItem mediaServerItem = (MediaServerItem) RedisUtil.get(key);
+ MediaServerItem mediaServerItem = JsonUtil.redisJsonToObject(redisTemplate, key, MediaServerItem.class);
+ if (Objects.isNull(mediaServerItem)) {
+ continue;
+ }
// 妫�鏌ョ姸鎬�
- Double aDouble = RedisUtil.zScore(onlineKey, mediaServerItem.getId());
+ Double aDouble = redisTemplate.opsForZSet().score(onlineKey, mediaServerItem.getId());
if (aDouble != null) {
mediaServerItem.setStatus(true);
}
@@ -247,13 +274,14 @@
@Override
public List<MediaServerItem> getAllOnline() {
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
- Set<String> mediaServerIdSet = RedisUtil.zRevRange(key, 0, -1);
+ Set<Object> mediaServerIdSet = redisTemplate.opsForZSet().reverseRange(key, 0, -1);
List<MediaServerItem> result = new ArrayList<>();
if (mediaServerIdSet != null && mediaServerIdSet.size() > 0) {
- for (String mediaServerId : mediaServerIdSet) {
- String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
- result.add((MediaServerItem) RedisUtil.get(serverKey));
+ for (Object mediaServerId : mediaServerIdSet) {
+ String mediaServerIdStr = (String) mediaServerId;
+ String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerIdStr;
+ result.add((MediaServerItem) redisTemplate.opsForValue().get(serverKey));
}
}
Collections.reverse(result);
@@ -271,7 +299,7 @@
return null;
}
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
- return (MediaServerItem)RedisUtil.get(key);
+ return JsonUtil.redisJsonToObject(redisTemplate, key, MediaServerItem.class);
}
@Override
@@ -283,41 +311,33 @@
@Override
public void clearMediaServerForOnline() {
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
- RedisUtil.del(key);
+ redisTemplate.delete(key);
}
@Override
- public WVPResult<String> add(MediaServerItem mediaServerItem) {
- WVPResult<String> result = new WVPResult<>();
+ public void add(MediaServerItem mediaServerItem) {
mediaServerItem.setCreateTime(DateUtil.getNow());
mediaServerItem.setUpdateTime(DateUtil.getNow());
- mediaServerItem.setHookAliveInterval(120);
+ mediaServerItem.setHookAliveInterval(30f);
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;
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
}
mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
zlmServerConfig.setIp(mediaServerItem.getIp());
mediaServerMapper.add(mediaServerItem);
zlmServerOnline(zlmServerConfig);
- result.setCode(0);
- result.setMsg("success");
}else {
- result.setCode(-1);
- result.setMsg("杩炴帴澶辫触");
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"杩炴帴澶辫触");
}
}else {
- result.setCode(-1);
- result.setMsg("杩炴帴澶辫触");
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"杩炴帴澶辫触");
}
- return result;
}
@Override
@@ -385,33 +405,71 @@
}
serverItem.setStatus(true);
- if (StringUtils.isEmpty(serverItem.getId())) {
+ if (ObjectUtils.isEmpty(serverItem.getId())) {
logger.warn("[鏈敞鍐岀殑zlm] serverItem缂哄皯ID锛� 鏃犳硶鎺ュ叆锛歿}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
return;
}
mediaServerMapper.update(serverItem);
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + zlmServerConfig.getGeneralMediaServerId();
- if (RedisUtil.get(key) == null) {
- SsrcConfig ssrcConfig = new SsrcConfig(zlmServerConfig.getGeneralMediaServerId(), null, sipConfig.getDomain());
- serverItem.setSsrcConfig(ssrcConfig);
- }else {
- MediaServerItem mediaServerItemInRedis = (MediaServerItem)RedisUtil.get(key);
- serverItem.setSsrcConfig(mediaServerItemInRedis.getSsrcConfig());
+ if (!ssrcFactory.hasMediaServerSSRC(serverItem.getId())) {
+ ssrcFactory.initMediaServerSSRC(zlmServerConfig.getGeneralMediaServerId(), null);
}
- RedisUtil.set(key, serverItem);
+ redisTemplate.opsForValue().set(key, serverItem);
resetOnlineServerItem(serverItem);
+
+
if (serverItem.isAutoConfig()) {
+ // 鏌ョ湅assist鏈嶅姟鐨勫綍鍍忚矾寰勯厤缃�
+ if (serverItem.getRecordAssistPort() > 0 && userSetting.getRecordPath() == null) {
+ JSONObject info = assistRESTfulUtils.getInfo(serverItem, null);
+ if (info != null && info.getInteger("code") != null && info.getInteger("code") == 0 ) {
+ JSONObject dataJson = info.getJSONObject("data");
+ if (dataJson != null) {
+ String recordPath = dataJson.getString("record");
+ userSetting.setRecordPath(recordPath);
+ }
+ }
+ }
setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable()));
}
+ final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId();
+ dynamicTask.stop(zlmKeepaliveKey);
+ dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (serverItem.getHookAliveInterval().intValue() + 5) * 1000);
publisher.zlmOnlineEventPublish(serverItem.getId());
+
logger.info("[ZLM] 杩炴帴鎴愬姛 {} - {}:{} ",
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
+ }
+
+ class KeepAliveTimeoutRunnable implements Runnable{
+
+ private MediaServerItem serverItem;
+
+ public KeepAliveTimeoutRunnable(MediaServerItem serverItem) {
+ this.serverItem = serverItem;
+ }
+
+ @Override
+ public void run() {
+ logger.info("[zlm蹇冭烦鍒版湡]锛�" + serverItem.getId());
+ // 鍙戣捣http璇锋眰楠岃瘉zlm鏄惁纭疄鏃犳硶杩炴帴锛屽鏋滅‘瀹炴棤娉曡繛鎺ュ垯鍙戦�佺绾夸簨浠讹紝鍚﹀垯涓嶄綔澶勭悊
+ JSONObject mediaServerConfig = zlmresTfulUtils.getMediaServerConfig(serverItem);
+ if (mediaServerConfig != null && mediaServerConfig.getInteger("code") == 0) {
+ logger.info("[zlm蹇冭烦鍒版湡]锛歿}楠岃瘉鍚巣lm浠嶅湪绾匡紝鎭㈠蹇冭烦淇℃伅,璇锋鏌lm鏄惁鍙互姝ｅ父鍚憌vp鍙戦�佸績璺�", serverItem.getId());
+ // 娣诲姞zlm淇℃伅
+ updateMediaServerKeepalive(serverItem.getId(), null);
+ }else {
+ publisher.zlmOfflineEventPublish(serverItem.getId());
+ }
+ }
}
@Override
public void zlmServerOffline(String mediaServerId) {
delete(mediaServerId);
+ final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerId;
+ dynamicTask.stop(zlmKeepaliveKey);
}
@Override
@@ -419,22 +477,21 @@
// 鏇存柊缂撳瓨
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
// 浣跨敤zset鐨勫垎鏁颁綔涓哄綋鍓嶅苟鍙戦噺锛� 榛樿鍊艰缃负0
- if (RedisUtil.zScore(key, serverItem.getId()) == null) { // 涓嶅瓨鍦ㄥ垯璁剧疆榛樿鍊� 宸插瓨鍦ㄥ垯閲嶇疆
- RedisUtil.zAdd(key, serverItem.getId(), 0L);
+ if (redisTemplate.opsForZSet().score(key, serverItem.getId()) == null) { // 涓嶅瓨鍦ㄥ垯璁剧疆榛樿鍊� 宸插瓨鍦ㄥ垯閲嶇疆
+ redisTemplate.opsForZSet().add(key, serverItem.getId(), 0L);
// 鏌ヨ鏈嶅姟娴佹暟閲�
- zlmresTfulUtils.getMediaList(serverItem, null, null, "rtmp",(mediaList ->{
+ zlmresTfulUtils.getMediaList(serverItem, null, null, "rtsp",(mediaList ->{
Integer code = mediaList.getInteger("code");
if (code == 0) {
JSONArray data = mediaList.getJSONArray("data");
if (data != null) {
- RedisUtil.zAdd(key, serverItem.getId(), data.size());
+ redisTemplate.opsForZSet().add(key, serverItem.getId(), data.size());
}
}
}));
}else {
clearRTPServer(serverItem);
}
-
}
@@ -444,14 +501,14 @@
return;
}
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
- RedisUtil.zIncrScore(key, mediaServerId, 1);
+ redisTemplate.opsForZSet().incrementScore(key, mediaServerId, 1);
}
@Override
public void removeCount(String mediaServerId) {
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
- RedisUtil.zIncrScore(key, mediaServerId, - 1);
+ redisTemplate.opsForZSet().incrementScore(key, mediaServerId, - 1);
}
/**
@@ -459,22 +516,42 @@
* @return MediaServerItem
*/
@Override
- public MediaServerItem getMediaServerForMinimumLoad() {
+ public MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist) {
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
-
- if (RedisUtil.zSize(key) == null || RedisUtil.zSize(key) == 0) {
- if (RedisUtil.zSize(key) == null || RedisUtil.zSize(key) == 0) {
- logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
- return null;
- }
+ Long size = redisTemplate.opsForZSet().zCard(key);
+ if (size == null || size == 0) {
+ logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
+ return null;
}
// 鑾峰彇鍒嗘暟鏈�浣庣殑锛屽強骞跺彂鏈�浣庣殑
- Set<Object> objects = RedisUtil.ZRange(key, 0, -1);
+ Set<Object> objects = redisTemplate.opsForZSet().range(key, 0, -1);
ArrayList<Object> mediaServerObjectS = new ArrayList<>(objects);
+ MediaServerItem mediaServerItem = null;
+ if (hasAssist == null) {
+ String mediaServerId = (String)mediaServerObjectS.get(0);
+ mediaServerItem = getOne(mediaServerId);
+ }else if (hasAssist) {
+ for (Object mediaServerObject : mediaServerObjectS) {
+ String mediaServerId = (String)mediaServerObject;
+ MediaServerItem serverItem = getOne(mediaServerId);
+ if (serverItem.getRecordAssistPort() > 0) {
+ mediaServerItem = serverItem;
+ break;
+ }
+ }
+ }else if (!hasAssist) {
+ for (Object mediaServerObject : mediaServerObjectS) {
+ String mediaServerId = (String)mediaServerObject;
+ MediaServerItem serverItem = getOne(mediaServerId);
+ if (serverItem.getRecordAssistPort() == 0) {
+ mediaServerItem = serverItem;
+ break;
+ }
+ }
+ }
- String mediaServerId = (String)mediaServerObjectS.get(0);
- return getOne(mediaServerId);
+ return mediaServerItem;
}
/**
@@ -488,40 +565,51 @@
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
String protocol = sslEnabled ? "https" : "http";
String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
- String recordHookPrex = null;
- if (mediaServerItem.getRecordAssistPort() != 0) {
- recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaServerItem.getRecordAssistPort());
- }
+
Map<String, Object> param = new HashMap<>();
param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
- param.put("ffmpeg.cmd","%s -fflags nobuffer -i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s");
+ if (mediaServerItem.getRtspPort() != 0) {
+ param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
+ }
param.put("hook.enable","1");
- param.put("hook.on_flow_report",String.format("%s/on_flow_report", hookPrex));
+ param.put("hook.on_flow_report","");
param.put("hook.on_play",String.format("%s/on_play", hookPrex));
- param.put("hook.on_http_access",String.format("%s/on_http_access", hookPrex));
+ param.put("hook.on_http_access","");
param.put("hook.on_publish", String.format("%s/on_publish", hookPrex));
- param.put("hook.on_record_mp4",recordHookPrex != null? String.format("%s/on_record_mp4", recordHookPrex): "");
- param.put("hook.on_record_ts",String.format("%s/on_record_ts", hookPrex));
- param.put("hook.on_rtsp_auth",String.format("%s/on_rtsp_auth", hookPrex));
- param.put("hook.on_rtsp_realm",String.format("%s/on_rtsp_realm", hookPrex));
+ param.put("hook.on_record_ts","");
+ param.put("hook.on_rtsp_auth","");
+ param.put("hook.on_rtsp_realm","");
param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrex));
- param.put("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex));
+ param.put("hook.on_shell_login","");
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.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrex));
+ param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrex));
+ if (mediaServerItem.getRecordAssistPort() > 0) {
+ param.put("hook.on_record_mp4",String.format("http://127.0.0.1:%s/api/record/on_record_mp4", mediaServerItem.getRecordAssistPort()));
+ }else {
+ param.put("hook.on_record_mp4","");
+ }
param.put("hook.timeoutSec","20");
- param.put("general.streamNoneReaderDelayMS",mediaServerItem.getStreamNoneReaderDelayMS()==-1?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
// 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆�
// 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
// 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
// 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
- param.put("general.continue_push_ms", "3000" );
+ param.put("protocol.continue_push_ms", "3000" );
// 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
// 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
- param.put("general.wait_track_ready_ms", "3000" );
- if (mediaServerItem.isRtpEnable() && !StringUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
+// param.put("general.wait_track_ready_ms", "3000" );
+ if (mediaServerItem.isRtpEnable() && !ObjectUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
+ }
+
+ if (userSetting.getRecordPath() != null) {
+ File recordPathFile = new File(userSetting.getRecordPath());
+ File mp4SavePathFile = recordPathFile.getParentFile().getAbsoluteFile();
+ param.put("protocol.mp4_save_path", mp4SavePathFile.getAbsoluteFile());
+ param.put("record.appName", recordPathFile.getName());
}
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
@@ -547,12 +635,9 @@
@Override
- public WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret) {
- WVPResult<MediaServerItem> result = new WVPResult<>();
+ public MediaServerItem checkMediaServer(String ip, int port, String secret) {
if (mediaServerMapper.queryOneByHostAndPort(ip, port) != null) {
- result.setCode(-1);
- result.setMsg("姝よ繛鎺ュ凡瀛樺湪");
- return result;
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "姝よ繛鎺ュ凡瀛樺湪");
}
MediaServerItem mediaServerItem = new MediaServerItem();
mediaServerItem.setIp(ip);
@@ -560,21 +645,15 @@
mediaServerItem.setSecret(secret);
JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
if (responseJSON == null) {
- result.setCode(-1);
- result.setMsg("杩炴帴澶辫触");
- return result;
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "杩炴帴澶辫触");
}
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;
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "璇诲彇閰嶇疆澶辫触");
}
if (mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()) != null) {
- result.setCode(-1);
- result.setMsg("濯掍綋鏈嶅姟ID [" + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
- return result;
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "濯掍綋鏈嶅姟ID [" + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
}
mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpPort());
mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort());
@@ -583,13 +662,9 @@
mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
mediaServerItem.setStreamIp(ip);
- mediaServerItem.setHookIp(sipConfig.getIp());
+ mediaServerItem.setHookIp(sipConfig.getIp().split(",")[0]);
mediaServerItem.setSdpIp(ip);
- mediaServerItem.setStreamNoneReaderDelayMS(zlmServerConfig.getGeneralStreamNoneReaderDelayMS());
- result.setCode(0);
- result.setMsg("鎴愬姛");
- result.setData(mediaServerItem);
- return result;
+ return mediaServerItem;
}
@Override
@@ -613,9 +688,9 @@
@Override
public void delete(String id) {
- RedisUtil.zRemove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId(), id);
+ redisTemplate.opsForZSet().remove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId(), id);
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + id;
- RedisUtil.del(key);
+ redisTemplate.delete(key);
}
@Override
public void deleteDb(String id){
@@ -624,27 +699,25 @@
}
@Override
- public void updateMediaServerKeepalive(String mediaServerId, JSONObject data) {
+ public void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data) {
MediaServerItem mediaServerItem = getOne(mediaServerId);
if (mediaServerItem == null) {
// 缂撳瓨涓嶅瓨鍦紝浠庢暟鎹簱鏌ヨ锛屽鏋滄暟鎹簱涓嶅瓨鍦ㄥ垯鏄敊璇殑
- MediaServerItem mediaServerItemFromDatabase = getOneFromDatabase(mediaServerId);
- if (mediaServerItemFromDatabase == null) {
+ mediaServerItem = getOneFromDatabase(mediaServerId);
+ if (mediaServerItem == null) {
+ logger.warn("[鏇存柊ZLM 淇濇椿淇℃伅] 娴佸獟浣搟}灏氭湭鍔犲叆浣跨敤,璇锋鏌ヨ妭鐐逛腑鏄惁鍚湁姝ゆ祦濯掍綋 ", mediaServerId);
return;
}
// zlm杩炴帴閲嶈瘯
- logger.warn("[鏇存柊ZLM 淇濇椿淇℃伅]澶辫触锛屾湭鎵惧埌娴佸獟浣撲俊鎭�,灏濊瘯閲嶈繛zlm");
-// reloadZlm();
- mediaServerItem = getOne(mediaServerId);
- if (mediaServerItem == null) {
- // zlm杩炴帴閲嶈瘯
- logger.warn("[鏇存柊ZLM 淇濇椿淇℃伅]澶辫触锛屾湭鎵惧埌娴佸獟浣撲俊鎭�");
- return;
- }
+ logger.warn("[鏇存柊ZLM 淇濇椿淇℃伅]灏濊瘯閾炬帴zml id {}", mediaServerId);
+ ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
+ redisTemplate.opsForValue().set(key, mediaServerItem);
+ clearRTPServer(mediaServerItem);
}
- String key = VideoManagerConstants.MEDIA_SERVER_KEEPALIVE_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
- int hookAliveInterval = mediaServerItem.getHookAliveInterval() + 2;
- RedisUtil.set(key, data, hookAliveInterval);
+ final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId();
+ dynamicTask.stop(zlmKeepaliveKey);
+ dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(mediaServerItem), (mediaServerItem.getHookAliveInterval().intValue() + 5) * 1000);
}
private MediaServerItem getOneFromDatabase(String mediaServerId) {
@@ -666,4 +739,111 @@
}
}
}
+
+ @Override
+ public boolean checkRtpServer(MediaServerItem mediaServerItem, String app, String stream) {
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaServerItem, stream);
+ if(rtpInfo.getInteger("code") == 0){
+ return rtpInfo.getBoolean("exist");
+ }
+ return false;
+ }
+
+ @Override
+ public MediaServerLoad getLoad(MediaServerItem mediaServerItem) {
+ MediaServerLoad result = new MediaServerLoad();
+ result.setId(mediaServerItem.getId());
+ result.setPush(redisCatchStorage.getPushStreamCount(mediaServerItem.getId()));
+ result.setProxy(redisCatchStorage.getProxyStreamCount(mediaServerItem.getId()));
+
+ result.setGbReceive(inviteStreamService.getStreamInfoCount(mediaServerItem.getId()));
+ result.setGbSend(redisCatchStorage.getGbSendCount(mediaServerItem.getId()));
+ return result;
+ }
+
+ @Override
+ public List<RecordFile> getRecords(String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) {
+ Assert.notNull(app, "app涓嶅瓨鍦�");
+ Assert.notNull(stream, "stream涓嶅瓨鍦�");
+ Assert.notNull(startTime, "startTime涓嶅瓨鍦�");
+ Assert.notNull(endTime, "endTime涓嶅瓨鍦�");
+ Assert.notEmpty(mediaServerItems, "娴佸獟浣撳垪琛ㄤ负绌�");
+
+ CompletableFuture[] completableFutures = new CompletableFuture[mediaServerItems.size()];
+ for (int i = 0; i < mediaServerItems.size(); i++) {
+ completableFutures[i] = getRecordFilesForOne(app, stream, startTime, endTime, mediaServerItems.get(i));
+ }
+ List<RecordFile> result = new ArrayList<>();
+ for (int i = 0; i < completableFutures.length; i++) {
+ try {
+ List<RecordFile> list = (List<RecordFile>) completableFutures[i].get();
+ if (!list.isEmpty()) {
+ for (int g = 0; g < list.size(); g++) {
+ list.get(g).setMediaServerId(mediaServerItems.get(i).getId());
+ }
+ result.addAll(list);
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ Comparator<RecordFile> comparator = Comparator.comparing(RecordFile::getFileName);
+ result.sort(comparator);
+ return result;
+ }
+
+ @Override
+ public List<String> getRecordDates(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems) {
+ Assert.notNull(app, "app涓嶅瓨鍦�");
+ Assert.notNull(stream, "stream涓嶅瓨鍦�");
+ Assert.notEmpty(mediaServerItems, "娴佸獟浣撳垪琛ㄤ负绌�");
+ CompletableFuture[] completableFutures = new CompletableFuture[mediaServerItems.size()];
+
+ for (int i = 0; i < mediaServerItems.size(); i++) {
+ completableFutures[i] = getRecordDatesForOne(app, stream, year, month, mediaServerItems.get(i));
+ }
+ List<String> result = new ArrayList<>();
+ CompletableFuture.allOf(completableFutures).join();
+ for (CompletableFuture completableFuture : completableFutures) {
+ try {
+ List<String> list = (List<String>) completableFuture.get();
+ result.addAll(list);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ Collections.sort(result);
+ return result;
+ }
+
+ @Async
+ public CompletableFuture<List<String>> getRecordDatesForOne(String app, String stream, int year, int month, MediaServerItem mediaServerItem) {
+ JSONObject fileListJson = assistRESTfulUtils.getDateList(mediaServerItem, app, stream, year, month);
+ if (fileListJson != null && !fileListJson.isEmpty()) {
+ if (fileListJson.getString("code") != null && fileListJson.getInteger("code") == 0) {
+ JSONArray data = fileListJson.getJSONArray("data");
+ return CompletableFuture.completedFuture(data.toJavaList(String.class));
+ }
+ }
+ return CompletableFuture.completedFuture(new ArrayList<>());
+ }
+
+ @Async
+ public CompletableFuture<List<RecordFile>> getRecordFilesForOne(String app, String stream, String startTime, String endTime, MediaServerItem mediaServerItem) {
+ JSONObject fileListJson = assistRESTfulUtils.getFileList(mediaServerItem, 1, 100000000, app, stream, startTime, endTime);
+ if (fileListJson != null && !fileListJson.isEmpty()) {
+ if (fileListJson.getString("code") != null && fileListJson.getInteger("code") == 0) {
+ JSONObject data = fileListJson.getJSONObject("data");
+ JSONArray list = data.getJSONArray("list");
+ if (list != null) {
+ return CompletableFuture.completedFuture(list.toJavaList(RecordFile.class));
+ }
+ }
+ }
+ return CompletableFuture.completedFuture(new ArrayList<>());
+ }
}
--
Gitblit v1.8.0