Merge branch 'wvp-28181-2.0' into wvp-pro-record

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
This commit is contained in:
648540858
2022-03-02 12:52:37 +08:00
12 changed files with 117 additions and 76 deletions

View File

@@ -21,6 +21,8 @@ public class SubscribeInfo {
EventHeader eventHeader = (EventHeader)request.getHeader(EventHeader.NAME);
this.eventId = eventHeader.getEventId();
this.eventType = eventHeader.getEventType();
ViaHeader viaHeader = (ViaHeader)request.getHeader(ViaHeader.NAME);
this.branch = viaHeader.getBranch();
}
private String id;
@@ -30,6 +32,7 @@ public class SubscribeInfo {
private String eventType;
private String fromTag;
private String toTag;
private String branch;
public String getId() {
return id;
@@ -86,4 +89,12 @@ public class SubscribeInfo {
public void setEventType(String eventType) {
this.eventType = eventType;
}
public String getBranch() {
return branch;
}
public void setBranch(String branch) {
this.branch = branch;
}
}