统一userAgent

648540858

2022-05-06 ee62f171707295a90220194bde54a6bd3ce7f0c1

统一userAgent

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

@@ -68,9 +68,6 @@
                toHeader, viaHeaders, maxForwards);

        List<String> agentParam = new ArrayList<>();
        agentParam.add("wvp-pro");
        UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
        request.addHeader(userAgentHeader);

        ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
        request.setContent(content, contentTypeHeader);
@@ -115,10 +112,6 @@
        ExpiresHeader expires = sipFactory.createHeaderFactory().createExpiresHeader(Integer.parseInt(platform.getExpires()));
        request.addHeader(expires);

        List<String> agentParam = new ArrayList<>();
        agentParam.add("wvp-pro");
        UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
        request.addHeader(userAgentHeader);

        return request;
    }
@@ -226,10 +219,6 @@
        messageFactory.setDefaultContentEncodingCharset(parentPlatform.getCharacterSet());
        request = messageFactory.createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,
                toHeader, viaHeaders, maxForwards);
        List<String> agentParam = new ArrayList<>();
        agentParam.add("wvp-pro");
        UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
        request.addHeader(userAgentHeader);

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

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

@@ -27,6 +27,7 @@
import org.slf4j.LoggerFactory;

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

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

import org.springframework.boot.SpringBootVersion;

import org.springframework.context.annotation.DependsOn;

import org.springframework.stereotype.Component;

import org.springframework.util.StringUtils;

@@ -37,7 +38,9 @@
import javax.sip.message.Request;

import java.lang.reflect.Field;

import java.text.ParseException;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;



/**    

 * @description:设备能力接口，用于定义设备的控制、查询能力   

@@ -49,7 +52,7 @@
public class SIPCommander implements ISIPCommander {



    private final Logger logger = LoggerFactory.getLogger(SIPCommander.class);

	


    @Autowired

    private SipConfig sipConfig;



@@ -1643,7 +1646,18 @@
        } else if("UDP".equals(device.getTransport())) {

            clientTransaction = udpSipProvider.getNewClientTransaction(request);

        }



        if (request.getHeader(UserAgentHeader.NAME) == null) {

            List<String> agentParam = new ArrayList<>();

            agentParam.add("wvp-pro");

            // TODO 添加版本信息以及日期

            UserAgentHeader userAgentHeader = null;

            try {

                userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);

            } catch (ParseException e) {

                throw new RuntimeException(e);

            }

            request.addHeader(userAgentHeader);

        }

        CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);

        // 添加错误订阅

        if (errorEvent != null) {