From a8c424e49db9213e879bf6c44cebccdfddaa1808 Mon Sep 17 00:00:00 2001 From: BradyXu Date: Sun, 12 May 2024 02:00:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsip=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=A4=9A=E7=BD=91=E5=8D=A1IP=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=8A=E7=BA=A7=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=9C=AC=E5=9C=B0IP=E6=94=B9=E6=88=90=E4=BB=8E?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E5=A4=9AIP=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/dialog/platformEdit.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue index 4c02dfcd..06cb7c41 100755 --- a/web_src/src/components/dialog/platformEdit.vue +++ b/web_src/src/components/dialog/platformEdit.vue @@ -32,7 +32,14 @@ - + + + + @@ -165,6 +172,7 @@ export default { administrativeDivision: "", sendStreamIp: null, }, + deviceIp: [], // 存储用户选择的设备IP rules: { name: [{ required: true, message: "请输入平台名称", trigger: "blur" }], serverGBId: [ @@ -198,7 +206,7 @@ export default { console.log(res); if (res.data.code === 0) { that.platform.deviceGBId = res.data.data.username; - that.platform.deviceIp = res.data.data.deviceIp; + that.deviceIp = res.data.data.deviceIp.split(','); that.platform.devicePort = res.data.data.devicePort; that.platform.username = res.data.data.username; that.platform.password = res.data.data.password; @@ -222,7 +230,7 @@ export default { this.platform.serverIP = platform.serverIP; this.platform.serverPort = platform.serverPort; this.platform.deviceGBId = platform.deviceGBId; - this.platform.deviceIp = platform.deviceIp; + this.deviceIp = platform.deviceIp.split(','); this.platform.devicePort = platform.devicePort; this.platform.username = platform.username; this.platform.password = platform.password; From 72b437cc52e2907c9a66d6bda60acbffc736cdb8 Mon Sep 17 00:00:00 2001 From: BradyXu Date: Sun, 12 May 2024 02:15:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7=E5=B9=B3=E5=8F=B0=E7=82=B9=E6=92=AD=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E5=B9=B3=E5=8F=B0=E5=92=8C=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B1=80=E5=9F=9F=E7=BD=91=E4=B8=8D=E9=80=9A?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=8E=A8=E6=B5=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E3=80=82=E6=8E=A8=E6=B5=81=E7=9B=AE=E6=A0=87IP?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=BA=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?SDP=E5=8F=91=E6=B5=81IP=EF=BC=8C=E5=A6=82=E6=9E=9CSDP=E5=8F=91?= =?UTF-8?q?=E6=B5=81IP=E5=AD=98=E5=9C=A8=E7=9A=84=E8=AF=9D=E3=80=82?= =?UTF-8?q?=E5=90=A6=E5=88=99=E8=BF=98=E6=98=AF=E4=BB=8E=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96=E6=8E=A8=E6=B5=81=E7=9B=AE=E6=A0=87?= =?UTF-8?q?IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/request/impl/InviteRequestProcessor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java index 794a0dc7..e3a25ec8 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java @@ -335,8 +335,12 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements return; } String username = sdp.getOrigin().getUsername(); - String addressStr = sdp.getConnection().getAddress(); - + String addressStr; + if(StringUtils.isEmpty(platform.getSendStreamIp())){ + addressStr = sdp.getConnection().getAddress(); + }else { + addressStr = platform.getSendStreamIp(); + } Device device = null; // 通过 channel 和 gbStream 是否为null 值判断来源是直播流合适国标