支持修改页面展示的sip ip
This commit is contained in:
parent
6c969a63dd
commit
2e5d94181a
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -65,10 +65,10 @@ server:
|
||||
|
||||
# 作为28181服务器的配置
|
||||
sip:
|
||||
# [必须修改] 本机的IP, 必须是网卡上的IP,用于sip下协议栈监听ip,如果监听所有设置为0.0.0.0
|
||||
monitor-ip: 0.0.0.0
|
||||
# [必须修改] 本机的IP
|
||||
ip: 192.168.0.100
|
||||
# [可选] 没有任何业务需求,仅仅是在前端展示的时候用
|
||||
show-ip: 192.168.0.100
|
||||
# [可选] 28181服务监听的端口
|
||||
port: 5060
|
||||
# 根据国标6.1.2中规定,domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码(由省级、市级、区级、基层编号组成,参照GB/T 2260-2007)
|
||||
|
@ -13,7 +13,7 @@
|
||||
<el-descriptions title="国标服务信息" v-if="configInfoData.sip" :span="2">
|
||||
<el-descriptions-item label="编号" >{{configInfoData.sip.id}}</el-descriptions-item>
|
||||
<el-descriptions-item label="域">{{configInfoData.sip.domain}}</el-descriptions-item>
|
||||
<el-descriptions-item label="IP">{{configInfoData.sip.ip}}</el-descriptions-item>
|
||||
<el-descriptions-item label="IP">{{configInfoData.sip.showIp}}</el-descriptions-item>
|
||||
<el-descriptions-item label="端口">{{configInfoData.sip.port}}</el-descriptions-item>
|
||||
<el-descriptions-item label="密码">
|
||||
<el-tag size="small">{{configInfoData.sip.password}}</el-tag>
|
||||
|
Loading…
Reference in New Issue
Block a user