From 2e5d94181a3c02c819f2fec4c5d88378bf2b5848 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 31 三月 2023 08:56:54 +0800
Subject: [PATCH] 支持修改页面展示的sip ip
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 14 ++++++++++----
src/main/resources/all-application.yml | 4 ++--
web_src/src/components/dialog/configInfo.vue | 2 +-
3 files changed, 13 insertions(+), 7 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 d4c7b83..600b9e8 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -4,7 +4,6 @@
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)
@@ -12,6 +11,8 @@
public class SipConfig {
private String ip;
+
+ private String showIp;
private Integer port;
@@ -96,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;
}
}
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index bfa4bcf..d0a8289 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -65,10 +65,10 @@
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
- # [蹇呴』淇敼] 鏈満鐨処P, 蹇呴』鏄綉鍗′笂鐨処P锛岀敤浜巗ip涓嬪崗璁爤鐩戝惉ip锛屽鏋滅洃鍚墍鏈夎缃负0.0.0.0
- monitor-ip: 0.0.0.0
# [蹇呴』淇敼] 鏈満鐨処P
ip: 192.168.0.100
+ # [鍙�塢 娌℃湁浠讳綍涓氬姟闇�姹傦紝浠呬粎鏄湪鍓嶇灞曠ず鐨勬椂鍊欑敤
+ show-ip: 192.168.0.100
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
diff --git a/web_src/src/components/dialog/configInfo.vue b/web_src/src/components/dialog/configInfo.vue
index 83d9f38..4ac90cc 100644
--- a/web_src/src/components/dialog/configInfo.vue
+++ b/web_src/src/components/dialog/configInfo.vue
@@ -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>
--
Gitblit v1.8.0