From 54b878d2e1e089cdeb7a957b78aa1f4cbdd6da6c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 22:43:45 +0800
Subject: [PATCH] 优化代码，升级版本号为2.7.1
---
数据库/2.7.1/初始化-postgresql-kingbase-2.7.0.sql | 1
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java | 2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java | 48 ++++
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 164 +++----------
src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java | 50 ++++
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java | 2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java | 78 ++----
数据库/2.7.1/更新-mysql-2.7.0.sql | 0
pom.xml | 2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 6
/dev/null | 324 ---------------------------
数据库/2.7.1/初始化-mysql-2.7.0.sql | 1
src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java | 2
src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java | 10
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 2
数据库/2.7.1/更新-postgresql-kingbase-2.7.0.sql | 0
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 2
src/main/java/com/genersoft/iot/vmp/service/IPlayService.java | 3
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java | 2
src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java | 5
src/main/resources/application.yml | 2
21 files changed, 195 insertions(+), 511 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7ec73b8..df841d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.7.0</version>
+ <version>2.7.1</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
<packaging>${project.packaging}</packaging>
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
index d1eb5d3..5410d67 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
@@ -3,6 +3,9 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.gb28181.bean.AudioBroadcastCatch;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -25,12 +28,15 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
+import javax.sip.SipException;
import javax.sip.address.SipURI;
import javax.sip.header.CallIdHeader;
import javax.sip.header.FromHeader;
import javax.sip.header.HeaderAddress;
import javax.sip.header.ToHeader;
+import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;
@@ -115,19 +121,24 @@
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(fromUserId);
if (parentPlatform != null) {
- Map<String, Object> param = getSendRtpParam(sendRtpItem);
if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
RequestPushStreamMsg requestPushStreamMsg = RequestPushStreamMsg.getInstance(
sendRtpItem.getMediaServerId(), sendRtpItem.getApp(), sendRtpItem.getStream(),
sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isTcp(),
sendRtpItem.getLocalPort(), sendRtpItem.getPt(), sendRtpItem.isUsePs(), sendRtpItem.isOnlyAudio());
redisGbPlayMsgListener.sendMsgForStartSendRtpStream(sendRtpItem.getServerId(), requestPushStreamMsg, json -> {
- playService.startSendRtpStreamHand(sendRtpItem, parentPlatform, json, param, callIdHeader);
+ playService.startSendRtpStreamFailHand(sendRtpItem, parentPlatform, callIdHeader);
});
} else {
- JSONObject startSendRtpStreamResult = sendRtp(sendRtpItem, mediaInfo, param);
- if (startSendRtpStreamResult != null) {
- playService.startSendRtpStreamHand(sendRtpItem, parentPlatform, startSendRtpStreamResult, param, callIdHeader);
+ try {
+ if (sendRtpItem.isTcpActive()) {
+ mediaServerService.startSendRtpPassive(mediaInfo, parentPlatform, sendRtpItem, null);
+ } else {
+ mediaServerService.startSendRtpStream(mediaInfo, parentPlatform, sendRtpItem);
+ }
+ }catch (ControllerException e) {
+ logger.error("RTP鎺ㄦ祦澶辫触: {}", e.getMessage());
+ playService.startSendRtpStreamFailHand(sendRtpItem, parentPlatform, callIdHeader);
}
}
}else {
@@ -144,56 +155,17 @@
logger.warn("[鏀跺埌ACK]锛氭潵鑷獅}锛岀洰鏍囦负({})鐨勬帹娴佷俊鎭负鎵惧埌娴佷綋鏈嶅姟[{}]淇℃伅",fromUserId, toUserId, sendRtpItem.getMediaServerId());
return;
}
- Map<String, Object> param = getSendRtpParam(sendRtpItem);
- JSONObject startSendRtpStreamResult = sendRtp(sendRtpItem, mediaInfo, param);
- if (startSendRtpStreamResult != null) {
- playService.startSendRtpStreamHand(sendRtpItem, device, startSendRtpStreamResult, param, callIdHeader);
+ try {
+ if (sendRtpItem.isTcpActive()) {
+ mediaServerService.startSendRtpPassive(mediaInfo, null, sendRtpItem, null);
+ } else {
+ mediaServerService.startSendRtpStream(mediaInfo, null, sendRtpItem);
+ }
+ }catch (ControllerException e) {
+ logger.error("RTP鎺ㄦ祦澶辫触: {}", e.getMessage());
+ playService.startSendRtpStreamFailHand(sendRtpItem, null, callIdHeader);
}
}
- }
-
- private Map<String, Object> getSendRtpParam(SendRtpItem sendRtpItem) {
- String isUdp = sendRtpItem.isTcp() ? "0" : "1";
- Map<String, Object> param = new HashMap<>(12);
- param.put("vhost","__defaultVhost__");
- param.put("app",sendRtpItem.getApp());
- param.put("stream",sendRtpItem.getStream());
- param.put("ssrc", sendRtpItem.getSsrc());
- param.put("dst_url",sendRtpItem.getIp());
- param.put("dst_port", sendRtpItem.getPort());
- param.put("src_port", sendRtpItem.getLocalPort());
- param.put("pt", sendRtpItem.getPt());
- param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
- param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
- param.put("is_udp", isUdp);
- if (!sendRtpItem.isTcp()) {
- // udp妯″紡涓嬪紑鍚痳tcp淇濇椿
- param.put("udp_rtcp_timeout", sendRtpItem.isRtcp()? "1":"0");
- }
- return param;
- }
-
- private JSONObject sendRtp(SendRtpItem sendRtpItem, MediaServer mediaInfo, Map<String, Object> param){
- JSONObject startSendRtpStreamResult = null;
- if (sendRtpItem.getLocalPort() != 0) {
- if (sendRtpItem.isTcpActive()) {
- startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
- }else {
- param.put("dst_url", sendRtpItem.getIp());
- param.put("dst_port", sendRtpItem.getPort());
- startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
- }
- }else {
- if (sendRtpItem.isTcpActive()) {
- startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
- }else {
- param.put("dst_url", sendRtpItem.getIp());
- param.put("dst_port", sendRtpItem.getPort());
- startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
- }
- }
- return startSendRtpStreamResult;
-
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index 7303594..b4d183e 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -641,7 +641,7 @@
CallIdHeader callIdHeader, MediaServer mediaServerItem,
int port, Boolean tcpActive, boolean mediaTransmissionTCP,
String channelId, String addressStr, String ssrc, String requesterId) {
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, gbStream.getApp(), gbStream.getStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, gbStream.getApp(), gbStream.getStream());
if (streamReady != null && streamReady) {
// 鑷钩鍙板唴瀹�
SendRtpItem sendRtpItem = zlmServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId,
@@ -681,7 +681,7 @@
String channelId, String addressStr, String ssrc, String requesterId) {
// 鎺ㄦ祦
if (streamPushItem.isSelf()) {
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, gbStream.getApp(), gbStream.getStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, gbStream.getApp(), gbStream.getStream());
if (streamReady != null && streamReady) {
// 鑷钩鍙板唴瀹�
SendRtpItem sendRtpItem = zlmServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId,
@@ -1108,7 +1108,7 @@
redisCatchStorage.updateSendRTPSever(sendRtpItem);
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, broadcastCatch.getApp(), broadcastCatch.getStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, broadcastCatch.getApp(), broadcastCatch.getStream());
if (streamReady) {
sendOk(device, sendRtpItem, sdp, request, mediaServerItem, mediaTransmissionTCP, gb28181Sdp.getSsrc());
} else {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
index 4b6b221..8739938 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
@@ -53,4 +54,8 @@
Boolean delStreamProxy(MediaServer mediaServer, String streamKey);
Map<String, String> getFFmpegCMDs(MediaServer mediaServer);
+
+ void startSendRtpPassive(MediaServer mediaServer, SendRtpItem sendRtpItem, Integer timeout);
+
+ void startSendRtpStream(MediaServer mediaServer, SendRtpItem sendRtpItem);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
index 2a72eb4..fb56ab6 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
@@ -2,6 +2,8 @@
import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
@@ -133,5 +135,11 @@
* @param stream
* @return
*/
- StreamInfo getStreamInfoByAppAndStream(MediaServer mediaServerItem, String app, String stream, MediaInfo mediaInfo, String addr, String callId, boolean isPlay);
+ StreamInfo getStreamInfoByAppAndStream(MediaServer mediaServer, String app, String stream, MediaInfo mediaInfo, String addr, String callId, boolean isPlay);
+
+ Boolean isStreamReady(MediaServer mediaServer, String rtp, String streamId);
+
+ void startSendRtpPassive(MediaServer mediaServer, ParentPlatform platform, SendRtpItem sendRtpItem, Integer timeout);
+
+ void startSendRtpStream(MediaServer mediaServer, ParentPlatform platform, SendRtpItem sendRtpItem);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
index 1b5d109..5e91151 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
@@ -7,6 +7,9 @@
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.gb28181.bean.InviteStreamType;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
@@ -19,6 +22,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
+import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
@@ -784,4 +788,50 @@
streamInfoResult.setMediaInfo(mediaInfo);
return streamInfoResult;
}
+
+ @Override
+ public Boolean isStreamReady(MediaServer mediaServer, String rtp, String streamId) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[isStreamReady] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return false;
+ }
+ MediaInfo mediaInfo = mediaNodeServerService.getMediaInfo(mediaServer, rtp, streamId);
+ return mediaInfo != null;
+ }
+
+ @Override
+ public void startSendRtpPassive(MediaServer mediaServer, ParentPlatform platform, SendRtpItem sendRtpItem, Integer timeout) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[startSendRtpPassive] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒癿ediaServer瀵瑰簲鐨勫疄鐜扮被");
+ }
+ mediaNodeServerService.startSendRtpPassive(mediaServer, sendRtpItem, timeout);
+ sendPlatformStartPlayMsg(platform, sendRtpItem);
+ }
+
+ @Override
+ public void startSendRtpStream(MediaServer mediaServer, ParentPlatform platform, SendRtpItem sendRtpItem) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[startSendRtpStream] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒癿ediaServer瀵瑰簲鐨勫疄鐜扮被");
+ }
+ logger.info("[寮�濮嬫帹娴乚 rtp/{}, 鐩爣={}:{}锛孲SRC={}, RTCP={}", sendRtpItem.getStream(),
+ sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isRtcp());
+ mediaNodeServerService.startSendRtpStream(mediaServer, sendRtpItem);
+ sendPlatformStartPlayMsg(platform, sendRtpItem);
+
+ }
+
+ private void sendPlatformStartPlayMsg(ParentPlatform platform, SendRtpItem sendRtpItem) {
+ if (sendRtpItem.getPlayType() == InviteStreamType.PUSH && platform != null) {
+ MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0, sendRtpItem.getApp(), sendRtpItem.getStream(),
+ sendRtpItem.getChannelId(), platform.getServerGBId(), platform.getName(), userSetting.getServerId(),
+ sendRtpItem.getMediaServerId());
+ messageForPushChannel.setPlatFormIndex(platform.getId());
+ redisCatchStorage.sendPlatformStartPlayMsg(messageForPushChannel);
+ }
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
index 8c5f80e..84df2e7 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
@@ -92,7 +92,7 @@
public void sendStreamEvent(String app, String stream, String mediaServerId) {
MediaServer mediaServerItem = mediaServerService.getOne(mediaServerId);
// 鏌ョ湅鎺ㄦ祦鐘舵��
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, app, stream);
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, app, stream);
if (streamReady != null && streamReady) {
ChannelOnlineEvent channelOnlineEventLister = getChannelOnlineEventLister(app, stream);
if (channelOnlineEventLister != null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
index 72f3ba1..707ea01 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
@@ -6,6 +6,7 @@
import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.service.IMediaNodeServerService;
import com.genersoft.iot.vmp.media.bean.MediaServer;
@@ -298,4 +299,51 @@
}
return result;
}
+
+ @Override
+ public void startSendRtpPassive(MediaServer mediaServer, SendRtpItem sendRtpItem, Integer timeout) {
+ Map<String, Object> param = new HashMap<>(12);
+ param.put("vhost","__defaultVhost__");
+ param.put("app", sendRtpItem.getApp());
+ param.put("stream", sendRtpItem.getStream());
+ param.put("ssrc", sendRtpItem.getSsrc());
+ param.put("src_port", sendRtpItem.getLocalPort());
+ param.put("pt", sendRtpItem.getPt());
+ param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
+ param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
+ param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
+ param.put("recv_stream_id", sendRtpItem.getReceiveStream());
+ if (timeout != null) {
+ param.put("close_delay_ms", timeout);
+ }
+
+ JSONObject jsonObject = zlmServerFactory.startSendRtpPassive(mediaServer, param, null);
+ if (jsonObject == null || jsonObject.getInteger("code") != 0 ) {
+ throw new ControllerException(jsonObject.getInteger("code"), jsonObject.getString("msg"));
+ }
+ }
+
+ @Override
+ public void startSendRtpStream(MediaServer mediaServer, SendRtpItem sendRtpItem) {
+ Map<String, Object> param = new HashMap<>(12);
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", sendRtpItem.getApp());
+ param.put("stream", sendRtpItem.getStream());
+ param.put("ssrc", sendRtpItem.getSsrc());
+ param.put("src_port", sendRtpItem.getLocalPort());
+ param.put("pt", sendRtpItem.getPt());
+ param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
+ param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
+ param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
+ if (!sendRtpItem.isTcp()) {
+ // udp妯″紡涓嬪紑鍚痳tcp淇濇椿
+ param.put("udp_rtcp_timeout", sendRtpItem.isRtcp() ? "1" : "0");
+ }
+ param.put("dst_url", sendRtpItem.getIp());
+ param.put("dst_port", sendRtpItem.getPort());
+ JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServer, param);
+ if (jsonObject == null || jsonObject.getInteger("code") != 0 ) {
+ throw new ControllerException(jsonObject.getInteger("code"), jsonObject.getString("msg"));
+ }
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
index e4f80af..b3cab0e 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
@@ -59,8 +59,7 @@
void startPushStream(SendRtpItem sendRtpItem, SIPResponse sipResponse, ParentPlatform platform, CallIdHeader callIdHeader);
- void startSendRtpStreamHand(SendRtpItem sendRtpItem, Object correlationInfo,
- JSONObject jsonObject, Map<String, Object> param, CallIdHeader callIdHeader);
+ void startSendRtpStreamFailHand(SendRtpItem sendRtpItem,ParentPlatform platform, CallIdHeader callIdHeader);
void talkCmd(Device device, String channelId, MediaServer mediaServerItem, String stream, AudioBroadcastEvent event);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
index fb728bc..aa39f41 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
@@ -512,7 +512,7 @@
// 濡傛灉zlm涓嶅瓨鍦ㄨ繖涓祦锛屽垯鍒犻櫎鏁版嵁鍗冲彲
MediaServer mediaServerItemForStreamInfo = mediaServerService.getOne(inviteInfoForOld.getStreamInfo().getMediaServerId());
if (mediaServerItemForStreamInfo != null) {
- Boolean ready = zlmServerFactory.isStreamReady(mediaServerItemForStreamInfo, inviteInfoForOld.getStreamInfo().getApp(), inviteInfoForOld.getStreamInfo().getStream());
+ Boolean ready = mediaServerService.isStreamReady(mediaServerItemForStreamInfo, inviteInfoForOld.getStreamInfo().getApp(), inviteInfoForOld.getStreamInfo().getStream());
if (!ready) {
// 閿欒瀛樺湪浜巖edis涓殑鏁版嵁
inviteStreamService.removeInviteInfo(inviteInfoForOld);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 816f17f..7406483 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -85,9 +85,6 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
- private ZLMServerFactory zlmServerFactory;
-
- @Autowired
private IInviteStreamService inviteStreamService;
@Autowired
@@ -302,8 +299,7 @@
}
String mediaServerId = streamInfo.getMediaServerId();
MediaServer mediaInfo = mediaServerService.getOne(mediaServerId);
-
- Boolean ready = zlmServerFactory.isStreamReady(mediaInfo, "rtp", streamId);
+ Boolean ready = mediaServerService.isStreamReady(mediaInfo, "rtp", streamId);
if (ready != null && ready) {
callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,
@@ -391,28 +387,15 @@
}
}, userSetting.getPlayTimeout());
- Map<String, Object> param = new HashMap<>(12);
- param.put("vhost","__defaultVhost__");
- param.put("app", sendRtpItem.getApp());
- param.put("stream", sendRtpItem.getStream());
- param.put("ssrc", sendRtpItem.getSsrc());
- param.put("src_port", sendRtpItem.getLocalPort());
- param.put("pt", sendRtpItem.getPt());
- param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
- param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
- param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
- param.put("recv_stream_id", sendRtpItem.getReceiveStream());
- param.put("close_delay_ms", userSetting.getPlayTimeout() * 1000);
-
- zlmServerFactory.startSendRtpPassive(mediaServerItem, param, jsonObject -> {
- if (jsonObject == null || jsonObject.getInteger("code") != 0 ) {
- mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
- logger.info("[璇煶瀵硅]澶辫触 deviceId: {}, channelId: {}", device.getDeviceId(), channelId);
- audioEvent.call("澶辫触, " + jsonObject.getString("msg"));
- // 鏌ョ湅鏄惁宸茬粡寤虹珛浜嗛�氶亾锛屽瓨鍦ㄥ垯鍙戦�乥ye
- stopTalk(device, channelId);
- }
- });
+ try {
+ mediaServerService.startSendRtpPassive(mediaServerItem, null, sendRtpItem, userSetting.getPlayTimeout() * 1000);
+ }catch (ControllerException e) {
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
+ logger.info("[璇煶瀵硅]澶辫触 deviceId: {}, channelId: {}", device.getDeviceId(), channelId);
+ audioEvent.call("澶辫触, " + e.getMessage());
+ // 鏌ョ湅鏄惁宸茬粡寤虹珛浜嗛�氶亾锛屽瓨鍦ㄥ垯鍙戦�乥ye
+ stopTalk(device, channelId);
+ }
// 鏌ョ湅璁惧鏄惁宸茬粡鍦ㄦ帹娴�
@@ -1238,7 +1221,7 @@
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, null, null);
if (sendRtpItem != null && sendRtpItem.isOnlyAudio()) {
// 鏌ヨ娴佹槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯璁や负鏄紓甯哥姸鎬�
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, sendRtpItem.getApp(), sendRtpItem.getStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, sendRtpItem.getApp(), sendRtpItem.getStream());
if (streamReady) {
logger.warn("璇煶骞挎挱宸茬粡寮�鍚細 {}", channelId);
event.call("璇煶骞挎挱宸茬粡寮�鍚�");
@@ -1248,18 +1231,6 @@
}
}
}
-// SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, null, null);
-// if (sendRtpItem != null) {
-// MediaServerItem mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
-// Boolean streamReady = zlmServerFactory.isStreamReady(mediaServer, sendRtpItem.getApp(), sendRtpItem.getStream());
-// if (streamReady) {
-// logger.warn("[璇煶瀵硅] 杩涜涓細 {}", channelId);
-// event.call("璇煶瀵硅杩涜涓�");
-// return false;
-// } else {
-// stopTalk(device, channelId);
-// }
-// }
// 鍙戦�侀�氱煡
cmder.audioBroadcastCmd(device, channelId, eventResultForOk -> {
@@ -1291,7 +1262,7 @@
if (sendRtpItem != null && sendRtpItem.isOnlyAudio()) {
// 鏌ヨ娴佹槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯璁や负鏄紓甯哥姸鎬�
MediaServer mediaServerServiceOne = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerServiceOne, sendRtpItem.getApp(), sendRtpItem.getStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerServiceOne, sendRtpItem.getApp(), sendRtpItem.getStream());
if (streamReady) {
logger.warn("璇煶骞挎挱閫氶亾浣跨敤涓細 {}", channelId);
return true;
@@ -1447,24 +1418,7 @@
@Override
public void startPushStream(SendRtpItem sendRtpItem, SIPResponse sipResponse, ParentPlatform platform, CallIdHeader callIdHeader) {
// 寮�濮嬪彂娴�
- String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
MediaServer mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- logger.info("[寮�濮嬫帹娴乚 rtp/{}, 鐩爣={}:{}锛孲SRC={}, RTCP={}", sendRtpItem.getStream(),
- sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isRtcp());
- Map<String, Object> param = new HashMap<>(12);
- param.put("vhost", "__defaultVhost__");
- param.put("app", sendRtpItem.getApp());
- param.put("stream", sendRtpItem.getStream());
- param.put("ssrc", sendRtpItem.getSsrc());
- param.put("src_port", sendRtpItem.getLocalPort());
- param.put("pt", sendRtpItem.getPt());
- param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
- param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
- param.put("is_udp", is_Udp);
- if (!sendRtpItem.isTcp()) {
- // udp妯″紡涓嬪紑鍚痳tcp淇濇椿
- param.put("udp_rtcp_timeout", sendRtpItem.isRtcp() ? "1" : "0");
- }
if (mediaInfo == null) {
RequestPushStreamMsg requestPushStreamMsg = RequestPushStreamMsg.getInstance(
@@ -1472,75 +1426,50 @@
sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isTcp(),
sendRtpItem.getLocalPort(), sendRtpItem.getPt(), sendRtpItem.isUsePs(), sendRtpItem.isOnlyAudio());
redisGbPlayMsgListener.sendMsgForStartSendRtpStream(sendRtpItem.getServerId(), requestPushStreamMsg, json -> {
- startSendRtpStreamHand(sendRtpItem, platform, json, param, callIdHeader);
+ startSendRtpStreamFailHand(sendRtpItem, platform, callIdHeader);
});
} else {
- // 濡傛灉鏄弗鏍兼ā寮忥紝闇�瑕佸叧闂鍙ｅ崰鐢�
- JSONObject startSendRtpStreamResult = null;
- if (sendRtpItem.getLocalPort() != 0) {
+ try {
if (sendRtpItem.isTcpActive()) {
- startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
+ mediaServerService.startSendRtpPassive(mediaInfo, platform, sendRtpItem, null);
} else {
- param.put("dst_url", sendRtpItem.getIp());
- param.put("dst_port", sendRtpItem.getPort());
- startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
+ mediaServerService.startSendRtpStream(mediaInfo, platform, sendRtpItem);
}
- } else {
- if (sendRtpItem.isTcpActive()) {
- startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
- } else {
- param.put("dst_url", sendRtpItem.getIp());
- param.put("dst_port", sendRtpItem.getPort());
- startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
- }
+ }catch (ControllerException e) {
+ logger.error("RTP鎺ㄦ祦澶辫触: {}", e.getMessage());
+ startSendRtpStreamFailHand(sendRtpItem, platform, callIdHeader);
+ return;
}
- if (startSendRtpStreamResult != null) {
- startSendRtpStreamHand(sendRtpItem, platform, startSendRtpStreamResult, param, callIdHeader);
- }
+
+ logger.info("RTP鎺ㄦ祦鎴愬姛[ {}/{} ]锛寋}, ", sendRtpItem.getApp(), sendRtpItem.getStream(),
+ sendRtpItem.isTcpActive()?"琚姩鍙戞祦": sendRtpItem.getIp() + ":" + sendRtpItem.getPort());
+
}
}
@Override
- public void startSendRtpStreamHand(SendRtpItem sendRtpItem, Object correlationInfo,
- JSONObject jsonObject, Map<String, Object> param, CallIdHeader callIdHeader) {
- if (jsonObject == null) {
- logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
- } else if (jsonObject.getInteger("code") == 0) {
- logger.info("璋冪敤ZLM鎺ㄦ祦鎺ュ彛, 缁撴灉锛� {}", jsonObject);
- logger.info("RTP鎺ㄦ祦鎴愬姛[ {}/{} ]锛寋}->{}, ", param.get("app"), param.get("stream"), jsonObject.getString("local_port"),
- sendRtpItem.isTcpActive()?"琚姩鍙戞祦": param.get("dst_url") + ":" + param.get("dst_port"));
- if (sendRtpItem.getPlayType() == InviteStreamType.PUSH && correlationInfo instanceof ParentPlatform) {
- ParentPlatform platform = (ParentPlatform)correlationInfo;
- MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0, sendRtpItem.getApp(), sendRtpItem.getStream(),
- sendRtpItem.getChannelId(), platform.getServerGBId(), platform.getName(), userSetting.getServerId(),
- sendRtpItem.getMediaServerId());
- messageForPushChannel.setPlatFormIndex(platform.getId());
- redisCatchStorage.sendPlatformStartPlayMsg(messageForPushChannel);
+ public void startSendRtpStreamFailHand(SendRtpItem sendRtpItem, ParentPlatform platform, CallIdHeader callIdHeader) {
+ if (sendRtpItem.isOnlyAudio()) {
+ Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
+ if (audioBroadcastCatch != null) {
+ try {
+ cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);
+ } catch (SipException | ParseException | InvalidArgumentException |
+ SsrcTransactionNotFoundException exception) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍋滄璇煶瀵硅: {}", exception.getMessage());
+ }
}
} else {
- logger.error("RTP鎺ㄦ祦澶辫触: {}, 鍙傛暟锛歿}", jsonObject.getString("msg"), JSONObject.toJSONString(param));
- if (sendRtpItem.isOnlyAudio()) {
- Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
- AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
- if (audioBroadcastCatch != null) {
- try {
- cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);
- } catch (SipException | ParseException | InvalidArgumentException |
- SsrcTransactionNotFoundException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍋滄璇煶瀵硅: {}", e.getMessage());
- }
- }
- } else {
+ if (platform != null) {
// 鍚戜笂绾у钩鍙�
- if (correlationInfo instanceof ParentPlatform) {
- try {
- ParentPlatform parentPlatform = (ParentPlatform)correlationInfo;
- commanderForPlatform.streamByeCmd(parentPlatform, callIdHeader.getCallId());
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
- }
+ try {
+ commanderForPlatform.streamByeCmd(platform, callIdHeader.getCallId());
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
}
}
+
}
}
@@ -1563,7 +1492,7 @@
if (sendRtpItem != null && sendRtpItem.isOnlyAudio()) {
// 鏌ヨ娴佹槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯璁や负鏄紓甯哥姸鎬�
MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServer, sendRtpItem.getApp(), sendRtpItem.getStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServer, sendRtpItem.getApp(), sendRtpItem.getStream());
if (streamReady) {
logger.warn("[璇煶瀵硅] 姝ｅ湪璇煶骞挎挱锛屾棤娉曞紑鍚闊抽�氳瘽锛� {}", channelId);
event.call("姝ｅ湪璇煶骞挎挱");
@@ -1577,7 +1506,7 @@
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, stream, null);
if (sendRtpItem != null) {
MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServer, "rtp", sendRtpItem.getReceiveStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServer, "rtp", sendRtpItem.getReceiveStream());
if (streamReady) {
logger.warn("[璇煶瀵硅] 杩涜涓細 {}", channelId);
event.call("璇煶瀵硅杩涜涓�");
@@ -1624,12 +1553,7 @@
MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
if (streamIsReady == null || streamIsReady) {
- Map<String, Object> param = new HashMap<>();
- param.put("vhost", "__defaultVhost__");
- param.put("app", sendRtpItem.getApp());
- param.put("stream", sendRtpItem.getStream());
- param.put("ssrc", sendRtpItem.getSsrc());
- zlmServerFactory.stopSendRtpStream(mediaServer, param);
+ mediaServerService.stopSendRtp(mediaServer, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc());
}
ssrcFactory.releaseSsrc(mediaServerId, sendRtpItem.getSsrc());
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 0669ff3..6692aa8 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -349,7 +349,7 @@
if (mediaServer == null) {
return null;
}
- if (zlmServerFactory.isStreamReady(mediaServer, param.getApp(), param.getStream())) {
+ if (mediaServerService.isStreamReady(mediaServer, param.getApp(), param.getStream())) {
mediaServerService.closeStreams(mediaServer, param.getApp(), param.getStream());
}
String msgResult;
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
index fd59704..14287e0 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
@@ -274,7 +274,7 @@
return;
}
// 纭畾娴佹槸鍚﹀湪绾�
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, content.getApp(), content.getStream());
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, content.getApp(), content.getStream());
if (streamReady != null && streamReady) {
logger.info("[鍥炲鎺ㄦ祦淇℃伅] {}/{}", content.getApp(), content.getStream());
responseSendItem(mediaServerItem, content, toId, serial);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
index f7807b9..6401a8c 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
@@ -224,7 +224,7 @@
param.put("src_port", sendInfo.getSendLocalPort());
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, app, stream);
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServerItem, app, stream);
if (streamReady) {
JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, param);
if (jsonObject.getInteger("code") == 0) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
index 7bd2310..f42d153 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
@@ -275,7 +275,7 @@
paramForVideo = null;
}
- Boolean streamReady = zlmServerFactory.isStreamReady(mediaServer, app, stream);
+ Boolean streamReady = mediaServerService.isStreamReady(mediaServer, app, stream);
if (streamReady) {
if (paramForVideo != null) {
JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServer, paramForVideo);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3f47844..3d36b84 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@
application:
name: wvp
profiles:
- active: local
\ No newline at end of file
+ active: abl
\ No newline at end of file
diff --git "a/\346\225\260\346\215\256\345\272\223/abl/\345\210\235\345\247\213\345\214\226-mysql-2.7.0.sql" "b/\346\225\260\346\215\256\345\272\223/2.7.1/\345\210\235\345\247\213\345\214\226-mysql-2.7.0.sql"
similarity index 99%
rename from "\346\225\260\346\215\256\345\272\223/abl/\345\210\235\345\247\213\345\214\226-mysql-2.7.0.sql"
rename to "\346\225\260\346\215\256\345\272\223/2.7.1/\345\210\235\345\247\213\345\214\226-mysql-2.7.0.sql"
index 0290a06..d59256b 100644
--- "a/\346\225\260\346\215\256\345\272\223/abl/\345\210\235\345\247\213\345\214\226-mysql-2.7.0.sql"
+++ "b/\346\225\260\346\215\256\345\272\223/2.7.1/\345\210\235\345\247\213\345\214\226-mysql-2.7.0.sql"
@@ -203,6 +203,7 @@
update_time character varying(50),
as_message_channel bool default false,
auto_push_channel bool default false,
+ send_stream_ip character varying(50),
constraint uk_platform_unique_server_gb_id unique (server_gb_id)
);
diff --git "a/\346\225\260\346\215\256\345\272\223/abl/\345\210\235\345\247\213\345\214\226-postgresql-kingbase-2.7.0.sql" "b/\346\225\260\346\215\256\345\272\223/2.7.1/\345\210\235\345\247\213\345\214\226-postgresql-kingbase-2.7.0.sql"
similarity index 99%
rename from "\346\225\260\346\215\256\345\272\223/abl/\345\210\235\345\247\213\345\214\226-postgresql-kingbase-2.7.0.sql"
rename to "\346\225\260\346\215\256\345\272\223/2.7.1/\345\210\235\345\247\213\345\214\226-postgresql-kingbase-2.7.0.sql"
index b2fbea5..992a3cf 100644
--- "a/\346\225\260\346\215\256\345\272\223/abl/\345\210\235\345\247\213\345\214\226-postgresql-kingbase-2.7.0.sql"
+++ "b/\346\225\260\346\215\256\345\272\223/2.7.1/\345\210\235\345\247\213\345\214\226-postgresql-kingbase-2.7.0.sql"
@@ -203,6 +203,7 @@
update_time character varying(50),
as_message_channel bool default false,
auto_push_channel bool default false,
+ send_stream_ip character varying(50),
constraint uk_platform_unique_server_gb_id unique (server_gb_id)
);
diff --git "a/\346\225\260\346\215\256\345\272\223/abl/\346\233\264\346\226\260-postgresql-kingbase-2.7.0.sql" "b/\346\225\260\346\215\256\345\272\223/2.7.1/\346\233\264\346\226\260-mysql-2.7.0.sql"
similarity index 100%
copy from "\346\225\260\346\215\256\345\272\223/abl/\346\233\264\346\226\260-postgresql-kingbase-2.7.0.sql"
copy to "\346\225\260\346\215\256\345\272\223/2.7.1/\346\233\264\346\226\260-mysql-2.7.0.sql"
diff --git "a/\346\225\260\346\215\256\345\272\223/abl/\346\233\264\346\226\260-postgresql-kingbase-2.7.0.sql" "b/\346\225\260\346\215\256\345\272\223/2.7.1/\346\233\264\346\226\260-postgresql-kingbase-2.7.0.sql"
similarity index 100%
rename from "\346\225\260\346\215\256\345\272\223/abl/\346\233\264\346\226\260-postgresql-kingbase-2.7.0.sql"
rename to "\346\225\260\346\215\256\345\272\223/2.7.1/\346\233\264\346\226\260-postgresql-kingbase-2.7.0.sql"
diff --git "a/\346\225\260\346\215\256\345\272\223/abl/\346\233\264\346\226\260-mysql-2.7.0.sql" "b/\346\225\260\346\215\256\345\272\223/abl/\346\233\264\346\226\260-mysql-2.7.0.sql"
deleted file mode 100644
index 8513658..0000000
--- "a/\346\225\260\346\215\256\345\272\223/abl/\346\233\264\346\226\260-mysql-2.7.0.sql"
+++ /dev/null
@@ -1,11 +0,0 @@
-alter table wvp_media_server
- add type character varying(50) default 'zlm';
-
-alter table wvp_media_server
- add flv_port integer;
-alter table wvp_media_server
- add flv_ssl_port integer;
-alter table wvp_media_server
- add ws_flv_port integer;
-alter table wvp_media_server
- add ws_flv_ssl_port integer;
diff --git "a/\346\225\260\346\215\256\345\272\223/\345\210\235\345\247\213\345\214\226-mysql.sql" "b/\346\225\260\346\215\256\345\272\223/\345\210\235\345\247\213\345\214\226-mysql.sql"
deleted file mode 100644
index a3f4a1d..0000000
--- "a/\346\225\260\346\215\256\345\272\223/\345\210\235\345\247\213\345\214\226-mysql.sql"
+++ /dev/null
@@ -1,324 +0,0 @@
-/*寤鸿〃*/
-create table wvp_device (
- id serial primary key ,
- device_id character varying(50) not null ,
- name character varying(255),
- manufacturer character varying(255),
- model character varying(255),
- firmware character varying(255),
- transport character varying(50),
- stream_mode character varying(50),
- on_line bool default false,
- register_time character varying(50),
- keepalive_time character varying(50),
- ip character varying(50),
- create_time character varying(50),
- update_time character varying(50),
- port integer,
- expires integer,
- subscribe_cycle_for_catalog integer DEFAULT 0,
- subscribe_cycle_for_mobile_position integer DEFAULT 0,
- mobile_position_submission_interval integer DEFAULT 5,
- subscribe_cycle_for_alarm integer DEFAULT 0,
- host_address character varying(50),
- charset character varying(50),
- ssrc_check bool default false,
- geo_coord_sys character varying(50),
- media_server_id character varying(50),
- custom_name character varying(255),
- sdp_ip character varying(50),
- local_ip character varying(50),
- password character varying(255),
- as_message_channel bool default false,
- keepalive_interval_time integer,
- switch_primary_sub_stream bool default false,
- broadcast_push_after_ack bool default false,
- constraint uk_device_device unique (device_id)
-);
-
-create table wvp_device_alarm (
- id serial primary key ,
- device_id character varying(50) not null,
- channel_id character varying(50) not null,
- alarm_priority character varying(50),
- alarm_method character varying(50),
- alarm_time character varying(50),
- alarm_description character varying(255),
- longitude double precision,
- latitude double precision,
- alarm_type character varying(50),
- create_time character varying(50) not null
-);
-
-create table wvp_device_channel (
- id serial primary key ,
- channel_id character varying(50) not null,
- name character varying(255),
- custom_name character varying(255),
- manufacture character varying(50),
- model character varying(50),
- owner character varying(50),
- civil_code character varying(50),
- block character varying(50),
- address character varying(50),
- parent_id character varying(50),
- safety_way integer,
- register_way integer,
- cert_num character varying(50),
- certifiable integer,
- err_code integer,
- end_time character varying(50),
- secrecy character varying(50),
- ip_address character varying(50),
- port integer,
- password character varying(255),
- ptz_type integer,
- custom_ptz_type integer,
- status bool default false,
- longitude double precision,
- custom_longitude double precision,
- latitude double precision,
- custom_latitude double precision,
- stream_id character varying(255),
- device_id character varying(50) not null,
- parental character varying(50),
- has_audio bool default false,
- create_time character varying(50) not null,
- update_time character varying(50) not null,
- sub_count integer,
- longitude_gcj02 double precision,
- latitude_gcj02 double precision,
- longitude_wgs84 double precision,
- latitude_wgs84 double precision,
- business_group_id character varying(50),
- gps_time character varying(50),
- stream_identification character varying(50),
- constraint uk_wvp_device_channel_unique_device_channel unique (device_id, channel_id)
-);
-
-create table wvp_device_mobile_position (
- id serial primary key,
- device_id character varying(50) not null,
- channel_id character varying(50) not null,
- device_name character varying(255),
- time character varying(50),
- longitude double precision,
- latitude double precision,
- altitude double precision,
- speed double precision,
- direction double precision,
- report_source character varying(50),
- longitude_gcj02 double precision,
- latitude_gcj02 double precision,
- longitude_wgs84 double precision,
- latitude_wgs84 double precision,
- create_time character varying(50)
-);
-
-create table wvp_gb_stream (
- gb_stream_id serial primary key,
- app character varying(255) not null,
- stream character varying(255) not null,
- gb_id character varying(50) not null,
- name character varying(255),
- longitude double precision,
- latitude double precision,
- stream_type character varying(50),
- media_server_id character varying(50),
- create_time character varying(50),
- constraint uk_gb_stream_unique_gb_id unique (gb_id),
- constraint uk_gb_stream_unique_app_stream unique (app, stream)
-);
-
-create table wvp_log (
- id serial primary key ,
- name character varying(50),
- type character varying(50),
- uri character varying(200),
- address character varying(50),
- result character varying(50),
- timing bigint,
- username character varying(50),
- create_time character varying(50)
-);
-
-create table wvp_media_server (
- id character varying(255) primary key ,
- ip character varying(50),
- hook_ip character varying(50),
- sdp_ip character varying(50),
- stream_ip character varying(50),
- http_port integer,
- http_ssl_port integer,
- rtmp_port integer,
- rtmp_ssl_port integer,
- rtp_proxy_port integer,
- rtsp_port integer,
- rtsp_ssl_port integer,
- auto_config bool default false,
- secret character varying(50),
- rtp_enable bool default false,
- rtp_port_range character varying(50),
- send_rtp_port_range character varying(50),
- record_assist_port integer,
- default_server bool default false,
- create_time character varying(50),
- update_time character varying(50),
- hook_alive_interval integer,
- record_path character varying(255),
- record_day integer default 7,
- constraint uk_media_server_unique_ip_http_port unique (ip, http_port)
-);
-
-create table wvp_platform (
- id serial primary key ,
- enable bool default false,
- name character varying(255),
- server_gb_id character varying(50),
- server_gb_domain character varying(50),
- server_ip character varying(50),
- server_port integer,
- device_gb_id character varying(50),
- device_ip character varying(50),
- device_port character varying(50),
- username character varying(255),
- password character varying(50),
- expires character varying(50),
- keep_timeout character varying(50),
- transport character varying(50),
- character_set character varying(50),
- catalog_id character varying(50),
- ptz bool default false,
- rtcp bool default false,
- status bool default false,
- start_offline_push bool default false,
- administrative_division character varying(50),
- catalog_group integer,
- create_time character varying(50),
- update_time character varying(50),
- as_message_channel bool default false,
- auto_push_channel bool default false,
- constraint uk_platform_unique_server_gb_id unique (server_gb_id)
-);
-
-create table wvp_platform_catalog (
- id character varying(50),
- platform_id character varying(50),
- name character varying(255),
- parent_id character varying(50),
- civil_code character varying(50),
- business_group_id character varying(50),
- constraint uk_platform_catalog_id_platform_id unique (id, platform_id)
-);
-
-create table wvp_platform_gb_channel (
- id serial primary key ,
- platform_id character varying(50),
- catalog_id character varying(50),
- device_channel_id integer,
- constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, catalog_id, device_channel_id)
-);
-
-create table wvp_platform_gb_stream (
- id serial primary key,
- platform_id character varying(50),
- catalog_id character varying(50),
- gb_stream_id integer,
- constraint uk_platform_gb_stream_platform_id_catalog_id_gb_stream_id unique (platform_id, catalog_id, gb_stream_id)
-);
-
-create table wvp_stream_proxy (
- id serial primary key,
- type character varying(50),
- app character varying(255),
- stream character varying(255),
- url character varying(255),
- src_url character varying(255),
- dst_url character varying(255),
- timeout_ms integer,
- ffmpeg_cmd_key character varying(255),
- rtp_type character varying(50),
- media_server_id character varying(50),
- enable_audio bool default false,
- enable_mp4 bool default false,
- enable bool default false,
- status boolean,
- enable_remove_none_reader bool default false,
- create_time character varying(50),
- name character varying(255),
- update_time character varying(50),
- stream_key character varying(255),
- enable_disable_none_reader bool default false,
- constraint uk_stream_proxy_app_stream unique (app, stream)
-);
-
-create table wvp_stream_push (
- id serial primary key,
- app character varying(255),
- stream character varying(255),
- total_reader_count character varying(50),
- origin_type integer,
- origin_type_str character varying(50),
- create_time character varying(50),
- alive_second integer,
- media_server_id character varying(50),
- server_id character varying(50),
- push_time character varying(50),
- status bool default false,
- update_time character varying(50),
- push_ing bool default false,
- self bool default false,
- constraint uk_stream_push_app_stream unique (app, stream)
-);
-create table wvp_cloud_record (
- id serial primary key,
- app character varying(255),
- stream character varying(255),
- call_id character varying(255),
- start_time bigint,
- end_time bigint,
- media_server_id character varying(50),
- file_name character varying(255),
- folder character varying(255),
- file_path character varying(255),
- collect bool default false,
- file_size bigint,
- time_len bigint,
- constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
-);
-
-create table wvp_user (
- id serial primary key,
- username character varying(255),
- password character varying(255),
- role_id integer,
- create_time character varying(50),
- update_time character varying(50),
- push_key character varying(50),
- constraint uk_user_username unique (username)
-);
-
-create table wvp_user_role (
- id serial primary key,
- name character varying(50),
- authority character varying(50),
- create_time character varying(50),
- update_time character varying(50)
-);
-create table wvp_resources_tree (
- id serial primary key ,
- is_catalog bool default true,
- device_channel_id integer ,
- gb_stream_id integer,
- name character varying(255),
- parentId integer,
- path character varying(255)
-);
-
-
-/*鍒濆鏁版嵁*/
-INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
-INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
-
-
-
diff --git "a/\346\225\260\346\215\256\345\272\223/\345\210\235\345\247\213\345\214\226-postgresql-kingbase.sql" "b/\346\225\260\346\215\256\345\272\223/\345\210\235\345\247\213\345\214\226-postgresql-kingbase.sql"
deleted file mode 100644
index 9f41667..0000000
--- "a/\346\225\260\346\215\256\345\272\223/\345\210\235\345\247\213\345\214\226-postgresql-kingbase.sql"
+++ /dev/null
@@ -1,324 +0,0 @@
-/*寤鸿〃*/
-create table wvp_device (
- id serial primary key ,
- device_id character varying(50) not null ,
- name character varying(255),
- manufacturer character varying(255),
- model character varying(255),
- firmware character varying(255),
- transport character varying(50),
- stream_mode character varying(50),
- on_line bool default false,
- register_time character varying(50),
- keepalive_time character varying(50),
- ip character varying(50),
- create_time character varying(50),
- update_time character varying(50),
- port integer,
- expires integer,
- subscribe_cycle_for_catalog integer DEFAULT 0,
- subscribe_cycle_for_mobile_position integer DEFAULT 0,
- mobile_position_submission_interval integer DEFAULT 5,
- subscribe_cycle_for_alarm integer DEFAULT 0,
- host_address character varying(50),
- charset character varying(50),
- ssrc_check bool default false,
- geo_coord_sys character varying(50),
- media_server_id character varying(50),
- custom_name character varying(255),
- sdp_ip character varying(50),
- local_ip character varying(50),
- password character varying(255),
- as_message_channel bool default false,
- keepalive_interval_time integer,
- switch_primary_sub_stream bool default false,
- broadcast_push_after_ack bool default false,
- constraint uk_device_device unique (device_id)
-);
-
-create table wvp_device_alarm (
- id serial primary key ,
- device_id character varying(50) not null,
- channel_id character varying(50) not null,
- alarm_priority character varying(50),
- alarm_method character varying(50),
- alarm_time character varying(50),
- alarm_description character varying(255),
- longitude double precision,
- latitude double precision,
- alarm_type character varying(50),
- create_time character varying(50) not null
-);
-
-create table wvp_device_channel (
- id serial primary key ,
- channel_id character varying(50) not null,
- name character varying(255),
- custom_name character varying(255),
- manufacture character varying(50),
- model character varying(50),
- owner character varying(50),
- civil_code character varying(50),
- block character varying(50),
- address character varying(50),
- parent_id character varying(50),
- safety_way integer,
- register_way integer,
- cert_num character varying(50),
- certifiable integer,
- err_code integer,
- end_time character varying(50),
- secrecy character varying(50),
- ip_address character varying(50),
- port integer,
- password character varying(255),
- ptz_type integer,
- custom_ptz_type integer,
- status bool default false,
- longitude double precision,
- custom_longitude double precision,
- latitude double precision,
- custom_latitude double precision,
- stream_id character varying(255),
- device_id character varying(50) not null,
- parental character varying(50),
- has_audio bool default false,
- create_time character varying(50) not null,
- update_time character varying(50) not null,
- sub_count integer,
- longitude_gcj02 double precision,
- latitude_gcj02 double precision,
- longitude_wgs84 double precision,
- latitude_wgs84 double precision,
- business_group_id character varying(50),
- gps_time character varying(50),
- stream_identification character varying(50),
- constraint uk_wvp_device_channel_unique_device_channel unique (device_id, channel_id)
-);
-
-create table wvp_device_mobile_position (
- id serial primary key,
- device_id character varying(50) not null,
- channel_id character varying(50) not null,
- device_name character varying(255),
- time character varying(50),
- longitude double precision,
- latitude double precision,
- altitude double precision,
- speed double precision,
- direction double precision,
- report_source character varying(50),
- longitude_gcj02 double precision,
- latitude_gcj02 double precision,
- longitude_wgs84 double precision,
- latitude_wgs84 double precision,
- create_time character varying(50)
-);
-
-create table wvp_gb_stream (
- gb_stream_id serial primary key,
- app character varying(255) not null,
- stream character varying(255) not null,
- gb_id character varying(50) not null,
- name character varying(255),
- longitude double precision,
- latitude double precision,
- stream_type character varying(50),
- media_server_id character varying(50),
- create_time character varying(50),
- constraint uk_gb_stream_unique_gb_id unique (gb_id),
- constraint uk_gb_stream_unique_app_stream unique (app, stream)
-);
-
-create table wvp_log (
- id serial primary key ,
- name character varying(50),
- type character varying(50),
- uri character varying(200),
- address character varying(50),
- result character varying(50),
- timing bigint,
- username character varying(50),
- create_time character varying(50)
-);
-
-create table wvp_media_server (
- id character varying(255) primary key ,
- ip character varying(50),
- hook_ip character varying(50),
- sdp_ip character varying(50),
- stream_ip character varying(50),
- http_port integer,
- http_ssl_port integer,
- rtmp_port integer,
- rtmp_ssl_port integer,
- rtp_proxy_port integer,
- rtsp_port integer,
- rtsp_ssl_port integer,
- auto_config bool default false,
- secret character varying(50),
- rtp_enable bool default false,
- rtp_port_range character varying(50),
- send_rtp_port_range character varying(50),
- record_assist_port integer,
- default_server bool default false,
- create_time character varying(50),
- update_time character varying(50),
- hook_alive_interval integer,
- record_path character varying(255),
- record_day integer default 7,
- constraint uk_media_server_unique_ip_http_port unique (ip, http_port)
-);
-
-create table wvp_platform (
- id serial primary key ,
- enable bool default false,
- name character varying(255),
- server_gb_id character varying(50),
- server_gb_domain character varying(50),
- server_ip character varying(50),
- server_port integer,
- device_gb_id character varying(50),
- device_ip character varying(50),
- device_port character varying(50),
- username character varying(255),
- password character varying(50),
- expires character varying(50),
- keep_timeout character varying(50),
- transport character varying(50),
- character_set character varying(50),
- catalog_id character varying(50),
- ptz bool default false,
- rtcp bool default false,
- status bool default false,
- start_offline_push bool default false,
- administrative_division character varying(50),
- catalog_group integer,
- create_time character varying(50),
- update_time character varying(50),
- as_message_channel bool default false,
- auto_push_channel bool default false,
- constraint uk_platform_unique_server_gb_id unique (server_gb_id)
-);
-
-create table wvp_platform_catalog (
- id character varying(50),
- platform_id character varying(50),
- name character varying(255),
- parent_id character varying(50),
- civil_code character varying(50),
- business_group_id character varying(50),
- constraint uk_platform_catalog_id_platform_id unique (id, platform_id)
-);
-
-create table wvp_platform_gb_channel (
- id serial primary key ,
- platform_id character varying(50),
- catalog_id character varying(50),
- device_channel_id integer,
- constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, catalog_id, device_channel_id)
-);
-
-create table wvp_platform_gb_stream (
- id serial primary key,
- platform_id character varying(50),
- catalog_id character varying(50),
- gb_stream_id integer,
- constraint uk_platform_gb_stream_platform_id_catalog_id_gb_stream_id unique (platform_id, catalog_id, gb_stream_id)
-);
-
-create table wvp_stream_proxy (
- id serial primary key,
- type character varying(50),
- app character varying(255),
- stream character varying(255),
- url character varying(255),
- src_url character varying(255),
- dst_url character varying(255),
- timeout_ms integer,
- ffmpeg_cmd_key character varying(255),
- rtp_type character varying(50),
- media_server_id character varying(50),
- enable_audio bool default false,
- enable_mp4 bool default false,
- enable bool default false,
- status boolean,
- enable_remove_none_reader bool default false,
- create_time character varying(50),
- name character varying(255),
- update_time character varying(50),
- stream_key character varying(255),
- enable_disable_none_reader bool default false,
- constraint uk_stream_proxy_app_stream unique (app, stream)
-);
-
-create table wvp_stream_push (
- id serial primary key,
- app character varying(255),
- stream character varying(255),
- total_reader_count character varying(50),
- origin_type integer,
- origin_type_str character varying(50),
- create_time character varying(50),
- alive_second integer,
- media_server_id character varying(50),
- server_id character varying(50),
- push_time character varying(50),
- status bool default false,
- update_time character varying(50),
- push_ing bool default false,
- self bool default false,
- constraint uk_stream_push_app_stream unique (app, stream)
-);
-create table wvp_cloud_record (
- id serial primary key,
- app character varying(255),
- stream character varying(255),
- call_id character varying(255),
- start_time int8,
- end_time int8,
- media_server_id character varying(50),
- file_name character varying(255),
- folder character varying(255),
- file_path character varying(255),
- collect bool default false,
- file_size int8,
- time_len int8,
- constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
-);
-
-create table wvp_user (
- id serial primary key,
- username character varying(255),
- password character varying(255),
- role_id integer,
- create_time character varying(50),
- update_time character varying(50),
- push_key character varying(50),
- constraint uk_user_username unique (username)
-);
-
-create table wvp_user_role (
- id serial primary key,
- name character varying(50),
- authority character varying(50),
- create_time character varying(50),
- update_time character varying(50)
-);
-create table wvp_resources_tree (
- id serial primary key ,
- is_catalog bool default true,
- device_channel_id integer ,
- gb_stream_id integer,
- name character varying(255),
- parentId integer,
- path character varying(255)
-);
-
-
-/*鍒濆鏁版嵁*/
-INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
-INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
-
-
-
--
Gitblit v1.8.0