From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 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
old mode 100644
new mode 100755
index 77758a3..ea0b224
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -30,13 +30,20 @@
}
private OkHttpClient getClient(){
+ return getClient(null);
+ }
+
+ private OkHttpClient getClient(Integer readTimeOut){
if (client == null) {
+ if (readTimeOut == null) {
+ readTimeOut = 10;
+ }
OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
//todo 鏆傛椂鍐欐瓒呮椂鏃堕棿 鍧囦负5s
// 璁剧疆杩炴帴瓒呮椂鏃堕棿
- httpClientBuilder.connectTimeout(5,TimeUnit.SECONDS);
+ httpClientBuilder.connectTimeout(8,TimeUnit.SECONDS);
// 璁剧疆璇诲彇瓒呮椂鏃堕棿
- httpClientBuilder.readTimeout(10,TimeUnit.SECONDS);
+ httpClientBuilder.readTimeout(readTimeOut,TimeUnit.SECONDS);
// 璁剧疆杩炴帴姹�
httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES));
if (logger.isDebugEnabled()) {
@@ -53,9 +60,13 @@
}
-
public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback) {
- OkHttpClient client = getClient();
+ return sendPost(mediaServerItem, api, param, callback, null);
+ }
+
+
+ public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback, Integer readTimeOut) {
+ OkHttpClient client = getClient(readTimeOut);
if (mediaServerItem == null) {
return null;
@@ -152,7 +163,6 @@
public void sendGetForImg(MediaServerItem mediaServerItem, String api, Map<String, Object> params, String targetPath, String fileName) {
String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
- logger.debug(url);
HttpUrl parseUrl = HttpUrl.parse(url);
if (parseUrl == null) {
return;
@@ -191,16 +201,31 @@
} else {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s %s", url, response.code(), response.message()));
}
- Objects.requireNonNull(response.body()).close();
} else {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s %s", url, response.code(), response.message()));
}
+ Objects.requireNonNull(response.body()).close();
} catch (ConnectException e) {
logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
} catch (IOException e) {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
}
+ }
+
+ public JSONObject isMediaOnline(MediaServerItem mediaServerItem, String app, String stream, String schema){
+ Map<String, Object> param = new HashMap<>();
+ if (app != null) {
+ param.put("app",app);
+ }
+ if (stream != null) {
+ param.put("stream",stream);
+ }
+ if (schema != null) {
+ param.put("schema",schema);
+ }
+ param.put("vhost","__defaultVhost__");
+ return sendPost(mediaServerItem, "isMediaOnline", param, null);
}
public JSONObject getMediaList(MediaServerItem mediaServerItem, String app, String stream, String schema, RequestCallback callback){
@@ -260,6 +285,12 @@
return sendPost(mediaServerItem, "delFFmpegSource",param, null);
}
+ public JSONObject delStreamProxy(MediaServerItem mediaServerItem, String key){
+ Map<String, Object> param = new HashMap<>();
+ param.put("key", key);
+ return sendPost(mediaServerItem, "delStreamProxy",param, null);
+ }
+
public JSONObject getMediaServerConfig(MediaServerItem mediaServerItem){
return sendPost(mediaServerItem, "getServerConfig",null, null);
}
@@ -288,6 +319,10 @@
return sendPost(mediaServerItem, "startSendRtp",param, null);
}
+ public JSONObject startSendRtpPassive(MediaServerItem mediaServerItem, Map<String, Object> param) {
+ return sendPost(mediaServerItem, "startSendRtpPassive",param, null);
+ }
+
public JSONObject stopSendRtp(MediaServerItem mediaServerItem, Map<String, Object> param) {
return sendPost(mediaServerItem, "stopSendRtp",param, null);
}
@@ -305,7 +340,7 @@
param.put("enable_mp4", enable_mp4?1:0);
param.put("enable_audio", enable_audio?1:0);
param.put("rtp_type", rtp_type);
- return sendPost(mediaServerItem, "addStreamProxy",param, null);
+ return sendPost(mediaServerItem, "addStreamProxy",param, null, 20);
}
public JSONObject closeStreams(MediaServerItem mediaServerItem, String app, String stream) {
@@ -346,4 +381,29 @@
param.put("stream_id", streamId);
return sendPost(mediaServerItem, "resumeRtpCheck",param, null);
}
+
+ public JSONObject connectRtpServer(MediaServerItem mediaServerItem, String dst_url, int dst_port, String stream_id) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("dst_url", dst_url);
+ param.put("dst_port", dst_port);
+ param.put("stream_id", stream_id);
+ return sendPost(mediaServerItem, "connectRtpServer",param, null);
+ }
+
+ public JSONObject updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("ssrc", ssrc);
+ param.put("stream_id", streamId);
+ return sendPost(mediaServerItem, "updateRtpServerSSRC",param, null);
+ }
+
+ public JSONObject deleteRecordDirectory(MediaServerItem mediaServerItem, String app, String stream, String date, String fileName) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", app);
+ param.put("stream", stream);
+ param.put("period", date);
+ param.put("name", fileName);
+ return sendPost(mediaServerItem, "deleteRecordDirectory",param, null);
+ }
}
--
Gitblit v1.8.0