From ecb5b691018c8ff71583833ec9a09d8f2bef81f6 Mon Sep 17 00:00:00 2001 From: 64850858 <648540858@qq.com> Date: 星期三, 09 六月 2021 09:28:29 +0800 Subject: [PATCH] 增加同步通道超时时间,修复hookIP空字符串时的hookIP的默认值赋值 --- src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 22 +++++++++++++++++++--- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java index 8ab34bf..48f1af5 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java @@ -14,6 +14,9 @@ @Value("${media.hookIp:${sip.ip}}") private String hookIp; + @Value("${sip.ip}") + private String sipIp; + @Value("${media.sdpIp:${media.ip}}") private String sdpIp; @@ -68,7 +71,12 @@ } public String getHookIp() { - return hookIp; + if (StringUtils.isEmpty(hookIp)){ + return sipIp; + }else { + return hookIp; + } + } public void setHookIp(String hookIp) { @@ -76,7 +84,11 @@ } public String getSdpIp() { - return sdpIp; + if (StringUtils.isEmpty(sdpIp)){ + return ip; + }else { + return sdpIp; + } } public void setSdpIp(String sdpIp) { @@ -84,7 +96,11 @@ } public String getStreamIp() { - return streamIp; + if (StringUtils.isEmpty(streamIp)){ + return ip; + }else { + return streamIp; + } } public void setStreamIp(String streamIp) { 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 c40a493..776acbf 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 @@ -149,7 +149,7 @@ msg.setData(String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase())); resultHolder.invokeResult(msg); }); - DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(2*1000L); + DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(15*1000L); result.onTimeout(()->{ logger.warn(String.format("璁惧閫氶亾淇℃伅鍚屾瓒呮椂")); // 閲婃斁rtpserver -- Gitblit v1.8.0