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

648540858

2023-01-05 ce035dbcdb38fc1f73ec82f54336f490a632b53b

 src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java

@@ -35,11 +35,15 @@

    private Boolean useSourceIpAsStreamIp = Boolean.FALSE;

    private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;

    private Boolean streamOnDemand = Boolean.TRUE;

    private Boolean pushAuthority = Boolean.TRUE;

    private Boolean gbSendStreamStrict = Boolean.FALSE;

    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

    private String serverId = "000000";

@@ -186,4 +190,20 @@
    public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
        this.gbSendStreamStrict = gbSendStreamStrict;
    }

    public Boolean getSyncChannelOnDeviceOnline() {
        return syncChannelOnDeviceOnline;
    }

    public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
        this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
    }

    public Boolean getSipUseSourceIpAsRemoteAddress() {
        return sipUseSourceIpAsRemoteAddress;
    }

    public void setSipUseSourceIpAsRemoteAddress(Boolean sipUseSourceIpAsRemoteAddress) {
        this.sipUseSourceIpAsRemoteAddress = sipUseSourceIpAsRemoteAddress;
    }
}