From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 151 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 99 insertions(+), 52 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 8e12e57..4b2bf48 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
@@ -2,14 +2,12 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.conf.MediaConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import okhttp3.*;
+import okhttp3.logging.HttpLoggingInterceptor;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.*;
@@ -17,6 +15,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import java.util.concurrent.TimeUnit;
@Component
public class ZLMRESTfulUtils {
@@ -27,11 +26,28 @@
void run(JSONObject response);
}
- public JSONObject sendPost(IMediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback) {
- OkHttpClient client = new OkHttpClient();
+ private OkHttpClient getClient(){
+ OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
+ if (logger.isDebugEnabled()) {
+ HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> {
+ logger.debug("http璇锋眰鍙傛暟锛�" + message);
+ });
+ logging.setLevel(HttpLoggingInterceptor.Level.BASIC);
+ // OkHttp閫茶娣诲姞鏀旀埅鍣╨oggingInterceptor
+ httpClientBuilder.addInterceptor(logging);
+ }
+ return httpClientBuilder.build();
+ }
+
+
+ public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback) {
+ OkHttpClient client = getClient();
+
+ if (mediaServerItem == null) {
+ return null;
+ }
String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
JSONObject responseJSON = null;
- logger.debug(url);
FormBody.Builder builder = new FormBody.Builder();
builder.add("secret",mediaServerItem.getSecret());
@@ -53,10 +69,14 @@
try {
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
- String responseStr = response.body().string();
- if (responseStr != null) {
+ ResponseBody responseBody = response.body();
+ if (responseBody != null) {
+ String responseStr = responseBody.string();
responseJSON = JSON.parseObject(responseStr);
}
+ }else {
+ response.close();
+ Objects.requireNonNull(response.body()).close();
}
} catch (ConnectException e) {
logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
@@ -76,6 +96,10 @@
} catch (IOException e) {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
}
+
+ }else {
+ response.close();
+ Objects.requireNonNull(response.body()).close();
}
}
@@ -92,71 +116,85 @@
return responseJSON;
}
-
- public void sendPostForImg(IMediaServerItem mediaServerItem, String api, Map<String, Object> param, String targetPath, String fileName) {
- OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
- JSONObject responseJSON = null;
+ 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;
+ }
+ HttpUrl.Builder httpBuilder = parseUrl.newBuilder();
- FormBody.Builder builder = new FormBody.Builder();
- builder.add("secret",mediaServerItem.getSecret());
- if (param != null && param.keySet().size() > 0) {
- for (String key : param.keySet()){
- if (param.get(key) != null) {
- builder.add(key, param.get(key).toString());
- }
+ httpBuilder.addQueryParameter("secret", mediaServerItem.getSecret());
+ if (params != null) {
+ for (Map.Entry<String, Object> param : params.entrySet()) {
+ httpBuilder.addQueryParameter(param.getKey(), param.getValue().toString());
}
}
- FormBody body = builder.build();
-
Request request = new Request.Builder()
- .post(body)
- .url(url)
+ .url(httpBuilder.build())
.build();
+ logger.info(request.toString());
try {
+ OkHttpClient client = new OkHttpClient.Builder()
+ .readTimeout(10, TimeUnit.SECONDS)
+ .build();
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
+ logger.info("response body contentType: " + Objects.requireNonNull(response.body()).contentType());
if (targetPath != null) {
File snapFolder = new File(targetPath);
if (!snapFolder.exists()) {
- snapFolder.mkdirs();
+ if (!snapFolder.mkdirs()) {
+ logger.warn("{}璺緞鍒涘缓澶辫触", snapFolder.getAbsolutePath());
+ }
+
}
File snapFile = new File(targetPath + "/" + fileName);
FileOutputStream outStream = new FileOutputStream(snapFile);
- outStream.write(response.body().bytes());
+
+ outStream.write(Objects.requireNonNull(response.body()).bytes());
outStream.close();
+ } 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()));
}
} catch (ConnectException e) {
logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
- }catch (IOException e) {
+ } catch (IOException e) {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
}
-
}
-
- public JSONObject getMediaList(IMediaServerItem mediaServerItem,String app, String stream, String schema, RequestCallback callback){
+ public JSONObject getMediaList(MediaServerItem mediaServerItem, String app, String stream, String schema, RequestCallback callback){
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);
+ 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, "getMediaList",param, callback);
}
- public JSONObject getMediaList(IMediaServerItem mediaServerItem,String app, String stream){
+ public JSONObject getMediaList(MediaServerItem mediaServerItem, String app, String stream){
return getMediaList(mediaServerItem, app, stream,null, null);
}
- public JSONObject getMediaList(IMediaServerItem mediaServerItem,RequestCallback callback){
+ public JSONObject getMediaList(MediaServerItem mediaServerItem, RequestCallback callback){
return sendPost(mediaServerItem, "getMediaList",null, callback);
}
- public JSONObject getMediaInfo(IMediaServerItem mediaServerItem,String app, String schema, String stream){
+ public JSONObject getMediaInfo(MediaServerItem mediaServerItem, String app, String schema, String stream){
Map<String, Object> param = new HashMap<>();
param.put("app",app);
param.put("schema",schema);
@@ -165,13 +203,13 @@
return sendPost(mediaServerItem, "getMediaInfo",param, null);
}
- public JSONObject getRtpInfo(IMediaServerItem mediaServerItem,String stream_id){
+ public JSONObject getRtpInfo(MediaServerItem mediaServerItem, String stream_id){
Map<String, Object> param = new HashMap<>();
param.put("stream_id",stream_id);
return sendPost(mediaServerItem, "getRtpInfo",param, null);
}
- public JSONObject addFFmpegSource(IMediaServerItem mediaServerItem,String src_url, String dst_url, String timeout_ms,
+ public JSONObject addFFmpegSource(MediaServerItem mediaServerItem, String src_url, String dst_url, String timeout_ms,
boolean enable_hls, boolean enable_mp4, String ffmpeg_cmd_key){
logger.info(src_url);
logger.info(dst_url);
@@ -185,41 +223,45 @@
return sendPost(mediaServerItem, "addFFmpegSource",param, null);
}
- public JSONObject delFFmpegSource(IMediaServerItem mediaServerItem,String key){
+ public JSONObject delFFmpegSource(MediaServerItem mediaServerItem, String key){
Map<String, Object> param = new HashMap<>();
param.put("key", key);
return sendPost(mediaServerItem, "delFFmpegSource",param, null);
}
- public JSONObject getMediaServerConfig(IMediaServerItem mediaServerItem){
+ public JSONObject getMediaServerConfig(MediaServerItem mediaServerItem){
return sendPost(mediaServerItem, "getServerConfig",null, null);
}
- public JSONObject setServerConfig(IMediaServerItem mediaServerItem, Map<String, Object> param){
+ public JSONObject setServerConfig(MediaServerItem mediaServerItem, Map<String, Object> param){
return sendPost(mediaServerItem,"setServerConfig",param, null);
}
- public JSONObject openRtpServer(IMediaServerItem mediaServerItem,Map<String, Object> param){
+ public JSONObject openRtpServer(MediaServerItem mediaServerItem, Map<String, Object> param){
return sendPost(mediaServerItem, "openRtpServer",param, null);
}
- public JSONObject closeRtpServer(IMediaServerItem mediaServerItem,Map<String, Object> param) {
+ public JSONObject closeRtpServer(MediaServerItem mediaServerItem, Map<String, Object> param) {
return sendPost(mediaServerItem, "closeRtpServer",param, null);
}
- public JSONObject listRtpServer(IMediaServerItem mediaServerItem) {
+ public JSONObject listRtpServer(MediaServerItem mediaServerItem) {
return sendPost(mediaServerItem, "listRtpServer",null, null);
}
- public JSONObject startSendRtp(IMediaServerItem mediaServerItem,Map<String, Object> param) {
+ public JSONObject startSendRtp(MediaServerItem mediaServerItem, Map<String, Object> param) {
return sendPost(mediaServerItem, "startSendRtp",param, null);
}
- public JSONObject stopSendRtp(IMediaServerItem mediaServerItem,Map<String, Object> param) {
+ public JSONObject stopSendRtp(MediaServerItem mediaServerItem, Map<String, Object> param) {
return sendPost(mediaServerItem, "stopSendRtp",param, null);
}
- public JSONObject addStreamProxy(IMediaServerItem mediaServerItem,String app, String stream, String url, boolean enable_hls, boolean enable_mp4, String rtp_type) {
+ 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__");
param.put("app", app);
@@ -227,11 +269,16 @@
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);
}
- public JSONObject closeStreams(IMediaServerItem mediaServerItem,String app, String stream) {
+ public JSONObject closeStreams(MediaServerItem mediaServerItem, String app, String stream) {
Map<String, Object> param = new HashMap<>();
param.put("vhost", "__defaultVhost__");
param.put("app", app);
@@ -240,21 +287,21 @@
return sendPost(mediaServerItem, "close_streams",param, null);
}
- public JSONObject getAllSession(IMediaServerItem mediaServerItem) {
+ public JSONObject getAllSession(MediaServerItem mediaServerItem) {
return sendPost(mediaServerItem, "getAllSession",null, null);
}
- public void kickSessions(IMediaServerItem mediaServerItem, String localPortSStr) {
+ public void kickSessions(MediaServerItem mediaServerItem, String localPortSStr) {
Map<String, Object> param = new HashMap<>();
param.put("local_port", localPortSStr);
sendPost(mediaServerItem, "kick_sessions",param, null);
}
- public void getSnap(IMediaServerItem mediaServerItem, String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
+ public void getSnap(MediaServerItem mediaServerItem, String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
Map<String, Object> param = new HashMap<>();
param.put("url", flvUrl);
param.put("timeout_sec", timeout_sec);
param.put("expire_sec", expire_sec);
- sendPostForImg(mediaServerItem, "getSnap",param, targetPath, fileName);
+ sendGetForImg(mediaServerItem, "getSnap", param, targetPath, fileName);
}
}
--
Gitblit v1.8.0