From cad0c08c9950dbc7e1dd241bd2b032d14d1e77ec Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 27 Oct 2019 21:54:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/monitor/service/impl/RedisServiceImpl.java     | 7 +++++--
 .../modules/security/rest/AuthenticationController.java    | 6 +++---
 .../src/main/resources/config/application-dev.yml          | 2 ++
 .../src/main/resources/config/application-prod.yml         | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

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 9643922..61675ac 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
@@ -30,6 +30,9 @@ public class RedisServiceImpl implements RedisService {
     @Value("${jwt.online}")
     private String onlineKey;
 
+    @Value("${jwt.codeKey}")
+    private String codeKey;
+
     public RedisServiceImpl(RedisTemplate redisTemplate) {
         this.redisTemplate = redisTemplate;
     }
@@ -43,7 +46,7 @@ public class RedisServiceImpl implements RedisService {
         Set<String> keys = redisTemplate.keys(key);
         for (String s : keys) {
             // 过滤掉权限的缓存
-            if (s.contains("role::loadPermissionByUser") || s.contains("user::loadUserByUsername") || s.contains(onlineKey)) {
+            if (s.contains("role::loadPermissionByUser") || s.contains("user::loadUserByUsername") || s.contains(onlineKey) || s.contains(codeKey)) {
                 continue;
             }
             RedisVo redisVo = new RedisVo(s, Objects.requireNonNull(redisTemplate.opsForValue().get(s)).toString());
@@ -63,7 +66,7 @@ public class RedisServiceImpl implements RedisService {
     @Override
     public void deleteAll() {
         Set<String> keys = redisTemplate.keys(  "*");
-        redisTemplate.delete(keys.stream().filter(s -> !s.contains(onlineKey)).collect(Collectors.toList()));
+        redisTemplate.delete(keys.stream().filter(s -> !s.contains(onlineKey)).filter(s -> !s.contains(codeKey)).collect(Collectors.toList()));
     }
 
     @Override
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java
index 65973ce..ef87985 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java
@@ -38,8 +38,8 @@ import javax.servlet.http.HttpServletRequest;
 @Api(tags = "系统：系统授权接口")
 public class AuthenticationController {
 
-    @Value("${jwt.online}")
-    private String onlineKey;
+    @Value("${jwt.codeKey}")
+    private String codeKey;
 
     private final JwtTokenUtil jwtTokenUtil;
 
@@ -104,7 +104,7 @@ public class AuthenticationController {
         captcha.setLen(2);
         // 获取运算的结果：5
         String result = captcha.text();
-        String uuid = onlineKey + IdUtil.simpleUUID();
+        String uuid = codeKey + IdUtil.simpleUUID();
         redisService.saveCode(uuid,result);
         return new ImgResult(captcha.toBase64(),uuid);
     }
diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml
index 8ed43b2..d2c26ad 100644
--- a/eladmin-system/src/main/resources/config/application-dev.yml
+++ b/eladmin-system/src/main/resources/config/application-dev.yml
@@ -49,6 +49,8 @@ jwt:
   expiration: 21600000
   # 在线用户key
   online: online-token
+  # 验证码
+  codeKey: code-key
 
 #是否允许生成代码，生产环境设置为false
 generator:
diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml
index 7c718aa..5cdd61a 100644
--- a/eladmin-system/src/main/resources/config/application-prod.yml
+++ b/eladmin-system/src/main/resources/config/application-prod.yml
@@ -51,6 +51,8 @@ jwt:
   expiration: 7200000
   # 在线用户key
   online: online-token
+  # 验证码
+  codeKey: code-key
 
 #是否允许生成代码，生产环境设置为false
 generator:
-- 
GitLab