From 23c771747e0b6b42add31e5e78526af064432d71 Mon Sep 17 00:00:00 2001
From: lengleng <wangiegie@gmail.com>
Date: Sat, 6 Jun 2020 09:59:53 +0800
Subject: [PATCH] =?UTF-8?q?:fire:=20Removing=20code=20or=20files.=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20topology-view=20=EF=BC=8Cspring=20boot=202?=
 =?UTF-8?q?.3.0=20=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/cache/RedisTemplateConfig.java       | 34 -------------------
 pom.xml                                       |  7 ++--
 2 files changed, 5 insertions(+), 36 deletions(-)

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 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.version>3.8.1</maven.compiler.version>
+		<git.commit.version>2.2.5</git.commit.version>
 		<spring-boot-admin.version>2.2.3</spring-boot-admin.version>
 		<hutool.version>5.3.6</hutool.version>
 		<kaptcha.version>1.2.0</kaptcha.version>
@@ -207,8 +209,9 @@
 		</pluginManagement>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>${maven.compiler.version}</version>
 				<configuration>
 					<target>${maven.compiler.target}</target>
 					<source>${maven.compiler.source}</source>
@@ -219,7 +222,7 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.5</version>
+				<version>${git.commit.version}</version>
 			</plugin>
 		</plugins>
 	</build>