From 38a85d432ae9bb861dbcbf090d68fb3dca0d85f6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 十一月 2022 17:51:45 +0800
Subject: [PATCH] 修复合并的bug
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 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 c0fcf01..a2d3054 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.conf;
-import io.swagger.models.auth.In;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -32,7 +31,17 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean redisConfig = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
+
+ private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
+
+ private Boolean streamOnDemand = Boolean.TRUE;
+
+ private Boolean pushAuthority = Boolean.TRUE;
+
+ private Boolean gbSendStreamStrict = Boolean.FALSE;
+
+ private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
private String serverId = "000000";
@@ -124,14 +133,6 @@
this.thirdPartyGBIdReg = thirdPartyGBIdReg;
}
- public Boolean getRedisConfig() {
- return redisConfig;
- }
-
- public void setRedisConfig(Boolean redisConfig) {
- this.redisConfig = redisConfig;
- }
-
public Boolean getRecordSip() {
return recordSip;
}
@@ -147,4 +148,52 @@
public void setPlatformPlayTimeout(int platformPlayTimeout) {
this.platformPlayTimeout = platformPlayTimeout;
}
+
+ public Boolean isUsePushingAsStatus() {
+ return usePushingAsStatus;
+ }
+
+ public void setUsePushingAsStatus(Boolean usePushingAsStatus) {
+ this.usePushingAsStatus = usePushingAsStatus;
+ }
+
+ public Boolean getStreamOnDemand() {
+ return streamOnDemand;
+ }
+
+ public void setStreamOnDemand(Boolean streamOnDemand) {
+ this.streamOnDemand = streamOnDemand;
+ }
+
+ public Boolean getUseSourceIpAsStreamIp() {
+ return useSourceIpAsStreamIp;
+ }
+
+ public void setUseSourceIpAsStreamIp(Boolean useSourceIpAsStreamIp) {
+ this.useSourceIpAsStreamIp = useSourceIpAsStreamIp;
+ }
+
+ public Boolean getPushAuthority() {
+ return pushAuthority;
+ }
+
+ public void setPushAuthority(Boolean pushAuthority) {
+ this.pushAuthority = pushAuthority;
+ }
+
+ public Boolean getGbSendStreamStrict() {
+ return gbSendStreamStrict;
+ }
+
+ public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
+ this.gbSendStreamStrict = gbSendStreamStrict;
+ }
+
+ public Boolean getSyncChannelOnDeviceOnline() {
+ return syncChannelOnDeviceOnline;
+ }
+
+ public void setSyncChannelOnDeviceOnline(Boolean syncChannelOnDeviceOnline) {
+ this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
+ }
}
--
Gitblit v1.8.0