From 0984290ca2a75cf0316c3ca312bf8026b4edcf3e Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:38 +0800
Subject: [PATCH] 继续优化docker配置： 1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段，方便配置JVM参数 2.修复一处错误，application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
index 3f997a6..40ba215 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
@@ -7,6 +7,7 @@
private String type;
private String app;
private String stream;
+ private String mediaServerId;
private String url;
private String src_url;
private String dst_url;
@@ -17,6 +18,7 @@
private boolean enable_hls;
private boolean enable_mp4;
private String platformGbId;
+ private String createTime;
public String getType() {
return type;
@@ -40,6 +42,16 @@
public void setStream(String stream) {
this.stream = stream;
+ }
+
+ @Override
+ public String getMediaServerId() {
+ return mediaServerId;
+ }
+
+ @Override
+ public void setMediaServerId(String mediaServerId) {
+ this.mediaServerId = mediaServerId;
}
public String getUrl() {
@@ -122,4 +134,12 @@
public void setPlatformGbId(String platformGbId) {
this.platformGbId = platformGbId;
}
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
}
--
Gitblit v1.8.0