diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java
index d89791f6a..25204ce9d 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java
@@ -17,27 +17,17 @@
package com.pig4cloud.pigx.common.data.cache;
-import io.lettuce.core.ReadFrom;
-import io.lettuce.core.cluster.ClusterClientOptions;
-import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
import lombok.AllArgsConstructor;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisClusterConfiguration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
-import java.time.Duration;
-
/**
* RedisTemplate 配置
*
@@ -59,28 +49,4 @@ public class RedisTemplateConfig {
redisTemplate.setConnectionFactory(redisConnectionFactory);
return redisTemplate;
}
-
-
- @Bean
- @ConditionalOnProperty(value = "spring.redis.cluster.enable",havingValue = "true")
- public LettuceConnectionFactory redisConnectionFactory(RedisProperties redisProperties) {
- RedisClusterConfiguration redisClusterConfiguration = new RedisClusterConfiguration(redisProperties.getCluster().getNodes());
-
- // https://github.com/lettuce-io/lettuce-core/wiki/Redis-Cluster#user-content-refreshing-the-cluster-topology-view
- ClusterTopologyRefreshOptions clusterTopologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
- .enablePeriodicRefresh()
- .enableAllAdaptiveRefreshTriggers()
- .refreshPeriod(Duration.ofSeconds(5))
- .build();
-
- ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder()
- .topologyRefreshOptions(clusterTopologyRefreshOptions).build();
-
- // https://github.com/lettuce-io/lettuce-core/wiki/ReadFrom-Settings
- LettuceClientConfiguration lettuceClientConfiguration = LettuceClientConfiguration.builder()
- .readFrom(ReadFrom.REPLICA_PREFERRED)
- .clientOptions(clusterClientOptions).build();
-
- return new LettuceConnectionFactory(redisClusterConfiguration, lettuceClientConfiguration);
- }
}
diff --git a/pom.xml b/pom.xml
index d67556609..55652f50a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,8 @@
UTF-8
1.8
1.8
+ 3.8.1
+ 2.2.5
2.2.3
5.3.6
1.2.0
@@ -207,8 +209,9 @@
+ org.apache.maven.plugins
maven-compiler-plugin
- 3.8.0
+ ${maven.compiler.version}
${maven.compiler.target}
${maven.compiler.source}
@@ -219,7 +222,7 @@
pl.project13.maven
git-commit-id-plugin
- 2.2.5
+ ${git.commit.version}