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 96439220a26e6f154451cd65bd7e8c07f55a3b06..61675ac4be1fcf0445eb580851c40799fff5d4e2 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 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 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 65973ce1afcf25aee701ac6bd8206a4513538ca4..ef879856e1e1ba718e0d34e850b1ca723acf44d9 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 8ed43b282825dddd2e573d98a07036f6fcd3f8b8..d2c26ad34ba528d5c589f58b4d2e824809ebf9e0 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 7c718aa33f6fcb4fd2c6a3627192b02eba469c01..5cdd61a175fa4b793710dbf31c56621c4dcee6ac 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: