From b5ccb1636fc0efb0ea9d87c38995fee14cfd45d3 Mon Sep 17 00:00:00 2001 From: AlphaWu <wp@zafu.edu.cn> Date: 星期日, 20 八月 2023 15:50:24 +0800 Subject: [PATCH] 修正Database拼写错误。 --- src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 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 d4c7b83..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,10 +1,9 @@ package com.genersoft.iot.vmp.conf; -import org.junit.jupiter.api.Order; +import org.springframework.core.annotation.Order; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import org.springframework.util.ObjectUtils; @Component @ConfigurationProperties(prefix = "sip", ignoreInvalidFields = true) @@ -12,6 +11,8 @@ public class SipConfig { private String ip; + + private String showIp; private Integer port; @@ -96,9 +97,14 @@ this.alarm = alarm; } - public void getLocalIp(String deviceLocalIp) { - if (ObjectUtils.isEmpty(deviceLocalIp)) { - + public String getShowIp() { + if (this.showIp == null) { + return this.ip; } + return showIp; + } + + public void setShowIp(String showIp) { + this.showIp = showIp; } } -- Gitblit v1.8.0