From f9ff6d8657fd2307defbd694974e4c0f0fe30f11 Mon Sep 17 00:00:00 2001
From: zhengjie <zhengjie@tom.com>
Date: Tue, 4 Jun 2019 15:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4redis=E7=9A=84=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/zhengjie/redis/RedisConfig.java |  2 --
 .../modules/monitor/rest/RedisController.java    | 16 ----------------
 .../modules/monitor/service/RedisService.java    |  6 ------
 .../monitor/service/impl/RedisServiceImpl.java   | 11 ++++-------
 pom.xml                                          | 13 -------------
 5 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java
index effec0c5..2539c2aa 100644
--- a/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java
+++ b/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java
@@ -19,8 +19,6 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
 import java.time.Duration;
 
 /**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java
index 273dccd4..ca52f3c8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java
@@ -29,22 +29,6 @@ public class RedisController {
         return new ResponseEntity(redisService.findByKey(key,pageable), HttpStatus.OK);
     }
 
-    @Log("新增Redis缓存")
-    @PostMapping(value = "/redis")
-    @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_CREATE')")
-    public ResponseEntity create(@Validated @RequestBody RedisVo resources){
-        redisService.save(resources);
-        return new ResponseEntity(HttpStatus.CREATED);
-    }
-
-    @Log("修改Redis缓存")
-    @PutMapping(value = "/redis")
-    @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_EDIT')")
-    public ResponseEntity update(@Validated @RequestBody RedisVo resources){
-        redisService.save(resources);
-        return new ResponseEntity(HttpStatus.NO_CONTENT);
-    }
-
     @Log("删除Redis缓存")
     @DeleteMapping(value = "/redis")
     @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_DELETE')")
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java
index 967950d2..b39570fc 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java
@@ -18,12 +18,6 @@ public interface RedisService {
      */
     public Page findByKey(String key, Pageable pageable);
 
-    /**
-     * create
-     * @param redisVo
-     */
-    public void save(RedisVo redisVo);
-
     /**
      * delete
      * @param key
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java
index 72e0c6fe..929a72f9 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java
@@ -9,8 +9,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,6 +29,10 @@ public class RedisServiceImpl implements RedisService {
             key = "*" + key + "*";
         }
         for (Object s : redisTemplate.keys(key)) {
+            // 过滤掉权限的缓存
+            if (s.toString().indexOf("role::loadPermissionByUser") != -1 || s.toString().indexOf("user::loadUserByUsername") != -1) {
+                continue;
+            }
             RedisVo redisVo = new RedisVo(s.toString(),redisTemplate.opsForValue().get(s.toString()).toString());
             redisVos.add(redisVo);
         }
@@ -41,11 +43,6 @@ public class RedisServiceImpl implements RedisService {
         return page;
     }
 
-    @Override
-    public void save(RedisVo redisVo) {
-        redisTemplate.opsForValue().set(redisVo.getKey(),redisVo.getValue());
-    }
-
     @Override
     public void delete(String key) {
         redisTemplate.delete(key);
diff --git a/pom.xml b/pom.xml
index b275494a..7c7a8016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,13 +73,6 @@
         </dependency>
         <!--Spring boot end-->
 
-        <!--jedis-->
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>${jedis.version}</version>
-        </dependency>
-
         <!--spring2.0集成redis所需common-pool2-->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -91,12 +84,6 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
-        </dependency>
-
         <!--监控sql日志-->
         <dependency>
             <groupId>org.bgee.log4jdbc-log4j2</groupId>