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/ZLMRunner.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 187cbc1..f20f74d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -81,6 +81,7 @@
if (startGetMedia == null) startGetMedia = new HashMap<>();
startGetMedia.put(mediaServerItem.getId(), true);
new Thread(() -> {
+
ZLMServerConfig zlmServerConfig = getMediaServerConfig(mediaServerItem);
if (zlmServerConfig != null) {
zlmServerConfig.setIp(mediaServerItem.getIp());
@@ -88,6 +89,7 @@
startGetMedia.remove(mediaServerItem.getId());
mediaServerService.handLeZLMServerConfig(zlmServerConfig);
}
+
}).start();
}
Timer timer = new Timer();
@@ -108,8 +110,13 @@
}
public ZLMServerConfig getMediaServerConfig(MediaServerItem mediaServerItem) {
- if (startGetMedia == null) return null;
- if ( startGetMedia.get(mediaServerItem.getId()) == null || !startGetMedia.get(mediaServerItem.getId())) return null;
+ if (startGetMedia == null) { return null;}
+ if (!mediaServerItem.isDefaultServer() && mediaServerService.getOne(mediaServerItem.getId()) == null) {
+ return null;
+ }
+ if ( startGetMedia.get(mediaServerItem.getId()) == null || !startGetMedia.get(mediaServerItem.getId())) {
+ return null;
+ }
JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
ZLMServerConfig ZLMServerConfig = null;
if (responseJSON != null) {
--
Gitblit v1.8.0