guzijian / wvp-GB28181-pro · Commits

Commit f89491ada315b78648f266a86c026f7cb9bf3519

Authored by 648540858
1 parent fb957b0d

修复单端口模式下ssrc的释放 #667

Inline Side-by-side
Showing 4 changed files with 6 additions and 9 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
  View file @f89491a
... ... @@ -38,7 +38,7 @@ public class ZLMRESTfulUtils {
38 38 // 设置读取超时时间
39 39 httpClientBuilder.readTimeout(5,TimeUnit.SECONDS);
40 40 // 设置连接池
41   - httpClientBuilder.connectionPool(new ConnectionPool(16, 10, TimeUnit.SECONDS));
  41 + httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES));
42 42 if (logger.isDebugEnabled()) {
43 43 HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> {
44 44 logger.debug("http请求参数：" + message);
... ...
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @f89491a
... ... @@ -169,7 +169,6 @@ public class MediaServerServiceImpl implements IMediaServerService {
169 169 return;
170 170 }
171 171 zlmrtpServerFactory.closeRtpServer(mediaServerItem, streamId);
172   - releaseSsrc(mediaServerItem.getId(), streamId);
173 172 }
174 173  
175 174 @Override
... ...
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
  View file @f89491a
... ... @@ -5,7 +5,6 @@ import com.genersoft.iot.vmp.conf.DynamicTask;
5 5 import com.genersoft.iot.vmp.conf.exception.ControllerException;
6 6 import com.genersoft.iot.vmp.gb28181.bean.Device;
7 7 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
8   -import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
9 8 import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
10 9 import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
11 10 import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
... ... @@ -25,7 +24,6 @@ import io.swagger.v3.oas.annotations.Operation;
25 24 import io.swagger.v3.oas.annotations.Parameter;
26 25 import io.swagger.v3.oas.annotations.tags.Tag;
27 26 import org.apache.commons.compress.utils.IOUtils;
28   -import org.apache.http.HttpResponse;
29 27 import org.slf4j.Logger;
30 28 import org.slf4j.LoggerFactory;
31 29 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -33,15 +31,15 @@ import org.springframework.http.HttpStatus;
33 31 import org.springframework.http.MediaType;
34 32 import org.springframework.http.ResponseEntity;
35 33 import org.springframework.util.ObjectUtils;
36   -import org.springframework.util.StringUtils;
37 34 import org.springframework.web.bind.annotation.*;
38 35 import org.springframework.web.context.request.async.DeferredResult;
39 36  
40 37 import javax.servlet.http.HttpServletResponse;
41   -import javax.sip.DialogState;
42 38 import javax.sip.InvalidArgumentException;
43 39 import javax.sip.SipException;
44   -import java.io.*;
  40 +import java.io.File;
  41 +import java.io.IOException;
  42 +import java.io.InputStream;
45 43 import java.nio.file.Files;
46 44 import java.text.ParseException;
47 45 import java.util.*;
... ... @@ -145,7 +143,7 @@ public class DeviceQuery {
145 143 */
146 144 @Operation(summary = "同步设备通道")
147 145 @Parameter(name = "deviceId", description = "设备国标编号", required = true)
148   - @PostMapping("/devices/{deviceId}/sync")
  146 + @GetMapping("/devices/{deviceId}/sync")
149 147 public WVPResult<SyncStatus> devicesSync(@PathVariable String deviceId){
150 148  
151 149 if (logger.isDebugEnabled()) {
... ...
web_src/src/components/DeviceList.vue
  View file @f89491a
... ... @@ -207,7 +207,7 @@ export default {
207 207 console.log("刷新对应设备:" + itemData.deviceId);
208 208 let that = this;
209 209 this.$axios({
210   - method: 'post',
  210 + method: 'get',
211 211 url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
212 212 }).then((res) => {
213 213 console.log("刷新设备结果：" + JSON.stringify(res));
... ...