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/ZLMMediaListManager.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
index 3876309..ea1123c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
@@ -1,12 +1,9 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
-import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
@@ -19,7 +16,6 @@
import java.util.*;
-@SuppressWarnings("unchecked")
@Component
public class ZLMMediaListManager {
@@ -76,7 +72,7 @@
jsonObject.put("stream", streamPushItem.getStream());
jsonObject.put("mediaServerId", mediaServerItem.getId());
subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_play,jsonObject,
- (IMediaServerItem mediaServerItemInuse, JSONObject response)->{
+ (MediaServerItem mediaServerItemInuse, JSONObject response)->{
updateMedia(mediaServerItem, response.getString("app"), response.getString("stream"));
}
);
@@ -86,13 +82,13 @@
}
- public void addMedia(IMediaServerItem mediaServerItem, String app, String streamId) {
+ public void addMedia(MediaServerItem mediaServerItem, String app, String streamId) {
//浣跨敤寮傛鏇存柊鎺ㄦ祦
updateMedia(mediaServerItem, app, streamId);
}
- public void updateMedia(IMediaServerItem mediaServerItem, String app, String streamId) {
+ public void updateMedia(MediaServerItem mediaServerItem, String app, String streamId) {
//浣跨敤寮傛鏇存柊鎺ㄦ祦
zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId, "rtmp", json->{
--
Gitblit v1.8.0