From 1de344674afd6bb35b51b165bbad76dbe6299b7e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 18:08:33 +0800
Subject: [PATCH] 使用冒号分隔redis的key

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 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 67b89d6..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,14 +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;
+
+	private String showIp;
 
 	private Integer port;
 
@@ -19,8 +23,6 @@
 	private String password;
 	
 	Integer ptzSpeed = 50;
-
-	Integer keepaliveTimeOut = 255;
 
 	Integer registerTimeInterval = 120;
 
@@ -50,9 +52,6 @@
 		this.ptzSpeed = ptzSpeed;
 	}
 
-	public void setKeepaliveTimeOut(Integer keepaliveTimeOut) {
-		this.keepaliveTimeOut = keepaliveTimeOut;
-	}
 
 	public void setRegisterTimeInterval(Integer registerTimeInterval) {
 		this.registerTimeInterval = registerTimeInterval;
@@ -86,10 +85,6 @@
 		return ptzSpeed;
 	}
 
-	public Integer getKeepaliveTimeOut() {
-		return keepaliveTimeOut;
-	}
-
 	public Integer getRegisterTimeInterval() {
 		return registerTimeInterval;
 	}
@@ -101,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