合并主线

648540858

2023-07-01 c551164c89f70e664b498c3a09e615928261e01a

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

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

import org.springframework.core.annotation.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
@@ -33,7 +33,7 @@

    private Boolean logInDatebase = Boolean.TRUE;

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

    private Boolean useSourceIpAsStreamIp = Boolean.FALSE;

@@ -46,6 +46,8 @@
    private Boolean gbSendStreamStrict = Boolean.FALSE;

    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

    private Boolean pushStreamAfterAck = Boolean.FALSE;

    private Boolean sipLog = Boolean.FALSE;
    private Boolean sqlLog = Boolean.FALSE;
@@ -62,11 +64,19 @@

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

    private String broadcastForPlatform = "UDP";

    private String civilCodeFile = "classpath:civilCode.csv";

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

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

    private int maxNotifyCountQueue = 10000;

    private int registerAgainAfterTime = 60;

    private boolean registerKeepIntDialog = false;

    public Boolean getSavePositionHistory() {
        return savePositionHistory;
@@ -216,6 +226,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;
    }
@@ -295,4 +321,28 @@
    public void setSqlLog(Boolean sqlLog) {
        this.sqlLog = sqlLog;
    }

    public String getCivilCodeFile() {
        return civilCodeFile;
    }

    public void setCivilCodeFile(String civilCodeFile) {
        this.civilCodeFile = civilCodeFile;
    }

    public int getRegisterAgainAfterTime() {
        return registerAgainAfterTime;
    }

    public void setRegisterAgainAfterTime(int registerAgainAfterTime) {
        this.registerAgainAfterTime = registerAgainAfterTime;
    }

    public boolean isRegisterKeepIntDialog() {
        return registerKeepIntDialog;
    }

    public void setRegisterKeepIntDialog(boolean registerKeepIntDialog) {
        this.registerKeepIntDialog = registerKeepIntDialog;
    }
}