Merge pull request #893 from sxh-netizen/wvp-28181-2.0

648540858

2023-06-20 fa62ab9a0143433a5d058ab3229a37e4a9a0f696

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

@@ -63,13 +63,17 @@

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


    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;
@@ -299,9 +303,27 @@
        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;
    }
}