From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 4776551..c0fcf01 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 io.swagger.models.auth.In;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -19,7 +20,7 @@
private Boolean seniorSdp = Boolean.FALSE;
- private Long playTimeout = 18000L;
+ private Integer playTimeout = 18000;
private int platformPlayTimeout = 60000;
@@ -55,7 +56,7 @@
return seniorSdp;
}
- public Long getPlayTimeout() {
+ public Integer getPlayTimeout() {
return playTimeout;
}
@@ -83,7 +84,7 @@
this.seniorSdp = seniorSdp;
}
- public void setPlayTimeout(Long playTimeout) {
+ public void setPlayTimeout(Integer playTimeout) {
this.playTimeout = playTimeout;
}
--
Gitblit v1.8.0