|
|
@@ -4,7 +4,6 @@ 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)
|
|
|
@@ -13,6 +12,8 @@ public class SipConfig {
|
|
|
|
|
|
private String ip;
|
|
|
|
|
|
+ private String showIp;
|
|
|
+
|
|
|
private Integer port;
|
|
|
|
|
|
private String domain;
|
|
|
@@ -96,9 +97,14 @@ public class SipConfig {
|
|
|
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;
|
|
|
}
|
|
|
}
|