From cf23816c80771c9e22bb50d0d89feb34d2edca79 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 一月 2022 16:42:58 +0800
Subject: [PATCH] 恢复合并的limit值

---
 src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java |  137 ++++++++++++++++++++++++---------------------
 1 files changed, 72 insertions(+), 65 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
index 3a95d66..8a4c021 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
@@ -1,75 +1,10 @@
 package com.genersoft.iot.vmp.conf;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-
-//@Configuration("userSetup")
-//public class UserSetup {
-//    @Value("${userSettings.savePositionHistory:false}")
-//    boolean savePositionHistory;
-//
-//    @Value("${userSettings.autoApplyPlay}")
-//    private boolean autoApplyPlay;
-//
-//    @Value("${userSettings.seniorSdp:false}")
-//    private boolean seniorSdp;
-//
-//    @Value("${userSettings.playTimeout:18000}")
-//    private long playTimeout;
-//
-//    @Value("${userSettings.waitTrack:false}")
-//    private boolean waitTrack;
-//
-//    @Value("${userSettings.interfaceAuthentication}")
-//    private boolean interfaceAuthentication;
-//
-//    @Value("${userSettings.recordPushLive}")
-//    private boolean recordPushLive;
-//
-//    @Value("${userSettings.interfaceAuthenticationExcludes:}")
-//    private String interfaceAuthenticationExcludes;
-//
-//    public boolean getSavePositionHistory() {
-//        return savePositionHistory;
-//    }
-//
-//    public boolean isSavePositionHistory() {
-//        return savePositionHistory;
-//    }
-//
-//    public boolean isAutoApplyPlay() {
-//        return autoApplyPlay;
-//    }
-//
-//    public boolean isSeniorSdp() {
-//        return seniorSdp;
-//    }
-//
-//    public long getPlayTimeout() {
-//        return playTimeout;
-//    }
-//
-//    public boolean isWaitTrack() {
-//        return waitTrack;
-//    }
-//
-//    public boolean isInterfaceAuthentication() {
-//        return interfaceAuthentication;
-//    }
-//
-//    public boolean isRecordPushLive() {
-//        return recordPushLive;
-//    }
-//
-//    public String getInterfaceAuthenticationExcludes() {
-//        return interfaceAuthenticationExcludes;
-//    }
-//}
 
 
 @Component
@@ -89,6 +24,14 @@
     private Boolean interfaceAuthentication = Boolean.TRUE;
 
     private Boolean recordPushLive = Boolean.FALSE;
+
+    private Boolean logInDatebase = Boolean.TRUE;
+
+    private Boolean redisConfig = Boolean.TRUE;
+
+    private String serverId = "000000";
+
+    private String thirdPartyGBIdReg = "[\\s\\S]*";
 
     private List<String> interfaceAuthenticationExcludes = new ArrayList<>();
 
@@ -127,4 +70,68 @@
     public List<String> getInterfaceAuthenticationExcludes() {
         return interfaceAuthenticationExcludes;
     }
+
+    public void setSavePositionHistory(Boolean savePositionHistory) {
+        this.savePositionHistory = savePositionHistory;
+    }
+
+    public void setAutoApplyPlay(Boolean autoApplyPlay) {
+        this.autoApplyPlay = autoApplyPlay;
+    }
+
+    public void setSeniorSdp(Boolean seniorSdp) {
+        this.seniorSdp = seniorSdp;
+    }
+
+    public void setPlayTimeout(Long playTimeout) {
+        this.playTimeout = playTimeout;
+    }
+
+    public void setWaitTrack(Boolean waitTrack) {
+        this.waitTrack = waitTrack;
+    }
+
+    public void setInterfaceAuthentication(boolean interfaceAuthentication) {
+        this.interfaceAuthentication = interfaceAuthentication;
+    }
+
+    public void setRecordPushLive(Boolean recordPushLive) {
+        this.recordPushLive = recordPushLive;
+    }
+
+    public void setInterfaceAuthenticationExcludes(List<String> interfaceAuthenticationExcludes) {
+        this.interfaceAuthenticationExcludes = interfaceAuthenticationExcludes;
+    }
+
+    public Boolean getLogInDatebase() {
+        return logInDatebase;
+    }
+
+    public void setLogInDatebase(Boolean logInDatebase) {
+        this.logInDatebase = logInDatebase;
+    }
+
+    public String getServerId() {
+        return serverId;
+    }
+
+    public void setServerId(String serverId) {
+        this.serverId = serverId;
+    }
+
+    public String getThirdPartyGBIdReg() {
+        return thirdPartyGBIdReg;
+    }
+
+    public void setThirdPartyGBIdReg(String thirdPartyGBIdReg) {
+        this.thirdPartyGBIdReg = thirdPartyGBIdReg;
+    }
+
+    public Boolean getRedisConfig() {
+        return redisConfig;
+    }
+
+    public void setRedisConfig(Boolean redisConfig) {
+        this.redisConfig = redisConfig;
+    }
 }

--
Gitblit v1.8.0