From 2336a23ea426266b478f6ce20d36ded05074fa2c Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 18 Oct 2023 12:55:42 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84Redis<>=20=E5=BA=8F=E5=88=97=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/DynamicRouteHealthIndicator.java | 2 -- .../filter/ValidateCodeGatewayFilter.java | 17 ++++++----------- .../admin/config/ClientDetailsInitRunner.java | 2 +- .../admin/service/impl/MobileServiceImpl.java | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/DynamicRouteHealthIndicator.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/DynamicRouteHealthIndicator.java index b665e2241..0b0e4125b 100644 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/DynamicRouteHealthIndicator.java +++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/DynamicRouteHealthIndicator.java @@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.actuate.health.AbstractHealthIndicator; import org.springframework.boot.actuate.health.Health; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.StringRedisSerializer; /** * @author lengleng @@ -22,7 +21,6 @@ public class DynamicRouteHealthIndicator extends AbstractHealthIndicator { @Override protected void doHealthCheck(Health.Builder builder) { - redisTemplate.setKeySerializer(new StringRedisSerializer()); if (redisTemplate.hasKey(CacheConstants.ROUTE_KEY)) { builder.up(); } diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java index cfac35ecb..f420c09af 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java @@ -38,7 +38,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -57,9 +56,9 @@ import reactor.core.publisher.Mono; @SuppressWarnings("all") public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { - private final ObjectMapper objectMapper; + private final RedisTemplate redisTemplate; - private final RedisTemplate redisTemplate; + private final ObjectMapper objectMapper; @Override public GatewayFilter apply(Object config) { @@ -127,15 +126,14 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { String key = String.format("%s:%s:%s", StrUtil.isBlank(tenantId) ? CommonConstants.TENANT_ID_1 : tenantId, CacheConstants.CLIENT_FLAG, clientId); - redisTemplate.setKeySerializer(new StringRedisSerializer()); - Object val = redisTemplate.opsForValue().get(key); + String val = redisTemplate.opsForValue().get(key); // 当配置不存在时，不用校验 if (val == null) { return false; } - JSONObject information = JSONUtil.parseObj(val.toString()); + JSONObject information = JSONUtil.parseObj(val); if (StrUtil.equals(CaptchaFlagTypeEnum.OFF.getType(), information.getStr(CommonConstants.CAPTCHA_FLAG))) { return false; } @@ -175,19 +173,16 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { } String key = CacheConstants.DEFAULT_CODE_KEY + randomStr; - redisTemplate.setKeySerializer(new StringRedisSerializer()); - if (!redisTemplate.hasKey(key)) { throw new ValidateCodeException("验证码不合法"); } - Object codeObj = redisTemplate.opsForValue().get(key); + String saveCode = redisTemplate.opsForValue().get(key); - if (codeObj == null) { + if (saveCode == null) { throw new ValidateCodeException("验证码不合法"); } - String saveCode = codeObj.toString(); if (StrUtil.isBlank(saveCode)) { redisTemplate.delete(key); throw new ValidateCodeException("验证码不合法"); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java index 30143af74..88a194d3c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java @@ -37,7 +37,7 @@ public class ClientDetailsInitRunner implements InitializingBean { private final SysTenantService tenantService; - private final RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; /** * WebServerInitializedEvent 使用 TransactionalEventListener 时启动时无法获取到事件 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java index e8d487138..107e86531 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit; @AllArgsConstructor public class MobileServiceImpl implements MobileService { - private final RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; private final SysUserMapper userMapper;