From b98acc9cd46cae6cbf33f008b1e2ce61e36c9d81 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Mon, 18 Sep 2023 14:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20playbackStart=20=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docking/gb28181/wvp/service/wvp/WvpService.java |  4 +++-
 .../skcks/docking/gb28181/wvp/utils/RetryUtil.java  | 13 +++++++++++++
 .../src/main/resources/application.yml              |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
index 43e99ee..8a22872 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
@@ -198,7 +198,9 @@ public class WvpService {
 
     @SneakyThrows
     private void downloadFromPlayback(HttpServletResponse response, String token, String deviceId, String channelId, String startTime, String endTime){
-        Retryer<JsonResponse<StreamContent>> playBackRetryer = RetryUtil.getDefaultRetryer("通过回放获取实时视频流下载");
+        Retryer<JsonResponse<StreamContent>> playBackRetryer = RetryUtil
+                .<StreamContent>getDefaultRetryerBuilder("通过回放获取实时视频流下载", 100, TimeUnit.MILLISECONDS, 5)
+                .build();
         JsonResponse<StreamContent> videoStreamResponse = playBackRetryer.call(() -> wvpProxyClient.playbackStart(token, deviceId, channelId, new GeneralTimeReq(startTime, endTime)));
         StreamContent streamContent = videoStreamResponse.getData();
         String stream = streamContent.getStream();
diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/utils/RetryUtil.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/utils/RetryUtil.java
index 887fb47..d2b573e 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/utils/RetryUtil.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/utils/RetryUtil.java
@@ -40,6 +40,19 @@ public class RetryUtil {
         return result -> result == null || (result.getCode() != 0 && result.getCode() != 200);
     }
 
+    public static <T> RetryerBuilder<JsonResponse<T>> getDefaultRetryerBuilder(String name, int waitTime, TimeUnit waitUnit, int retryTime) {
+        return RetryerBuilder.<JsonResponse<T>>newBuilder()
+                // 异常就重试
+                .retryIfException()
+                .retryIfRuntimeException()
+                // 重试间隔
+                .withWaitStrategy(WaitStrategies.fixedWait(waitTime, waitUnit))
+                // 重试次数
+                .withStopStrategy(StopStrategies.stopAfterAttempt(retryTime))
+                .retryIfResult(defaultRetryIf())
+                .withRetryListener(defaultRetryListener(name));
+    }
+
     public static <T> RetryerBuilder<JsonResponse<T>> getDefaultRetryerBuilder(String name) {
         return RetryerBuilder.<JsonResponse<T>>newBuilder()
                 // 异常就重试
diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application.yml b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
index 78cb19d..27e2b82 100644
--- a/gb28181-wvp-proxy-starter/src/main/resources/application.yml
+++ b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
@@ -33,6 +33,9 @@ spring:
         connection-timeout: 0
         ok-http:
           read-timeout: 0
+        hc5:
+          connection-request-timeout: 60
+          connection-request-timeout-unit: seconds
 
 media:
   ip: 192.168.1.241