Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-02-25 0f58218badea86a5209ae7f1ccd60b7cb4b26eee

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java

@@ -2,6 +2,7 @@


import java.text.ParseException;

import java.util.ArrayList;

import java.util.UUID;



import javax.sip.InvalidArgumentException;

import javax.sip.PeerUnavailableException;

@@ -11,13 +12,17 @@
import javax.sip.address.SipURI;

import javax.sip.header.*;

import javax.sip.message.Request;

import javax.validation.constraints.NotNull;



import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.stereotype.Component;



import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.Host;

import org.springframework.util.DigestUtils;



/**

 * @Description:摄像头命令request创造器 TODO 冗余代码太多待优化

@@ -194,7 +199,7 @@
      request = sipFactory.createMessageFactory().createRequest(requestURI, Request.SUBSCRIBE, callIdHeader, cSeqHeader, fromHeader,

            toHeader, viaHeaders, maxForwards);



		


      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

      request.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));