From 01bc6c857e49597df0f1b2e8c5d482786db3a475 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 01 七月 2023 23:04:39 +0800
Subject: [PATCH] Merge pull request #908 from cnless/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 2 +-
src/main/resources/application-dev.yml | 4 ++++
src/main/resources/all-application.yml | 4 ++++
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 2378d52..054e5fc 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -192,10 +192,10 @@
} 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("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 0b079f1..ef247f7 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -5,6 +5,10 @@
spring:
+ # 璁剧疆鎺ュ彛瓒呮椂鏃堕棿
+ mvc:
+ async:
+ request-timeout: 20000
# [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
servlet:
multipart:
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f5404e2..504c9c6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,4 +1,8 @@
spring:
+ # 璁剧疆鎺ュ彛瓒呮椂鏃堕棿
+ mvc:
+ async:
+ request-timeout: 20000
thymeleaf:
cache: false
# [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
--
Gitblit v1.8.0