From e932a9b824b93a4a0365e11f1e02775b10c0b045 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 01 三月 2024 10:55:49 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 16 ++++++++++++----
1 files changed, 12 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..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,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,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