From abd569d79a346d9066c4b239dbc452861b26a6cb Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期二, 08 六月 2021 14:43:03 +0800
Subject: [PATCH] 添加注册失败时回复403避免陷入401循环
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
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 c6286c5..2eb99b8 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -1,9 +1,11 @@
package com.genersoft.iot.vmp.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
+import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
@@ -13,6 +15,9 @@
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 瑙嗛浠ｇ悊涓氬姟
@@ -38,14 +43,18 @@
@Autowired
private PlatformGbStreamMapper platformGbStreamMapper;
+ @Autowired
+ private IGbStreamService gbStreamService;
+
@Override
public String save(StreamProxyItem param) {
- MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(),
param.getStream() );
param.setDst_url(dstUrl);
StringBuffer result = new StringBuffer();
+ boolean streamLive = false;
// 鏇存柊
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
if (videoManagerStorager.updateStreamProxy(param)) {
@@ -62,9 +71,11 @@
}else { // 鏂板
if (videoManagerStorager.addStreamProxy(param)){
result.append("淇濆瓨鎴愬姛");
+ streamLive = true;
if (param.isEnable()) {
JSONObject jsonObject = addStreamProxyToZlm(param);
if (jsonObject == null) {
+ streamLive = false;
result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
param.setEnable(false);
videoManagerStorager.updateStreamProxy(param);
@@ -72,6 +83,15 @@
}
}
+ }
+ if (param.getPlatformGbId() != null && streamLive) {
+ List<GbStream> gbStreams = new ArrayList<>();
+ gbStreams.add(param);
+ if (gbStreamService.addPlatformInfo(gbStreams, param.getPlatformGbId())){
+ result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]鎴愬姛");
+ }else {
+ result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]澶辫触");
+ }
}
return result.toString();
}
@@ -84,7 +104,8 @@
param.isEnable_hls(), param.isEnable_mp4(), param.getRtp_type());
}else if ("ffmpeg".equals(param.getType())) {
result = zlmresTfulUtils.addFFmpegSource(param.getSrc_url(), param.getDst_url(),
- param.getTimeout_ms() + "");
+ param.getTimeout_ms() + "", param.isEnable_hls(), param.isEnable_mp4(),
+ param.getFfmpeg_cmd_key());
}
return result;
}
@@ -145,4 +166,22 @@
}
return result;
}
+
+ @Override
+ public JSONObject getFFmpegCMDs() {
+ JSONObject result = new JSONObject();
+ JSONObject mediaServerConfigResuly = zlmresTfulUtils.getMediaServerConfig();
+ if (mediaServerConfigResuly != null && mediaServerConfigResuly.getInteger("code") == 0
+ && mediaServerConfigResuly.getJSONArray("data").size() > 0){
+ JSONObject mediaServerConfig = mediaServerConfigResuly.getJSONArray("data").getJSONObject(0);
+
+ for (String key : mediaServerConfig.keySet()) {
+ if (key.startsWith("ffmpeg.cmd")){
+ result.put(key, mediaServerConfig.getString(key));
+ }
+ }
+ }
+
+ return result;
+ }
}
--
Gitblit v1.8.0