From fdd732250a599509f54a0408143f7803dff7febc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 06 二月 2023 10:35:16 +0800
Subject: [PATCH] Merge pull request #739 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 2 +-
src/main/java/com/genersoft/iot/vmp/utils/JsonUtil.java | 5 ++---
2 files changed, 3 insertions(+), 4 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 56af604..3610f31 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
@@ -36,7 +36,7 @@
// 璁剧疆杩炴帴瓒呮椂鏃堕棿
httpClientBuilder.connectTimeout(5,TimeUnit.SECONDS);
// 璁剧疆璇诲彇瓒呮椂鏃堕棿
- httpClientBuilder.readTimeout(5,TimeUnit.SECONDS);
+ httpClientBuilder.readTimeout(10,TimeUnit.SECONDS);
// 璁剧疆杩炴帴姹�
httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES));
if (logger.isDebugEnabled()) {
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/JsonUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/JsonUtil.java
index 6ae5634..60e2dbe 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/JsonUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/JsonUtil.java
@@ -27,11 +27,10 @@
* @return result type
*/
public static <T> T redisJsonToObject(String key, Class<T> clazz) {
- JSONObject jsonObject = (JSONObject) RedisUtil.get(key);
+ Object jsonObject = RedisUtil.get(key);
if (Objects.isNull(jsonObject)) {
return null;
}
- return JSON.parseObject(jsonObject.toJSONString(), clazz);
+ return clazz.cast(jsonObject);
}
-
}
\ No newline at end of file
--
Gitblit v1.8.0