From 407a5b77c3586fef44dc771e48f05c2354740795 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期二, 07 九月 2021 09:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java |   97 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 72 insertions(+), 25 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 0357bd0..8b1b5b0 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
@@ -1,60 +1,107 @@
 package com.genersoft.iot.vmp.conf;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
-@Configuration("userSetup")
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Component
+@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
 public class UserSetup {
-    @Value("${userSettings.savePositionHistory}")
-    boolean savePositionHistory;
 
-    @Value("${userSettings.autoApplyPlay}")
-    private boolean autoApplyPlay;
+    private Boolean savePositionHistory = Boolean.FALSE;
 
-    @Value("${userSettings.seniorSdp}")
-    private boolean seniorSdp;
+    private Boolean autoApplyPlay = Boolean.FALSE;
 
-    @Value("${userSettings.playTimeout}")
-    private long playTimeout;
+    private Boolean seniorSdp = Boolean.FALSE;
 
-    @Value("${userSettings.waitTrack}")
-    private boolean waitTrack;
+    private Long playTimeout = 18000L;
 
-    @Value("${userSettings.interfaceAuthentication}")
-    private boolean interfaceAuthentication;
+    private Boolean waitTrack = Boolean.FALSE;
 
-    @Value("${userSettings.recordPushLive}")
-    private boolean recordPushLive;
+    private Boolean interfaceAuthentication = Boolean.TRUE;
 
-    public boolean getSavePositionHistory() {
+    private Boolean recordPushLive = Boolean.FALSE;
+
+    private Boolean logInDatebase = Boolean.TRUE;
+
+    private List<String> interfaceAuthenticationExcludes = new ArrayList<>();
+
+    public Boolean getSavePositionHistory() {
         return savePositionHistory;
     }
 
-    public boolean isSavePositionHistory() {
+    public Boolean isSavePositionHistory() {
         return savePositionHistory;
     }
 
-    public boolean isAutoApplyPlay() {
+    public Boolean isAutoApplyPlay() {
         return autoApplyPlay;
     }
 
-    public boolean isSeniorSdp() {
+    public Boolean isSeniorSdp() {
         return seniorSdp;
     }
 
-    public long getPlayTimeout() {
+    public Long getPlayTimeout() {
         return playTimeout;
     }
 
-    public boolean isWaitTrack() {
+    public Boolean isWaitTrack() {
         return waitTrack;
     }
 
-    public boolean isInterfaceAuthentication() {
+    public Boolean isInterfaceAuthentication() {
         return interfaceAuthentication;
     }
 
-    public boolean isRecordPushLive() {
+    public Boolean isRecordPushLive() {
         return recordPushLive;
     }
+
+    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;
+    }
 }

--
Gitblit v1.8.0