合并开源主线

648540858

2023-04-04 b4048fbe80dba8e7756ae557a15ab60b4f80a44b

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

@@ -33,7 +33,7 @@

    private Boolean logInDatebase = Boolean.TRUE;

    private Boolean usePushingAsStatus = Boolean.TRUE;
    private Boolean usePushingAsStatus = Boolean.FALSE;

    private Boolean useSourceIpAsStreamIp = Boolean.FALSE;

@@ -47,12 +47,20 @@

    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

    private Boolean pushStreamAfterAck = Boolean.FALSE;

    private Boolean sipLog = Boolean.FALSE;
    private Boolean sendToPlatformsWhenIdLost = Boolean.FALSE;

    private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE;

    private String serverId = "000000";

    private String recordPath = null;

    private String thirdPartyGBIdReg = "[\\s\\S]*";

    private String broadcastForPlatform = "UDP";

    private List<String> interfaceAuthenticationExcludes = new ArrayList<>();

@@ -206,6 +214,22 @@
        this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
    }

    public String getBroadcastForPlatform() {
        return broadcastForPlatform;
    }

    public void setBroadcastForPlatform(String broadcastForPlatform) {
        this.broadcastForPlatform = broadcastForPlatform;
    }

    public Boolean getPushStreamAfterAck() {
        return pushStreamAfterAck;
    }

    public void setPushStreamAfterAck(Boolean pushStreamAfterAck) {
        this.pushStreamAfterAck = pushStreamAfterAck;
    }

    public Boolean getSipUseSourceIpAsRemoteAddress() {
        return sipUseSourceIpAsRemoteAddress;
    }
@@ -237,4 +261,20 @@
    public void setSendToPlatformsWhenIdLost(Boolean sendToPlatformsWhenIdLost) {
        this.sendToPlatformsWhenIdLost = sendToPlatformsWhenIdLost;
    }

    public Boolean getRefuseChannelStatusChannelFormNotify() {
        return refuseChannelStatusChannelFormNotify;
    }

    public void setRefuseChannelStatusChannelFormNotify(Boolean refuseChannelStatusChannelFormNotify) {
        this.refuseChannelStatusChannelFormNotify = refuseChannelStatusChannelFormNotify;
    }

    public String getRecordPath() {
        return recordPath;
    }

    public void setRecordPath(String recordPath) {
        this.recordPath = recordPath;
    }
}