From 193e1a24a19b6bd97330a9a5cd3ea172d85d20ce Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 23 三月 2023 20:52:05 +0800 Subject: [PATCH] 优化对assist接口的代理 --- src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 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 6fa802d..d4c7b83 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,17 @@ package com.genersoft.iot.vmp.conf; +import org.junit.jupiter.api.Order; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; @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 Integer port; @@ -25,18 +23,12 @@ Integer ptzSpeed = 50; - Integer keepaliveTimeOut = 255; - Integer registerTimeInterval = 120; - private boolean alarm = false; + 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 +51,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 +84,6 @@ return ptzSpeed; } - public Integer getKeepaliveTimeOut() { - return keepaliveTimeOut; - } - public Integer getRegisterTimeInterval() { return registerTimeInterval; } @@ -114,4 +95,10 @@ public void setAlarm(boolean alarm) { this.alarm = alarm; } + + public void getLocalIp(String deviceLocalIp) { + if (ObjectUtils.isEmpty(deviceLocalIp)) { + + } + } } -- Gitblit v1.8.0