Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

sc.dm

2022-03-10 4abbf4df07f02c0c94baa2787fdcf4a14dcb3463

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

@@ -21,6 +21,8 @@
        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 @@
    private String eventType;
    private String fromTag;
    private String toTag;
    private String branch;

    public String getId() {
        return id;
@@ -86,4 +89,12 @@
    public void setEventType(String eventType) {
        this.eventType = eventType;
    }

    public String getBranch() {
        return branch;
    }

    public void setBranch(String branch) {
        this.branch = branch;
    }
}