1.2.12-1.2.14 lettuce

common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common-util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

config-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

elasticsearch-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

logger-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datasource/matrix-datasource-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-datasource</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datasource/matrix-datasource-druid/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-datasource</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>

matrix-mq/matrix-rocketmq-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mq</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mq/matrix-rocketmq-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mq</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mq/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mybatis/matrix-mybatis-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mybatis</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mybatis/matrix-mybatis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mybatis</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mybatis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,17 +25,17 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>

matrix-protocol/matrix-protocol-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-dubbo-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-dubbo-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-web-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-web-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,27 +29,27 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
 
             <!-- Aapche Dubbo  -->

mongodb-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

monitor-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

openfeign-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.secoo.mall</groupId>
     <artifactId>matrix</artifactId>
-    <version>1.2.12.RELEASE</version>
+    <version>1.2.14-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -53,97 +53,97 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>logger-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>monitor-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>config-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-util</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>redis-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mongodb-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>elasticsearch-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-rocketmq-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>rocketmq-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-rocketmq-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>openfeign-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.2.14-SNAPSHOT</version>
             </dependency>
 
             <dependency>

redis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

redis-starter/src/main/java/com/secoo/mall/redis/config/MatrixeRedisAutoConfiguration.java

 package com.secoo.mall.redis.config;
 
 import com.secoo.mall.redis.utils.MatrixRedisClusterUtils;
+import io.lettuce.core.ReadFrom;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,6 +11,13 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettucePoolingClientConfiguration;
+
+import java.time.Duration;
 
 
 /**
@@ -56,7 +64,7 @@ public class MatrixeRedisAutoConfiguration {
                 .topologyRefreshOptions(clusterTopologyRefreshOptions).build();
 
         LettuceClientConfiguration lettuceClientConfiguration = LettucePoolingClientConfiguration.builder()
-                .readFrom(ReadFrom.REPLICA_PREFERRED )
+                .readFrom(ReadFrom.SLAVE_PREFERRED )
                 .clientOptions(clusterClientOptions).build();
 
         LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(redisClusterConfiguration, lettuceClientConfiguration);

rocketmq-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.2.14-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>