From 0faa5936584c7e816034db997017d90648a4ada6 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期二, 06 七月 2021 16:38:31 +0800
Subject: [PATCH] 规范配置文件，添加接口鉴权的例外接口配置

---
 src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java |  116 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 93 insertions(+), 23 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 3c94d86..3a95d66 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,130 @@
 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;
 
-@Configuration("userSetup")
+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
+@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
 public class UserSetup {
-    @Value("${userSettings.savePositionHistory:false}")
-    boolean savePositionHistory;
 
-    @Value("${userSettings.autoApplyPlay}")
-    private boolean autoApplyPlay;
+    private Boolean savePositionHistory = Boolean.FALSE;
 
-    @Value("${userSettings.seniorSdp:false}")
-    private boolean seniorSdp;
+    private Boolean autoApplyPlay = Boolean.FALSE;
 
-    @Value("${userSettings.playTimeout:18000}")
-    private long playTimeout;
+    private Boolean seniorSdp = Boolean.FALSE;
 
-    @Value("${userSettings.waitTrack:false}")
-    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 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;
+    }
 }

--
Gitblit v1.8.0