guzijian / wvp-GB28181-pro · Commits

Commit fdd732250a599509f54a0408143f7803dff7febc

Authored by 648540858
Committed by GitHub
2 parents 9586f58a a5ed2846

Merge pull request #739 from xiaoQQya/wvp-28181-2.0 

序列化问题修复与代码优化
Inline Side-by-side
Showing 2 changed files with 3 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
  View file @fdd7322
@@ -36,7 +36,7 @@ public class ZLMRESTfulUtils { @@ -36,7 +36,7 @@ public class ZLMRESTfulUtils {
36 // 设置连接超时时间 36 // 设置连接超时时间
37 httpClientBuilder.connectTimeout(5,TimeUnit.SECONDS); 37 httpClientBuilder.connectTimeout(5,TimeUnit.SECONDS);
38 // 设置读取超时时间 38 // 设置读取超时时间
39 - httpClientBuilder.readTimeout(5,TimeUnit.SECONDS); 39 + httpClientBuilder.readTimeout(10,TimeUnit.SECONDS);
40 // 设置连接池 40 // 设置连接池
41 httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES)); 41 httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES));
42 if (logger.isDebugEnabled()) { 42 if (logger.isDebugEnabled()) {
src/main/java/com/genersoft/iot/vmp/utils/JsonUtil.java
  View file @fdd7322
@@ -27,11 +27,10 @@ public final class JsonUtil { @@ -27,11 +27,10 @@ public final class JsonUtil {
27 * @return result type 27 * @return result type
28 */ 28 */
29 public static <T> T redisJsonToObject(String key, Class<T> clazz) { 29 public static <T> T redisJsonToObject(String key, Class<T> clazz) {
30 - JSONObject jsonObject = (JSONObject) RedisUtil.get(key); 30 + Object jsonObject = RedisUtil.get(key);
31 if (Objects.isNull(jsonObject)) { 31 if (Objects.isNull(jsonObject)) {
32 return null; 32 return null;
33 } 33 }
34 - return JSON.parseObject(jsonObject.toJSONString(), clazz); 34 + return clazz.cast(jsonObject);
35 } 35 }
36 -  
37 } 36 }
38 \ No newline at end of file 37 \ No newline at end of file