From ad42a81e625f1e7a982a94994d7d5f3314c71fbd Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 15 Nov 2017 14:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
index 0859574..9a70187 100644
--- a/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java
@@ -98,7 +98,7 @@
     public void setEquState(String mac,Map<String,Object> equWithStateMap) {
     	String key = getEquStateKey(mac);
     	String equWithStateJsonStr = JSON.toJSONString(equWithStateMap);
-    	RedisUtil.set(redis,key,equWithStateJsonStr,10,TimeUnit.SECONDS);
+    	RedisUtil.set(redis,key,equWithStateJsonStr,1200,TimeUnit.SECONDS);
     }
     //���redis���������������������������������������������
     public Map<String,Object> getEquState(String mac) {

--
Gitblit v1.8.0