diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java index fc560ca2c..50ca9e408 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java @@ -30,6 +30,11 @@ public interface CacheConstants { */ String USER_DETAILS = "user_details"; + /** + * 角色信息缓存 + */ + String ROLE_DETAILS = "role_details"; + /** * 字典信息缓存 */ diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index f9ba8acd1..fc0bcb691 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -60,8 +60,8 @@ com.github.anji-plus - captcha - ${kaptcha.version} + captcha-spring-boot-starter + ${captcha.version} diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/CaptchaCacheServiceProvider.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/CaptchaCacheServiceProvider.java index bf52d4fec..ff0dc6967 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/CaptchaCacheServiceProvider.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/CaptchaCacheServiceProvider.java @@ -1,25 +1,25 @@ package com.pig4cloud.pigx.gateway.config; import com.anji.captcha.service.CaptchaCacheService; -import lombok.AllArgsConstructor; -import org.springframework.context.annotation.Primary; +import com.google.auto.service.AutoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; /** * @author lengleng - * @date 2020/5/19 + * @date 2020/8/27 *

- * 验证码 缓存提供支持集群 + * 验证码 缓存提供支持集群,需要通过SPI */ -@Primary -@Component -@AllArgsConstructor +@AutoService(CaptchaCacheService.class) public class CaptchaCacheServiceProvider implements CaptchaCacheService { - private final StringRedisTemplate stringRedisTemplate; + private static final String REDIS = "redis"; + + @Autowired + private StringRedisTemplate stringRedisTemplate; @Override public void set(String key, String value, long expiresInSeconds) { @@ -41,4 +41,9 @@ public class CaptchaCacheServiceProvider implements CaptchaCacheService { return stringRedisTemplate.opsForValue().get(key); } + @Override + public String type() { + return REDIS; + } + } diff --git a/pigx-gateway/src/main/resources/logback-spring.xml b/pigx-gateway/src/main/resources/logback-spring.xml index 998f18b5c..47e14f8ce 100644 --- a/pigx-gateway/src/main/resources/logback-spring.xml +++ b/pigx-gateway/src/main/resources/logback-spring.xml @@ -71,7 +71,8 @@ - + + diff --git a/pom.xml b/pom.xml index cce1c7f4a..9ceb6c6f5 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 2.2.5 2.3.0 5.4.0 - 1.2.0 + 1.2.4 2.9.2 2.0.4 1.7