From 273b282af6f74403a0b13d2694beb4b7f48edaf6 Mon Sep 17 00:00:00 2001
From: gaoxun250@sina.com <gaoxun250@sina.com>
Date: 星期五, 10 三月 2023 10:33:48 +0800
Subject: [PATCH] 防止回放空时报空指针

---
 src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
index ca204d9..1e7fd36 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.conf;
 
+import org.junit.jupiter.api.Order;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -11,6 +12,7 @@
  */
 @Component
 @ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
+@Order(0)
 public class UserSetting {
 
     private Boolean savePositionHistory = Boolean.FALSE;
@@ -35,11 +37,17 @@
 
     private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
 
+    private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;
+
     private Boolean streamOnDemand = Boolean.TRUE;
 
     private Boolean pushAuthority = Boolean.TRUE;
 
     private Boolean gbSendStreamStrict = Boolean.FALSE;
+
+    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
+
+    private Boolean sipLog = Boolean.FALSE;
 
     private String serverId = "000000";
 
@@ -186,4 +194,28 @@
     public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
         this.gbSendStreamStrict = gbSendStreamStrict;
     }
+
+    public Boolean getSyncChannelOnDeviceOnline() {
+        return syncChannelOnDeviceOnline;
+    }
+
+    public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
+        this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
+    }
+
+    public Boolean getSipUseSourceIpAsRemoteAddress() {
+        return sipUseSourceIpAsRemoteAddress;
+    }
+
+    public void setSipUseSourceIpAsRemoteAddress(Boolean sipUseSourceIpAsRemoteAddress) {
+        this.sipUseSourceIpAsRemoteAddress = sipUseSourceIpAsRemoteAddress;
+    }
+
+    public Boolean getSipLog() {
+        return sipLog;
+    }
+
+    public void setSipLog(Boolean sipLog) {
+        this.sipLog = sipLog;
+    }
 }

--
Gitblit v1.8.0