Skip to content

M
matrix
Commit 60b52fbd by 房斌
Options

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 107c2332 b7bda2ad
Showing with 9 additions and 10 deletions
logger-starter/pom.xml
...@@ -28,8 +28,9 @@ ...@@ -28,8 +28,9 @@
<dependency> <dependency>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId> <artifactId>apm-toolkit-logback-1.x</artifactId>
<version>6.3.0.RELEASE</version> <version>8.3.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-starter-logging</artifactId>
......
matrix-datahelper/matrix-datahelper-redis-core/pom.xml
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
<artifactId>matrix-datahelper-redis-core</artifactId> <artifactId>matrix-datahelper-redis-core</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId> <artifactId>spring-data-redis</artifactId>
</dependency> </dependency>
......
matrix-datahelper/matrix-datahelper-redis-core/src/main/java/com/secoo/mall/redis/helper/RedisHelper.java
package com.secoo.mall.redis.helper; package com.secoo.mall.redis.helper;
import com.alibaba.fastjson.support.spring.FastJsonRedisSerializer;
import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer; import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer;
import com.secoo.mall.common.util.colletion.CollectionUtil; import com.secoo.mall.common.util.colletion.CollectionUtil;
import com.secoo.mall.common.util.string.StringUtil; import com.secoo.mall.common.util.string.StringUtil;
...@@ -12,7 +11,6 @@ import org.springframework.data.redis.connection.jedis.JedisClusterConnection; ...@@ -12,7 +11,6 @@ import org.springframework.data.redis.connection.jedis.JedisClusterConnection;
import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.types.Expiration; import org.springframework.data.redis.core.types.Expiration;
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer;
...@@ -26,6 +24,7 @@ import java.util.concurrent.TimeUnit; ...@@ -26,6 +24,7 @@ import java.util.concurrent.TimeUnit;
*/ */
@Data @Data
@Deprecated
public class RedisHelper { public class RedisHelper {
private final String MUTEX_KEY = "mutex"; private final String MUTEX_KEY = "mutex";
private final static RedisSerializer DEFAULT_STRING_SERIALIZER = new StringRedisSerializer(); private final static RedisSerializer DEFAULT_STRING_SERIALIZER = new StringRedisSerializer();
......
matrix-datahelper/matrix-datahelper-redis-core/src/main/java/com/secoo/mall/redis/utils/MatrixRedisClusterUtils.java
...@@ -5,16 +5,14 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; ...@@ -5,16 +5,14 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.*; import org.springframework.data.redis.core.*;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
* @author QIANG * @author QIANG
* @since 2.0.1 Deprecated。推荐使用RedisHelper * @since 2.0.1
*/ */
@Deprecated
public class MatrixRedisClusterUtils { public class MatrixRedisClusterUtils {
private static MatrixRedisClusterUtils cacheUtils; private static MatrixRedisClusterUtils cacheUtils;
......
matrix-datahelper/matrix-datahelper-redis-starter/src/main/java/com/secoo/mall/redis/spring/boot/autoconfigure/MatrixeRedisAutoConfiguration.java
...@@ -15,8 +15,6 @@ import org.springframework.data.redis.core.RedisTemplate; ...@@ -15,8 +15,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer;
import java.net.UnknownHostException;
/** /**
* Created by QIANG * Created by QIANG
...@@ -50,7 +48,6 @@ public class MatrixeRedisAutoConfiguration { ...@@ -50,7 +48,6 @@ public class MatrixeRedisAutoConfiguration {
*/ */
@Bean @Bean
@ConditionalOnMissingBean(MatrixRedisClusterUtils.class) @ConditionalOnMissingBean(MatrixRedisClusterUtils.class)
@Deprecated
public MatrixRedisClusterUtils jedisClusterUtils(RedisTemplate redisTemplate) { public MatrixRedisClusterUtils jedisClusterUtils(RedisTemplate redisTemplate) {
RedisSerializer stringSerializer = new StringRedisSerializer(); RedisSerializer stringSerializer = new StringRedisSerializer();
redisTemplate.setKeySerializer(stringSerializer); redisTemplate.setKeySerializer(stringSerializer);
......
matrix-protocol/pom.xml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<properties> <properties>
<dubbo-starter.version>2.7.4.1</dubbo-starter.version> <dubbo-starter.version>2.7.4.1</dubbo-starter.version>
<dubbo.version>2.7.4.1</dubbo.version> <dubbo.version>2.7.4.1</dubbo.version>
<secoo-dubbo.version>2.7.4.1-secoo1.5-SNAPSHOT</secoo-dubbo.version> <secoo-dubbo.version>2.7.4.1-secoo1.4</secoo-dubbo.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
......
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