From 46b445eba9c1ac7df307c0c26ca5d05f078b38a4 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 15 Jul 2022 16:35:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E9=A2=84=E8=A7=88=E5=8A=A0=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/TsingtaoXHAVideoPreviewService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java b/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java index 0b97be63..b6b13a96 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java @@ -35,9 +35,9 @@ public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService @Override public String getHls(String key) { List result = new CopyOnWriteArrayList<>(); - + String url = String.format(tsingtao_xhaProperties.getCloudhls(), key); OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url(String.format(tsingtao_xhaProperties.getCloudhls(), key)).build(); + Request request = new Request.Builder().url(url).build(); try (Response response = client.newCall(request).execute()) { if (response.isSuccessful()) { JSONObject jsonObject = JSON.parseObject(response.body().string()); @@ -45,10 +45,10 @@ public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService result.add(jsonObject.getString("data")); } } else { - logger.error("西海岸预览地址获取失败"); + logger.error("西海岸预览地址获取失败:{}", url); } } catch (Exception exception) { - logger.error("西海岸预览地址获取失败", exception); + logger.error("西海岸预览地址获取失败:", url, exception); } return result.stream().filter(index -> StringUtils.isNotEmpty(index)).findAny().orElse(null); } From c3d971e56d32c302b43a17dc3c7cbc620f5c787c Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 15 Jul 2022 16:44:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/TsingtaoXHAVideoPreviewService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java b/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java index b6b13a96..311ab7ac 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoXHAVideoPreviewService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import io.renren.common.domain.Tsingtao_xhaProperties; import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService; +import okhttp3.ConnectionPool; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; @@ -13,14 +14,22 @@ import org.slf4j.LoggerFactory; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.TimeUnit; /** * 青岛西海岸 */ public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService { + private static final Integer cpuNUm = Runtime.getRuntime().availableProcessors(); private static Logger logger = LoggerFactory.getLogger(TsingtaoXHAVideoPreviewService.class); Tsingtao_xhaProperties tsingtao_xhaProperties; + private static final OkHttpClient client = new OkHttpClient().newBuilder() + .connectTimeout(1, TimeUnit.MINUTES) + .readTimeout(1, TimeUnit.MINUTES) + .connectionPool(new ConnectionPool(cpuNUm * 2, 2, TimeUnit.MINUTES)) + .retryOnConnectionFailure(false) + .build(); public TsingtaoXHAVideoPreviewService(Tsingtao_xhaProperties tsingtao_xhaProperties) { this.tsingtao_xhaProperties = tsingtao_xhaProperties; @@ -36,7 +45,6 @@ public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService public String getHls(String key) { List result = new CopyOnWriteArrayList<>(); String url = String.format(tsingtao_xhaProperties.getCloudhls(), key); - OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder().url(url).build(); try (Response response = client.newCall(request).execute()) { if (response.isSuccessful()) {