From 0191e937683b194733c7d4bcc1ba2d40099b8917 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 23 二月 2022 21:55:46 +0800
Subject: [PATCH] 同步主线
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 5a9436a..8238a83 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -27,6 +27,9 @@
public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback) {
OkHttpClient client = new OkHttpClient();
+ if (mediaServerItem == null) {
+ return null;
+ }
String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
JSONObject responseJSON = null;
@@ -134,18 +137,13 @@
}
File snapFile = new File(targetPath + "/" + fileName);
FileOutputStream outStream = new FileOutputStream(snapFile);
- ResponseBody responseBody = response.body();
- if (responseBody != null) {
- outStream.write(responseBody.bytes());
- }
+
+ outStream.write(Objects.requireNonNull(response.body()).bytes());
outStream.close();
} else {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s %s", url, response.code(), response.message()));
}
- ResponseBody responseBody = response.body();
- if (responseBody != null) {
- responseBody.close();
- }
+ Objects.requireNonNull(response.body()).close();
} else {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s %s", url, response.code(), response.message()));
}
@@ -243,6 +241,10 @@
return sendPost(mediaServerItem, "stopSendRtp",param, null);
}
+ public JSONObject restartServer(MediaServerItem mediaServerItem) {
+ return sendPost(mediaServerItem, "restartServer",null, null);
+ }
+
public JSONObject addStreamProxy(MediaServerItem mediaServerItem, String app, String stream, String url, boolean enable_hls, boolean enable_mp4, String rtp_type) {
Map<String, Object> param = new HashMap<>();
param.put("vhost", "__defaultVhost__");
--
Gitblit v1.8.0