From f1d079f9c0b3d384090477ca54e0548373d62b57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 16 Jan 2025 11:56:39 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 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 d0b1cb2..c0ee6ab 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
@@ -12,6 +12,7 @@
import java.io.*;
import java.net.ConnectException;
+import java.net.SocketTimeoutException;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -22,12 +23,18 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRESTfulUtils.class);
+
+
+
public interface RequestCallback{
void run(JSONObject response);
}
private OkHttpClient getClient(){
OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
+ //todo 暂时写死超时时间 均为5s
+ httpClientBuilder.connectTimeout(5,TimeUnit.SECONDS); //设置连接超时时间
+ httpClientBuilder.readTimeout(5,TimeUnit.SECONDS); //设置读取超时时间
if (logger.isDebugEnabled()) {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> {
logger.debug("http请求参数：" + message);
@@ -47,7 +54,10 @@
return null;
}
String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
- JSONObject responseJSON = null;
+ JSONObject responseJSON = new JSONObject();
+ //-2自定义流媒体 调用错误码
+ responseJSON.put("code",-2);
+ responseJSON.put("msg","流媒体调用失败");
FormBody.Builder builder = new FormBody.Builder();
builder.add("secret",mediaServerItem.getSecret());
@@ -78,11 +88,20 @@
response.close();
Objects.requireNonNull(response.body()).close();
}
- } catch (ConnectException e) {
- logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage()));
- logger.info("请检查media配置并确认ZLM已启动...");
}catch (IOException e) {
logger.error(String.format("[ %s ]请求失败: %s", url, e.getMessage()));
+
+ if(e instanceof SocketTimeoutException){
+ //读取超时超时异常
+ logger.error(String.format("读取ZLM数据失败: %s, %s", url, e.getMessage()));
+ }
+ if(e instanceof ConnectException){
+ //判断连接异常，我这里是报Failed to connect to 10.7.5.144
+ logger.error(String.format("连接ZLM失败: %s, %s", url, e.getMessage()));
+ }
+
+ }catch (Exception e){
+ logger.error(String.format("访问ZLM失败: %s, %s", url, e.getMessage()));
}
}else {
client.newCall(request).enqueue(new Callback(){
@@ -105,8 +124,16 @@
@Override
public void onFailure(@NotNull Call call, @NotNull IOException e) {
- logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage()));
- logger.info("请检查media配置并确认ZLM已启动...");
+ logger.error(String.format("连接ZLM失败: %s, %s", call.request().toString(), e.getMessage()));
+
+ if(e instanceof SocketTimeoutException){
+ //读取超时超时异常
+ logger.error(String.format("读取ZLM数据失败: %s, %s", call.request().toString(), e.getMessage()));
+ }
+ if(e instanceof ConnectException){
+ //判断连接异常，我这里是报Failed to connect to 10.7.5.144
+ logger.error(String.format("连接ZLM失败: %s, %s", call.request().toString(), e.getMessage()));
+ }
}
});
}
@@ -151,7 +178,7 @@
}
}
- File snapFile = new File(targetPath + "/" + fileName);
+ File snapFile = new File(targetPath + File.separator + fileName);
FileOutputStream outStream = new FileOutputStream(snapFile);
outStream.write(Objects.requireNonNull(response.body()).bytes());
@@ -269,6 +296,11 @@
param.put("url", url);
param.put("enable_hls", enable_hls?1:0);
param.put("enable_mp4", enable_mp4?1:0);
+ param.put("enable_rtmp", 1);
+ param.put("enable_fmp4", 1);
+ param.put("enable_audio", 1);
+ param.put("enable_rtsp", 1);
+ param.put("add_mute_audio", 1);
param.put("rtp_type", rtp_type);
return sendPost(mediaServerItem, "addStreamProxy",param, null);
}
@@ -293,10 +325,22 @@
}
public void getSnap(MediaServerItem mediaServerItem, String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
- Map<String, Object> param = new HashMap<>();
+ Map<String, Object> param = new HashMap<>(3);
param.put("url", flvUrl);
param.put("timeout_sec", timeout_sec);
param.put("expire_sec", expire_sec);
sendGetForImg(mediaServerItem, "getSnap", param, targetPath, fileName);
}
+
+ public JSONObject pauseRtpCheck(MediaServerItem mediaServerItem, String streamId) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("stream_id", streamId);
+ return sendPost(mediaServerItem, "pauseRtpCheck",param, null);
+ }
+
+ public JSONObject resumeRtpCheck(MediaServerItem mediaServerItem, String streamId) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("stream_id", streamId);
+ return sendPost(mediaServerItem, "resumeRtpCheck",param, null);
+ }
}
--
Gitblit v1.9.3