guzijian / wvp-GB28181-pro · Commits

Commit 6560a7ad3830f28eedaeb65c84c27e2f9289db5c

Authored by 648540858
Committed by GitHub
2 parents 5ccd3365 f5b019e9

Merge pull request #136 from lawrencehj/wvp-28181-2.0 

解决hook.ip未设置时不能取默认值的问题等
Inline Side-by-side
Showing 15 changed files with 3 additions and 24 deletions
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
  View file @6560a7a
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;  
4 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 3 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
5 import org.springframework.beans.factory.annotation.Value; 4 import org.springframework.beans.factory.annotation.Value;
6 import org.springframework.context.annotation.Configuration; 5 import org.springframework.context.annotation.Configuration;
@@ -171,7 +170,7 @@ public class MediaConfig{ @@ -171,7 +170,7 @@ public class MediaConfig{
171 mediaServerItem.setId(id); 170 mediaServerItem.setId(id);
172 mediaServerItem.setIp(ip); 171 mediaServerItem.setIp(ip);
173 mediaServerItem.setDefaultServer(true); 172 mediaServerItem.setDefaultServer(true);
174 - mediaServerItem.setHookIp(hookIp); 173 + mediaServerItem.setHookIp(getHookIp());
175 mediaServerItem.setSdpIp(sdpIp); 174 mediaServerItem.setSdpIp(sdpIp);
176 mediaServerItem.setStreamIp(streamIp); 175 mediaServerItem.setStreamIp(streamIp);
177 mediaServerItem.setHttpPort(httpPort); 176 mediaServerItem.setHttpPort(httpPort);
src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java
  View file @6560a7a
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;  
4 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 3 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
5 import org.springframework.beans.factory.annotation.Autowired; 4 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.scheduling.annotation.Scheduled; 5 import org.springframework.scheduling.annotation.Scheduled;
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java
  View file @6560a7a
1 package com.genersoft.iot.vmp.gb28181.bean; 1 package com.genersoft.iot.vmp.gb28181.bean;
2 2
3 -import javax.sip.message.Request;  
4 -  
5 public class SsrcTransaction { 3 public class SsrcTransaction {
6 4
7 private String deviceId; 5 private String deviceId;
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
  View file @6560a7a
@@ -2,22 +2,16 @@ package com.genersoft.iot.vmp.gb28181.session; @@ -2,22 +2,16 @@ package com.genersoft.iot.vmp.gb28181.session;
2 2
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.List; 4 import java.util.List;
5 -import java.util.Map;  
6 -import java.util.concurrent.ConcurrentHashMap;  
7 5
8 import javax.sip.ClientTransaction; 6 import javax.sip.ClientTransaction;
9 import javax.sip.Dialog; 7 import javax.sip.Dialog;
10 -import javax.sip.message.Request;  
11 8
12 import com.genersoft.iot.vmp.common.VideoManagerConstants; 9 import com.genersoft.iot.vmp.common.VideoManagerConstants;
13 import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction; 10 import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
14 -import com.genersoft.iot.vmp.service.IMediaServerService;  
15 import com.genersoft.iot.vmp.utils.SerializeUtils; 11 import com.genersoft.iot.vmp.utils.SerializeUtils;
16 -import com.genersoft.iot.vmp.utils.redis.JedisUtil;  
17 import com.genersoft.iot.vmp.utils.redis.RedisUtil; 12 import com.genersoft.iot.vmp.utils.redis.RedisUtil;
18 import gov.nist.javax.sip.stack.SIPDialog; 13 import gov.nist.javax.sip.stack.SIPDialog;
19 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
20 -import org.springframework.data.redis.core.RedisTemplate;  
21 import org.springframework.stereotype.Component; 15 import org.springframework.stereotype.Component;
22 16
23 /** 17 /**
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
  View file @6560a7a
@@ -7,7 +7,6 @@ import javax.sip.header.CSeqHeader; @@ -7,7 +7,6 @@ import javax.sip.header.CSeqHeader;
7 import javax.sip.message.Request; 7 import javax.sip.message.Request;
8 import javax.sip.message.Response; 8 import javax.sip.message.Response;
9 9
10 -import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;  
11 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform; 10 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
12 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; 11 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
13 import com.genersoft.iot.vmp.service.IMediaServerService; 12 import com.genersoft.iot.vmp.service.IMediaServerService;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @6560a7a
@@ -24,7 +24,6 @@ import gov.nist.javax.sip.SipProviderImpl; @@ -24,7 +24,6 @@ import gov.nist.javax.sip.SipProviderImpl;
24 import gov.nist.javax.sip.SipStackImpl; 24 import gov.nist.javax.sip.SipStackImpl;
25 import gov.nist.javax.sip.message.SIPRequest; 25 import gov.nist.javax.sip.message.SIPRequest;
26 import gov.nist.javax.sip.stack.SIPDialog; 26 import gov.nist.javax.sip.stack.SIPDialog;
27 -import gov.nist.javax.sip.stack.SIPTransaction;  
28 import org.slf4j.Logger; 27 import org.slf4j.Logger;
29 import org.slf4j.LoggerFactory; 28 import org.slf4j.LoggerFactory;
30 import org.springframework.beans.factory.annotation.Autowired; 29 import org.springframework.beans.factory.annotation.Autowired;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
  View file @6560a7a
@@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.response.impl; @@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.response.impl;
3 import java.text.ParseException; 3 import java.text.ParseException;
4 4
5 import javax.sip.*; 5 import javax.sip.*;
6 -import javax.sip.address.Address;  
7 import javax.sip.address.SipURI; 6 import javax.sip.address.SipURI;
8 import javax.sip.header.CSeqHeader; 7 import javax.sip.header.CSeqHeader;
9 import javax.sip.message.Request; 8 import javax.sip.message.Request;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
  View file @6560a7a
@@ -16,7 +16,6 @@ import org.springframework.stereotype.Component; @@ -16,7 +16,6 @@ import org.springframework.stereotype.Component;
16 16
17 import java.util.*; 17 import java.util.*;
18 18
19 -@SuppressWarnings("unchecked")  
20 @Component 19 @Component
21 public class ZLMMediaListManager { 20 public class ZLMMediaListManager {
22 21
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
  View file @6560a7a
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 -import com.genersoft.iot.vmp.conf.MediaConfig;  
4 import com.genersoft.iot.vmp.gb28181.bean.Device; 3 import com.genersoft.iot.vmp.gb28181.bean.Device;
5 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; 4 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
6 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @6560a7a
@@ -26,7 +26,6 @@ import org.springframework.boot.CommandLineRunner; @@ -26,7 +26,6 @@ import org.springframework.boot.CommandLineRunner;
26 import org.springframework.core.annotation.Order; 26 import org.springframework.core.annotation.Order;
27 import org.springframework.stereotype.Service; 27 import org.springframework.stereotype.Service;
28 28
29 -import java.sql.Array;  
30 import java.text.SimpleDateFormat; 29 import java.text.SimpleDateFormat;
31 import java.util.*; 30 import java.util.*;
32 31
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
  View file @6560a7a
@@ -34,7 +34,6 @@ import org.springframework.stereotype.Service; @@ -34,7 +34,6 @@ import org.springframework.stereotype.Service;
34 import org.springframework.util.ResourceUtils; 34 import org.springframework.util.ResourceUtils;
35 import org.springframework.web.context.request.async.DeferredResult; 35 import org.springframework.web.context.request.async.DeferredResult;
36 36
37 -import javax.sip.ClientTransaction;  
38 import javax.sip.message.Response; 37 import javax.sip.message.Response;
39 import java.io.FileNotFoundException; 38 import java.io.FileNotFoundException;
40 import java.util.UUID; 39 import java.util.UUID;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
  View file @6560a7a
@@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; @@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device;
14 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 14 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
15 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; 15 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
16 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; 16 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
17 -import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;  
18 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 17 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
19 18
20 import io.swagger.annotations.Api; 19 import io.swagger.annotations.Api;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
  View file @6560a7a
@@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; @@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device;
14 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 14 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
15 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; 15 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
16 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; 16 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
17 -import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;  
18 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 17 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
19 18
20 import io.swagger.annotations.Api; 19 import io.swagger.annotations.Api;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @6560a7a
@@ -37,7 +37,6 @@ import com.genersoft.iot.vmp.storager.IVideoManagerStorager; @@ -37,7 +37,6 @@ import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
37 import org.springframework.web.context.request.async.DeferredResult; 37 import org.springframework.web.context.request.async.DeferredResult;
38 38
39 import java.util.List; 39 import java.util.List;
40 -import java.util.Map;  
41 import java.util.UUID; 40 import java.util.UUID;
42 41
43 import javax.sip.message.Response; 42 import javax.sip.message.Response;
@@ -102,7 +101,7 @@ public class PlayController { @@ -102,7 +101,7 @@ public class PlayController {
102 @GetMapping("/stop/{deviceId}/{channelId}") 101 @GetMapping("/stop/{deviceId}/{channelId}")
103 public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) { 102 public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) {
104 103
105 - logger.debug(String.format("设备预览/回放停止API调用，streamId：%s/$s", deviceId, channelId )); 104 + logger.debug(String.format("设备预览/回放停止API调用，streamId：%s/%s", deviceId, channelId ));
106 105
107 UUID uuid = UUID.randomUUID(); 106 UUID uuid = UUID.randomUUID();
108 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(); 107 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
@@ -148,7 +147,7 @@ public class PlayController { @@ -148,7 +147,7 @@ public class PlayController {
148 147
149 // 超时处理 148 // 超时处理
150 result.onTimeout(()->{ 149 result.onTimeout(()->{
151 - logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s/$s ", deviceId, channelId)); 150 + logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s/%s ", deviceId, channelId));
152 RequestMessage msg = new RequestMessage(); 151 RequestMessage msg = new RequestMessage();
153 msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid); 152 msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
154 msg.setData("Timeout"); 153 msg.setData("Timeout");
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java
  View file @6560a7a
@@ -19,7 +19,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; @@ -19,7 +19,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device;
19 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 19 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
20 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; 20 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
21 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; 21 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
22 -import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;  
23 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 22 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
24 23
25 @Api(tags = "云台控制") 24 @Api(tags = "云台控制")