|
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
|
|
import com.fasterxml.jackson.annotation.PropertyAccessor;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
-import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
|
import org.springframework.cloud.context.config.annotation.RefreshScope;
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
@@ -14,7 +13,6 @@ import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
|
|
|
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
|
|
|
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
-import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
|
|
|
import org.springframework.data.redis.serializer.StringRedisSerializer;
|
|
|
import org.springframework.util.StringUtils;
|
|
@@ -104,7 +102,7 @@ public class RedisConfig {
|
|
|
* 索引1
|
|
|
*/
|
|
|
@Value("${spring.redis.database.fourteen:14}")
|
|
|
- private Integer databaseOne;
|
|
|
+ private Integer databaseFourteen;
|
|
|
|
|
|
@Value("${integrated.redisson.password}")
|
|
|
private String password;
|
|
@@ -251,7 +249,8 @@ public class RedisConfig {
|
|
|
RedisTemplate<Object, Object> template = new RedisTemplate<>();
|
|
|
// initDomainRedisTemplate(template,
|
|
|
// lettuceConnectionFactory(databaseZero));
|
|
|
- initDomainRedisTemplate(template, jedisConnectionFactory(databaseOne));
|
|
|
+ initDomainRedisTemplate(template, jedisConnectionFactory(databaseFourteen));
|
|
|
+ template.setDefaultSerializer(new StringRedisSerializer());
|
|
|
return template;
|
|
|
}
|
|
|
|
|
@@ -260,11 +259,11 @@ public class RedisConfig {
|
|
|
JedisConnectionFactory jedisConnectionFactory = null;
|
|
|
if (useCluster) {
|
|
|
// 哨兵模式
|
|
|
- jedisConnectionFactory = new JedisConnectionFactory(sentinelConfiguration(databaseOne),
|
|
|
+ jedisConnectionFactory = new JedisConnectionFactory(sentinelConfiguration(databaseFourteen),
|
|
|
getJedisClientConfiguration());
|
|
|
} else {
|
|
|
// 单机模式
|
|
|
- jedisConnectionFactory = new JedisConnectionFactory(standaloneConfiguration(databaseOne),
|
|
|
+ jedisConnectionFactory = new JedisConnectionFactory(standaloneConfiguration(databaseFourteen),
|
|
|
getJedisClientConfiguration());
|
|
|
}
|
|
|
jedisConnectionFactory.afterPropertiesSet();
|