From c1a8e62f2341e380f25f9f5b5029865777c0118a Mon Sep 17 00:00:00 2001
From: koisi <kor.coeo@gmail.com>
Date: 星期一, 05 八月 2024 17:04:58 +0800
Subject: [PATCH] 修复6月25日合并271时，变量类型未同步更新的问题
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 4790fa4..4b85e0d 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,15 +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;
-import org.springframework.util.ObjectUtils;
@Component
@ConfigurationProperties(prefix = "sip", ignoreInvalidFields = true)
+@Order(0)
public class SipConfig {
private String ip;
+
+ private String showIp;
private Integer port;
@@ -94,9 +97,11 @@
this.alarm = alarm;
}
- public void getLocalIp(String deviceLocalIp) {
- if (ObjectUtils.isEmpty(deviceLocalIp)) {
+ public String getShowIp() {
+ return showIp;
+ }
- }
+ public void setShowIp(String showIp) {
+ this.showIp = showIp;
}
}
--
Gitblit v1.8.0