From 11d40d3e220a3f12453136fedbbdc99f93c6c1b1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 15 三月 2022 10:47:07 +0800
Subject: [PATCH] #396

---
 src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java |  151 ++++++++++++++++++++++++++------------------------
 1 files changed, 79 insertions(+), 72 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..d1d0e20 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
@@ -84,11 +19,19 @@
 
     private Long playTimeout = 18000L;
 
-    private Boolean waitTrack = Boolean.FALSE;
-
     private Boolean interfaceAuthentication = Boolean.TRUE;
 
-    private Boolean recordPushLive = Boolean.FALSE;
+    private Boolean recordPushLive = Boolean.TRUE;
+
+    private Boolean recordSip = Boolean.TRUE;
+
+    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<>();
 
@@ -112,10 +55,6 @@
         return playTimeout;
     }
 
-    public Boolean isWaitTrack() {
-        return waitTrack;
-    }
-
     public Boolean isInterfaceAuthentication() {
         return interfaceAuthentication;
     }
@@ -127,4 +66,72 @@
     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 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;
+    }
+
+    public Boolean getRecordSip() {
+        return recordSip;
+    }
+
+    public void setRecordSip(Boolean recordSip) {
+        this.recordSip = recordSip;
+    }
 }

--
Gitblit v1.8.0