From 7d5a5b6c8fa20720a01986e9498a4cee6ec3674b Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 30 五月 2023 13:24:46 +0800
Subject: [PATCH] 删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index bbc946b..6a6c54f 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,19 +1,18 @@
package com.genersoft.iot.vmp.conf;
+import org.springframework.core.annotation.Order;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Component
@ConfigurationProperties(prefix = "sip", ignoreInvalidFields = true)
+@Order(0)
public class SipConfig {
private String ip;
- /**
- * 榛樿浣跨敤 0.0.0.0
- */
- private String monitorIp = "0.0.0.0";
+ private String showIp;
private Integer port;
@@ -25,18 +24,12 @@
Integer ptzSpeed = 50;
- Integer keepaliveTimeOut = 255;
-
Integer registerTimeInterval = 120;
private boolean alarm;
public void setIp(String ip) {
this.ip = ip;
- }
-
- public void setMonitorIp(String monitorIp) {
- this.monitorIp = monitorIp;
}
public void setPort(Integer port) {
@@ -59,16 +52,9 @@
this.ptzSpeed = ptzSpeed;
}
- public void setKeepaliveTimeOut(Integer keepaliveTimeOut) {
- this.keepaliveTimeOut = keepaliveTimeOut;
- }
public void setRegisterTimeInterval(Integer registerTimeInterval) {
this.registerTimeInterval = registerTimeInterval;
- }
-
- public String getMonitorIp() {
- return monitorIp;
}
public String getIp() {
@@ -99,10 +85,6 @@
return ptzSpeed;
}
- public Integer getKeepaliveTimeOut() {
- return keepaliveTimeOut;
- }
-
public Integer getRegisterTimeInterval() {
return registerTimeInterval;
}
@@ -114,4 +96,15 @@
public void setAlarm(boolean alarm) {
this.alarm = alarm;
}
+
+ public String getShowIp() {
+ if (this.showIp == null) {
+ return this.ip;
+ }
+ return showIp;
+ }
+
+ public void setShowIp(String showIp) {
+ this.showIp = showIp;
+ }
}
--
Gitblit v1.8.0