Pre Merge pull request !36 from 阿斌/N/A

src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java

@@ -3,8 +3,6 @@ package com.genersoft.iot.vmp.gb28181.bean;
 import gov.nist.javax.sip.message.SIPResponse;
 import lombok.Data;
 
-import javax.sip.header.EventHeader;
-
 @Data
 public class SipTransactionInfo {
 
@@ -14,7 +12,6 @@ public class SipTransactionInfo {
     private String viaBranch;
     private int expires;
     private String user;
-    private String eventId;
 
     // 自己是否媒体流发送者
     private boolean asSender;
@@ -25,10 +22,6 @@ public class SipTransactionInfo {
         this.toTag = response.getToTag();
         this.viaBranch = response.getTopmostViaHeader().getBranch();
         this.asSender = asSender;
-        EventHeader header = (EventHeader)response.getHeader(EventHeader.NAME);
-        if (header != null) {
-            this.eventId = header.getEventId();
-        }
     }
 
     public SipTransactionInfo(SIPResponse response) {
@@ -37,10 +30,6 @@ public class SipTransactionInfo {
         this.toTag = response.getToTag();
         this.viaBranch = response.getTopmostViaHeader().getBranch();
         this.asSender = false;
-        EventHeader header = (EventHeader)response.getHeader(EventHeader.NAME);
-        if (header != null) {
-            this.eventId = header.getEventId();
-        }
     }
 
     public SipTransactionInfo() {

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

@@ -269,15 +269,12 @@ public class SIPRequestHeaderProvider {
 		ExpiresHeader expireHeader = SipFactory.getInstance().createHeaderFactory().createExpiresHeader(expires);
 		request.addHeader(expireHeader);
 
-        // Event
+		// Event
-        EventHeader eventHeader = SipFactory.getInstance().createHeaderFactory().createEventHeader(event);
+		EventHeader eventHeader = SipFactory.getInstance().createHeaderFactory().createEventHeader(event);
-        if (sipTransactionInfo != null && sipTransactionInfo.getEventId() != null) {
+
-            eventHeader.setEventId(sipTransactionInfo.getEventId());
+		int random = (int) Math.floor(Math.random() * 10000);
-        }else {
+		eventHeader.setEventId(random + "");
-            int random = (int) Math.floor(Math.random() * 10000);
+		request.addHeader(eventHeader);
-            eventHeader.setEventId(random + "");
-        }
-        request.addHeader(eventHeader);
 
 		ContentTypeHeader contentTypeHeader = SipFactory.getInstance().createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
 		request.setContent(content, contentTypeHeader);