Merge branch 'talk' into main-dev

648540858

2023-03-20 039fbf7e243d4bf0f46b44e7dae2a5d36e978056

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

@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf;

import org.junit.jupiter.api.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

@@ -11,6 +12,7 @@
 */
@Component
@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
@Order(0)
public class UserSetting {

    private Boolean savePositionHistory = Boolean.FALSE;
@@ -35,6 +37,8 @@

    private Boolean useSourceIpAsStreamIp = Boolean.FALSE;

    private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;

    private Boolean streamOnDemand = Boolean.TRUE;

    private Boolean pushAuthority = Boolean.TRUE;
@@ -42,6 +46,10 @@
    private Boolean gbSendStreamStrict = Boolean.FALSE;

    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

    private Boolean pushStreamAfterAck = Boolean.FALSE;

    private Boolean sipLog = Boolean.FALSE;

    private String serverId = "000000";

@@ -196,4 +204,28 @@
    public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
        this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
    }

    public Boolean getPushStreamAfterAck() {
        return pushStreamAfterAck;
    }

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

    public Boolean getSipUseSourceIpAsRemoteAddress() {
        return sipUseSourceIpAsRemoteAddress;
    }

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

    public Boolean getSipLog() {
        return sipLog;
    }

    public void setSipLog(Boolean sipLog) {
        this.sipLog = sipLog;
    }
}