Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

xu-bin-bin

2023-10-24 ae9976bb3a59cc3d9952dda6d9388bb412baa158

 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;
   }
}