Commit 5293c91d by 房斌

Merge branch 'master' into GracefullyShoutDownDubboAndSpringBott-0112masterinto

# Conflicts:
#	common-core/pom.xml
#	common-util/pom.xml
#	config-starter/pom.xml
#	logger-starter/pom.xml
#	matrix-bigdata/matrix-bigdata-hbase-starter/pom.xml
#	matrix-bigdata/matrix-bigdata-spark-starter/pom.xml
#	matrix-bigdata/pom.xml
#	matrix-bus/matrix-bus-canal-starter/pom.xml
#	matrix-bus/pom.xml
#	matrix-client/matrix-client-openfeign-starter/pom.xml
#	matrix-client/pom.xml
#	matrix-datahelper/matrix-datahelper-redis-core/pom.xml
#	matrix-datahelper/matrix-datahelper-redis-starter/pom.xml
#	matrix-datahelper/pom.xml
#	matrix-datasource/matrix-datasource-core/pom.xml
#	matrix-datasource/matrix-datasource-druid/pom.xml
#	matrix-datasource/pom.xml
#	matrix-job/matrix-job-core/pom.xml
#	matrix-job/matrix-job-xxl-core/pom.xml
#	matrix-job/matrix-job-xxl-starter/pom.xml
#	matrix-job/pom.xml
#	matrix-mq/matrix-mq-rocketmq-client/pom.xml
#	matrix-mq/matrix-mq-rocketmq-core/pom.xml
#	matrix-mq/matrix-mq-rocketmq-starter/pom.xml
#	matrix-mq/pom.xml
#	matrix-mybatis/matrix-mybatis-core/pom.xml
#	matrix-mybatis/matrix-mybatis-starter/pom.xml
#	matrix-mybatis/pom.xml
#	matrix-protocol/matrix-protocol-core/pom.xml
#	matrix-protocol/matrix-protocol-dubbo-core/pom.xml
#	matrix-protocol/matrix-protocol-dubbo-starter/pom.xml
#	matrix-protocol/matrix-protocol-web-core/pom.xml
#	matrix-protocol/matrix-protocol-web-starter/pom.xml
#	matrix-protocol/pom.xml
#	pom.xml
parents 118b51c0 05f0feb2
...@@ -19,6 +19,11 @@ public class MatrixRedisClusterUtils { ...@@ -19,6 +19,11 @@ public class MatrixRedisClusterUtils {
private RedisTemplate<String, String> redisTemplate; private RedisTemplate<String, String> redisTemplate;
public MatrixRedisClusterUtils(RedisTemplate<String, String> redisTemplate) {
this.redisTemplate = redisTemplate;
}
public static RedisTemplate<String, String> getRedisTemplate() { public static RedisTemplate<String, String> getRedisTemplate() {
return cacheUtils.redisTemplate; return cacheUtils.redisTemplate;
} }
......
...@@ -54,7 +54,7 @@ public class MatrixeRedisAutoConfiguration { ...@@ -54,7 +54,7 @@ public class MatrixeRedisAutoConfiguration {
redisTemplate.setValueSerializer(stringSerializer); redisTemplate.setValueSerializer(stringSerializer);
redisTemplate.setHashKeySerializer(stringSerializer); redisTemplate.setHashKeySerializer(stringSerializer);
redisTemplate.setHashValueSerializer(stringSerializer); redisTemplate.setHashValueSerializer(stringSerializer);
return new MatrixRedisClusterUtils(); return new MatrixRedisClusterUtils(redisTemplate);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment