Merge branch 'wvp-28181-2.0'

648540858

2022-09-14 ab74d1cff90cc563e0eca8deb8f154d84eb51908

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

@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.GitUtil;
import gov.nist.javax.sip.message.MessageFactoryImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -33,6 +34,9 @@
   
   @Autowired
   private SipFactory sipFactory;

   @Autowired
   private GitUtil gitUtil;

   @Autowired
   private IRedisCatchStorage redisCatchStorage;
@@ -72,8 +76,7 @@
      ExpiresHeader expires = sipFactory.createHeaderFactory().createExpiresHeader(isRegister ? platform.getExpires() : 0);
      request.addHeader(expires);

      UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);
      request.addHeader(userAgentHeader);
      request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));

      return request;
   }
@@ -183,6 +186,8 @@
      request = messageFactory.createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,
            toHeader, viaHeaders, maxForwards);

      request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
      request.setContent(content, contentTypeHeader);
      return request;