From 9a96597e666fa32caefcfff5246b4cb722e9b1bc Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 16 一月 2024 14:10:27 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev --- src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java index 9fda53e..b7f446a 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java @@ -36,7 +36,7 @@ private OkHttpClient getClient(){ return getClient(null); } - + private OkHttpClient getClient(Integer readTimeOut){ if (client == null) { if (readTimeOut == null) { @@ -242,7 +242,7 @@ public JSONObject addTask(MediaServerItem mediaServerItem, String app, String stream, String startTime, String endTime, String callId, List<String> filePathList, String remoteHost) { - + JSONObject videoTaskInfoJSON = new JSONObject(); videoTaskInfoJSON.put("app", app); videoTaskInfoJSON.put("stream", stream); -- Gitblit v1.8.0