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 值判断来源是直播流合适国标
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;