Commit 4c163d7b authored by suhuiguang's avatar suhuiguang

1.bug

parent 4fc767c5
...@@ -30,19 +30,25 @@ public class RedissonManager { ...@@ -30,19 +30,25 @@ public class RedissonManager {
/** /**
* 单机环境使用 * 单机环境使用
*/ */
@Value("${spring.redis.host:default}") @Value("${spring.redis.host}")
private String host; private String host;
/** /**
* 单机环境使用 * 单机环境使用
*/ */
@Value("${spring.redis.port:default}") @Value("${spring.redis.port}")
private String port; private String port;
/**
* 单机环境使用
*/
@Value("${spring.redis.database}")
private int database;
@Bean @Bean
@ConditionalOnProperty(name = "spring.redis.mode", havingValue = "cluster") @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "cluster")
public RedissonClient redissonClient() { public RedissonClient redissonClient() {
// 集群环境使用
Config config = new Config(); Config config = new Config();
config.useClusterServers() config.useClusterServers()
.addNodeAddress(clusterNodes.split(",")) .addNodeAddress(clusterNodes.split(","))
...@@ -55,7 +61,7 @@ public class RedissonManager { ...@@ -55,7 +61,7 @@ public class RedissonManager {
public RedissonClient redissonSingletonClient() { public RedissonClient redissonSingletonClient() {
// 单机打包使用 // 单机打包使用
Config config = new Config(); Config config = new Config();
config.useSingleServer().setAddress(host + ":" + port).setPassword(password); config.useSingleServer().setAddress(host + ":" + port).setPassword(password).setDatabase(database);
return Redisson.create(config); return Redisson.create(config);
} }
} }
...@@ -10,30 +10,46 @@ import org.springframework.context.annotation.Bean; ...@@ -10,30 +10,46 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
@Slf4j @Slf4j
public class RedissonManager { public class RedissonManager {
//集群环境使用 /**
* 集群环境使用-节点信息
*/
@Value("${spring.redis.cluster.nodes:default}") @Value("${spring.redis.cluster.nodes:default}")
private String clusterNodes; private String clusterNodes;
//通用
/**
* 公共-密码
*/
@Value("${spring.redis.password}") @Value("${spring.redis.password}")
private String password; private String password;
//单机环境使用 /**
@Value("${spring.redis.host:default}") * 单机环境使用-host
*/
@Value("${spring.redis.host}")
private String host; private String host;
//单机环境使用 /**
@Value("${spring.redis.port:default}") * 单机环境使用
*/
@Value("${spring.redis.port}")
private String port; private String port;
/**
* 单机环境使用
*/
@Value("${spring.redis.database}")
private int database;
@Bean @Bean
@ConditionalOnProperty(name = "spring.redis.mode", havingValue = "cluster") @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "cluster")
public RedissonClient redissonClient() { public RedissonClient redissonClient() {
// 集群环境使用
Config config = new Config(); Config config = new Config();
config.useClusterServers() config.useClusterServers()
.addNodeAddress(clusterNodes.split(",")) .addNodeAddress(clusterNodes.split(","))
...@@ -44,9 +60,9 @@ public class RedissonManager { ...@@ -44,9 +60,9 @@ public class RedissonManager {
@Bean @Bean
@ConditionalOnProperty(name = "spring.redis.mode", havingValue = "singleton", matchIfMissing = true) @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "singleton", matchIfMissing = true)
public RedissonClient redissonSingletonClient() { public RedissonClient redissonSingletonClient() {
// 单机打包使用 // 单机环境使用
Config config = new Config(); Config config = new Config();
config.useSingleServer().setAddress(host + ":" + port).setPassword(password); config.useSingleServer().setAddress(host + ":" + port).setPassword(password).setDatabase(database);
return Redisson.create(config); return Redisson.create(config);
} }
} }
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