From f89491ada315b78648f266a86c026f7cb9bf3519 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 十一月 2022 14:38:46 +0800
Subject: [PATCH] 修复单端口模式下ssrc的释放 #667
---
web_src/src/components/DeviceList.vue | 2 +-
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 2 +-
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 10 ++++------
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 1 -
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 2815e64..99a695e 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -38,7 +38,7 @@
// 璁剧疆璇诲彇瓒呮椂鏃堕棿
httpClientBuilder.readTimeout(5,TimeUnit.SECONDS);
// 璁剧疆杩炴帴姹�
- httpClientBuilder.connectionPool(new ConnectionPool(16, 10, TimeUnit.SECONDS));
+ httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES));
if (logger.isDebugEnabled()) {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> {
logger.debug("http璇锋眰鍙傛暟锛�" + message);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index d9f922a..db4d7b3 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -169,7 +169,6 @@
return;
}
zlmrtpServerFactory.closeRtpServer(mediaServerItem, streamId);
- releaseSsrc(mediaServerItem.getId(), streamId);
}
@Override
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index 23d4d72..d4694c5 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -5,7 +5,6 @@
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
@@ -25,7 +24,6 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.compress.utils.IOUtils;
-import org.apache.http.HttpResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,15 +31,15 @@
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
import javax.servlet.http.HttpServletResponse;
-import javax.sip.DialogState;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.nio.file.Files;
import java.text.ParseException;
import java.util.*;
@@ -145,7 +143,7 @@
*/
@Operation(summary = "鍚屾璁惧閫氶亾")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
- @PostMapping("/devices/{deviceId}/sync")
+ @GetMapping("/devices/{deviceId}/sync")
public WVPResult<SyncStatus> devicesSync(@PathVariable String deviceId){
if (logger.isDebugEnabled()) {
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index e15f340..29e049d 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -207,7 +207,7 @@
console.log("鍒锋柊瀵瑰簲璁惧:" + itemData.deviceId);
let that = this;
this.$axios({
- method: 'post',
+ method: 'get',
url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
}).then((res) => {
console.log("鍒锋柊璁惧缁撴灉锛�" + JSON.stringify(res));
--
Gitblit v1.8.0