From c82608125353a7cd96aa19c2c96ac7a40d1ec23f Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: Mon, 7 Jun 2021 18:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8E=A5=E5=8F=A3=E9=89=B4?=
 =?UTF-8?q?=E6=9D=83=E4=B8=8E=E8=87=AA=E5=8A=A8=E4=B8=80=E8=B5=B7=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=8F=AF=E4=BB=A5=E5=AE=8C=E6=88=90=E5=8D=95=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9B=86=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/SIPRequestHeaderPlarformProvider.java        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
index 07b1f7e4..8e31d156 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
@@ -30,14 +30,6 @@ public class SIPRequestHeaderPlarformProvider {
 	
 	@Autowired
 	private SipFactory sipFactory;
-	
-//	@Autowired
-//	@Qualifier(value="tcpSipProvider")
-//	private SipProvider tcpSipProvider;
-//
-//	@Autowired
-//	@Qualifier(value="udpSipProvider")
-//	private SipProvider udpSipProvider;
 
 
 	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 {
 		viaHeader.setRPort();
 		viaHeaders.add(viaHeader);
 		// from
-		SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getServerGBId(),
+		SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getDeviceGBId(),
 				parentPlatform.getDeviceIp() + ":" + parentPlatform.getDevicePort());
 		Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI);
 		FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag);
 		// to
-		SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getDeviceGBId(), parentPlatform.getServerGBDomain());
+		SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerGBDomain());
 		Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI);
 		ToHeader toHeader = sipFactory.createHeaderFactory().createToHeader(toAddress, null);