Browse Source

Merge pull request #908 from cnless/wvp-28181-2.0

fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
648540858 2 years ago
parent
commit
01bc6c857e

+ 1 - 1
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java

@@ -192,10 +192,10 @@ public class ZLMRESTfulUtils {
                 } 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()));
             }
+            Objects.requireNonNull(response.body()).close();
         } catch (ConnectException e) {
             logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage()));
             logger.info("请检查media配置并确认ZLM已启动...");

+ 4 - 0
src/main/resources/all-application.yml

@@ -5,6 +5,10 @@
 
 
 spring:
+    # 设置接口超时时间
+    mvc:
+        async:
+            request-timeout: 20000
     # [可选]上传文件大小限制
     servlet:
         multipart:

+ 4 - 0
src/main/resources/application-dev.yml

@@ -1,4 +1,8 @@
 spring:
+  # 设置接口超时时间
+  mvc:
+    async:
+      request-timeout: 20000
   thymeleaf:
     cache: false
   # [可选]上传文件大小限制