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

648540858

2023-07-19 11c7deb876806a6bc85fbb3cbbbe5bb531e1cbdc

 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;

@@ -61,6 +61,8 @@
    private String recordPath = null;

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

    private String broadcastForPlatform = "UDP";

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

@@ -222,6 +224,14 @@
        this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
    }

    public String getBroadcastForPlatform() {
        return broadcastForPlatform;
    }

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

    public Boolean getSipUseSourceIpAsRemoteAddress() {
        return sipUseSourceIpAsRemoteAddress;
    }