From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/monitor/util/RedisUtil.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/monitor/util/RedisUtil.java b/src/main/java/com/moral/monitor/util/RedisUtil.java
index d688933..c9abef8 100644
--- a/src/main/java/com/moral/monitor/util/RedisUtil.java
+++ b/src/main/java/com/moral/monitor/util/RedisUtil.java
@@ -1,21 +1,26 @@
 package com.moral.monitor.util;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.springframework.data.redis.core.RedisTemplate;
 
 public class RedisUtil {
 
     public static boolean hasKey(RedisTemplate<String, String> redis, String key) {
-
         return redis.hasKey(key);
     }
-
     public static void set(RedisTemplate<String, String> redis, String key, String value) {
-
         redis.opsForValue().set(key, value);
     }
-
     public static String get(RedisTemplate<String, String> redis, String key) {
-
         return redis.opsForValue().get(key);
     }
+    public static void set(RedisTemplate<String, String> redis, String key, String value,
+    		int timeout,TimeUnit unit) {
+        redis.opsForValue().set(key, value,timeout, unit);
+    }
+    public static Set<String> keys(RedisTemplate<String, String> redis,String pattern) {
+    	return redis.keys(pattern);
+    }
 }

--
Gitblit v1.8.0