增加同步通道超时时间，修复hookIP空字符串时的hookIP的默认值赋值

64850858
1 parent 377f0f2c
Showing 2 changed files with 20 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -14,6 +14,9 @@ public class MediaConfig {
     @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 class MediaConfig {
     }
  
     public String getHookIp() {
-        return hookIp;
+        if (StringUtils.isEmpty(hookIp)){
+            return sipIp;
+        }else {
+            return hookIp;
+        }
+
     }
  
     public void setHookIp(String hookIp) {
@@ -76,7 +84,11 @@ public class MediaConfig {
     }
  
     public String getSdpIp() {
-        return sdpIp;
+        if (StringUtils.isEmpty(sdpIp)){
+            return ip;
+        }else {
+            return sdpIp;
+        }
     }
  
     public void setSdpIp(String sdpIp) {
@@ -84,7 +96,11 @@ public class MediaConfig {
     }
  
     public String getStreamIp() {
-        return streamIp;
+        if (StringUtils.isEmpty(streamIp)){
+            return ip;
+        }else {
+            return streamIp;
+        }
     }
  
     public void setStreamIp(String streamIp) {
@@ -149,7 +149,7 @@ public class DeviceQuery {
 			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