From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 311 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 251 insertions(+), 60 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 21752a0..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
@@ -2,42 +2,70 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+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.Value;
import org.springframework.stereotype.Component;
-import java.io.IOException;
+import java.io.*;
import java.net.ConnectException;
+import java.net.SocketTimeoutException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
@Component
public class ZLMRESTfulUtils {
private final static Logger logger = LoggerFactory.getLogger(ZLMRESTfulUtils.class);
- @Value("${media.ip}")
- private String mediaIp;
- @Value("${media.port}")
- private int mediaPort;
- @Value("${media.secret}")
- private String mediaSecret;
- public JSONObject sendPost(String api, Map<String, Object> param) {
- OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/%s", mediaIp, mediaPort, api);
- JSONObject responseJSON = null;
- logger.debug(url);
+ 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);
+ });
+ 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 = new JSONObject();
+ //-2鑷畾涔夋祦濯掍綋 璋冪敤閿欒鐮�
+ responseJSON.put("code",-2);
+ responseJSON.put("msg","娴佸獟浣撹皟鐢ㄥけ璐�");
FormBody.Builder builder = new FormBody.Builder();
- builder.add("secret",mediaSecret);
- if (param != null) {
+ builder.add("secret",mediaServerItem.getSecret());
+ if (param != null && param.keySet().size() > 0) {
for (String key : param.keySet()){
- builder.add(key, param.get(key).toString());
+ if (param.get(key) != null) {
+ builder.add(key, param.get(key).toString());
+ }
}
}
@@ -47,92 +75,220 @@
.post(body)
.url(url)
.build();
- try {
- Response response = client.newCall(request).execute();
- if (response.isSuccessful()) {
- String responseStr = response.body().string();
- if (responseStr != null) {
- responseJSON = JSON.parseObject(responseStr);
+ if (callback == null) {
+ try {
+ Response response = client.newCall(request).execute();
+ if (response.isSuccessful()) {
+ ResponseBody responseBody = response.body();
+ if (responseBody != null) {
+ String responseStr = responseBody.string();
+ responseJSON = JSON.parseObject(responseStr);
+ }
+ }else {
+ response.close();
+ Objects.requireNonNull(response.body()).close();
+ }
+ }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(){
+
+ @Override
+ public void onResponse(@NotNull Call call, @NotNull Response response){
+ if (response.isSuccessful()) {
+ try {
+ String responseStr = Objects.requireNonNull(response.body()).string();
+ callback.run(JSON.parseObject(responseStr));
+ } catch (IOException e) {
+ logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
+ }
+
+ }else {
+ response.close();
+ Objects.requireNonNull(response.body()).close();
+ }
+ }
+
+ @Override
+ public void onFailure(@NotNull Call call, @NotNull IOException e) {
+ 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()));
+ }
+ }
+ });
}
- } catch (ConnectException e) {
- logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
- logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
- }catch (IOException e) {
- e.printStackTrace();
- }
+
+
return responseJSON;
}
- public JSONObject getMediaList(String app, String schema){
+ 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();
+
+ httpBuilder.addQueryParameter("secret", mediaServerItem.getSecret());
+ if (params != null) {
+ for (Map.Entry<String, Object> param : params.entrySet()) {
+ httpBuilder.addQueryParameter(param.getKey(), param.getValue().toString());
+ }
+ }
+
+ Request request = new Request.Builder()
+ .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()) {
+ if (!snapFolder.mkdirs()) {
+ logger.warn("{}璺緞鍒涘缓澶辫触", snapFolder.getAbsolutePath());
+ }
+
+ }
+ File snapFile = new File(targetPath + File.separator + fileName);
+ FileOutputStream outStream = new FileOutputStream(snapFile);
+
+ 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) {
+ logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
+ }
+ }
+
+ public JSONObject getMediaList(MediaServerItem mediaServerItem, String app, String stream, String schema, RequestCallback callback){
Map<String, Object> param = new HashMap<>();
- param.put("app",app);
- 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("getMediaList",param);
+ return sendPost(mediaServerItem, "getMediaList",param, callback);
}
- public JSONObject getMediaList(){
- return sendPost("getMediaList",null);
+ public JSONObject getMediaList(MediaServerItem mediaServerItem, String app, String stream){
+ return getMediaList(mediaServerItem, app, stream,null, null);
}
- public JSONObject getMediaInfo(String app, String schema, String stream){
+ public JSONObject getMediaList(MediaServerItem mediaServerItem, RequestCallback callback){
+ return sendPost(mediaServerItem, "getMediaList",null, callback);
+ }
+
+ 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);
param.put("stream",stream);
param.put("vhost","__defaultVhost__");
- return sendPost("getMediaInfo",param);
+ return sendPost(mediaServerItem, "getMediaInfo",param, null);
}
- public JSONObject getRtpInfo(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("getRtpInfo",param);
+ return sendPost(mediaServerItem, "getRtpInfo",param, null);
}
- public JSONObject addFFmpegSource(String src_url, String dst_url, String timeout_ms){
- System.out.println(src_url);
- System.out.println(dst_url);
+ 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);
Map<String, Object> param = new HashMap<>();
param.put("src_url", src_url);
param.put("dst_url", dst_url);
param.put("timeout_ms", timeout_ms);
- return sendPost("addFFmpegSource",param);
+ param.put("enable_hls", enable_hls);
+ param.put("enable_mp4", enable_mp4);
+ param.put("ffmpeg_cmd_key", ffmpeg_cmd_key);
+ return sendPost(mediaServerItem, "addFFmpegSource",param, null);
}
- public JSONObject delFFmpegSource(String key){
+ public JSONObject delFFmpegSource(MediaServerItem mediaServerItem, String key){
Map<String, Object> param = new HashMap<>();
param.put("key", key);
- return sendPost("delFFmpegSource",param);
+ return sendPost(mediaServerItem, "delFFmpegSource",param, null);
}
- public JSONObject getMediaServerConfig(){
- return sendPost("getServerConfig",null);
+ public JSONObject getMediaServerConfig(MediaServerItem mediaServerItem){
+ return sendPost(mediaServerItem, "getServerConfig",null, null);
}
- public JSONObject setServerConfig(Map<String, Object> param){
- return sendPost("setServerConfig",param);
+ public JSONObject setServerConfig(MediaServerItem mediaServerItem, Map<String, Object> param){
+ return sendPost(mediaServerItem,"setServerConfig",param, null);
}
- public JSONObject openRtpServer(Map<String, Object> param){
- return sendPost("openRtpServer",param);
+ public JSONObject openRtpServer(MediaServerItem mediaServerItem, Map<String, Object> param){
+ return sendPost(mediaServerItem, "openRtpServer",param, null);
}
- public JSONObject closeRtpServer(Map<String, Object> param) {
- return sendPost("closeRtpServer",param);
+ public JSONObject closeRtpServer(MediaServerItem mediaServerItem, Map<String, Object> param) {
+ return sendPost(mediaServerItem, "closeRtpServer",param, null);
}
- public JSONObject startSendRtp(Map<String, Object> param) {
- return sendPost("startSendRtp",param);
+ public JSONObject listRtpServer(MediaServerItem mediaServerItem) {
+ return sendPost(mediaServerItem, "listRtpServer",null, null);
}
- public JSONObject stopSendRtp(Map<String, Object> param) {
- return sendPost("stopSendRtp",param);
+ public JSONObject startSendRtp(MediaServerItem mediaServerItem, Map<String, Object> param) {
+ return sendPost(mediaServerItem, "startSendRtp",param, null);
}
- public JSONObject addStreamProxy(String app, String stream, String url, boolean enable_hls, boolean enable_mp4, String rtp_type) {
+ public JSONObject stopSendRtp(MediaServerItem mediaServerItem, Map<String, Object> param) {
+ 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__");
param.put("app", app);
@@ -140,16 +296,51 @@
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("addStreamProxy",param);
+ return sendPost(mediaServerItem, "addStreamProxy",param, null);
}
- public JSONObject closeStreams(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);
param.put("stream", stream);
param.put("force", 1);
- return sendPost("close_streams",param);
+ return sendPost(mediaServerItem, "close_streams",param, null);
+ }
+
+ public JSONObject getAllSession(MediaServerItem mediaServerItem) {
+ return sendPost(mediaServerItem, "getAllSession",null, null);
+ }
+
+ 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(MediaServerItem mediaServerItem, String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
+ 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.8.0