From 72b437cc52e2907c9a66d6bda60acbffc736cdb8 Mon Sep 17 00:00:00 2001
From: BradyXu <brady_xu@outlook.com>
Date: 星期日, 12 五月 2024 02:15:41 +0800
Subject: [PATCH] 修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP
---
src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java
old mode 100644
new mode 100755
index b4a0289..c9b4002
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java
@@ -7,7 +7,8 @@
private String password;
private String createTime;
private String updateTime;
- private int roleId;
+ private String pushKey;
+ private Role role;
public int getId() {
return id;
@@ -41,14 +42,6 @@
this.createTime = createTime;
}
- public int getRoleId() {
- return roleId;
- }
-
- public void setRoleId(int roleId) {
- this.roleId = roleId;
- }
-
public String getUpdateTime() {
return updateTime;
}
@@ -56,4 +49,20 @@
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
+
+ public Role getRole() {
+ return role;
+ }
+
+ public void setRole(Role role) {
+ this.role = role;
+ }
+
+ public String getPushKey() {
+ return pushKey;
+ }
+
+ public void setPushKey(String pushKey) {
+ this.pushKey = pushKey;
+ }
}
--
Gitblit v1.8.0