From fa95c0d9d3f9bb6bd7f25d05c5d5f4ac0d6915d6 Mon Sep 17 00:00:00 2001
From: yanlongqi <yuchat@163.com>
Date: Tue, 31 Dec 2024 00:26:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(video):=20=E4=BC=98=E5=8C=96=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E4=B8=8B=E8=BD=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 优化 HttpRequestComponent 中的 download 方法，添加资源释放和异常处理
- 在 MadouVideoService 中增加备选 m3u8 地址，提高视频下载成功率
---
 .../models/service/MadouVideoService.java     |  3 +++
 .../video/utils/HttpRequestComponent.java     | 24 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/top/yuchat/crawler/video/models/service/MadouVideoService.java b/src/main/java/top/yuchat/crawler/video/models/service/MadouVideoService.java
index 0b295be..8f2cf28 100644
--- a/src/main/java/top/yuchat/crawler/video/models/service/MadouVideoService.java
+++ b/src/main/java/top/yuchat/crawler/video/models/service/MadouVideoService.java
@@ -270,6 +270,9 @@ public class MadouVideoService extends ServiceImpl<MadouVideoMapper, MadouVideoI
         if (httpRequestComponent.checkUrl(url)) {
             madouVideoInfo.setM3u8Url(url);
         }
+        else {
+            madouVideoInfo.setM3u8Url("/api/video/" + id + "/index.m3u8");
+        }
         return madouVideoInfo;
     }
 }
diff --git a/src/main/java/top/yuchat/crawler/video/utils/HttpRequestComponent.java b/src/main/java/top/yuchat/crawler/video/utils/HttpRequestComponent.java
index f248d29..488b1bf 100644
--- a/src/main/java/top/yuchat/crawler/video/utils/HttpRequestComponent.java
+++ b/src/main/java/top/yuchat/crawler/video/utils/HttpRequestComponent.java
@@ -114,17 +114,25 @@ public class HttpRequestComponent {
     }
 
 
-    public void download(String url, OutputStream os) throws IOException {
+    public void download(String url, OutputStream os)  {
         HttpGet httpGet = new HttpGet(url);
         httpGet.setConfig(requestConfig);
-        CloseableHttpResponse response = closeableHttpClient.execute(httpGet);
-        int statusCode = response.getStatusLine().getStatusCode();
-        if (HttpStatus.SC_OK != statusCode) {
-            log.error("文件下载失败，状态码：{}", statusCode);
-            throw new RuntimeException("文件下载失败");
+        try (CloseableHttpResponse response = closeableHttpClient.execute(httpGet)) {
+            int statusCode = response.getStatusLine().getStatusCode();
+            if (HttpStatus.SC_OK != statusCode) {
+                log.error("文件下载失败，状态码：{}", statusCode);
+                throw new RuntimeException("文件下载失败");
+            }
+            HttpEntity entity = response.getEntity();
+            try (InputStream content = entity.getContent()) {
+                IOUtils.copy(content, os);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            httpGet.releaseConnection();
         }
-        HttpEntity entity = response.getEntity();
-        IOUtils.copy(entity.getContent(), os);
+
     }
 
     public boolean checkUrl(String url) {