Commit c82608125353a7cd96aa19c2c96ac7a40d1ec23f

Authored by 64850858
1 parent 5e598f7d

关闭接口鉴权与自动一起使用可以完成单网页集成

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
@@ -30,14 +30,6 @@ public class SIPRequestHeaderPlarformProvider { @@ -30,14 +30,6 @@ public class SIPRequestHeaderPlarformProvider {
30 30
31 @Autowired 31 @Autowired
32 private SipFactory sipFactory; 32 private SipFactory sipFactory;
33 -  
34 -// @Autowired  
35 -// @Qualifier(value="tcpSipProvider")  
36 -// private SipProvider tcpSipProvider;  
37 -//  
38 -// @Autowired  
39 -// @Qualifier(value="udpSipProvider")  
40 -// private SipProvider udpSipProvider;  
41 33
42 34
43 public Request createKeetpaliveMessageRequest(ParentPlatform parentPlatform, String content, String viaTag, String fromTag, String toTag, CallIdHeader callIdHeader) throws ParseException, InvalidArgumentException, PeerUnavailableException { 35 public Request createKeetpaliveMessageRequest(ParentPlatform parentPlatform, String content, String viaTag, String fromTag, String toTag, CallIdHeader callIdHeader) throws ParseException, InvalidArgumentException, PeerUnavailableException {
@@ -192,12 +184,12 @@ public class SIPRequestHeaderPlarformProvider { @@ -192,12 +184,12 @@ public class SIPRequestHeaderPlarformProvider {
192 viaHeader.setRPort(); 184 viaHeader.setRPort();
193 viaHeaders.add(viaHeader); 185 viaHeaders.add(viaHeader);
194 // from 186 // from
195 - SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getServerGBId(), 187 + SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getDeviceGBId(),
196 parentPlatform.getDeviceIp() + ":" + parentPlatform.getDevicePort()); 188 parentPlatform.getDeviceIp() + ":" + parentPlatform.getDevicePort());
197 Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI); 189 Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI);
198 FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag); 190 FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag);
199 // to 191 // to
200 - SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getDeviceGBId(), parentPlatform.getServerGBDomain()); 192 + SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerGBDomain());
201 Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI); 193 Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI);
202 ToHeader toHeader = sipFactory.createHeaderFactory().createToHeader(toAddress, null); 194 ToHeader toHeader = sipFactory.createHeaderFactory().createToHeader(toAddress, null);
203 195