From 9a2b1251fc48874b76d3b02dbfc306698325dfeb Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 10 一月 2024 10:53:38 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/config/RedisConfig.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/config/RedisConfig.java b/src/main/java/com/whyc/config/RedisConfig.java
index 2061cc9..4437092 100644
--- a/src/main/java/com/whyc/config/RedisConfig.java
+++ b/src/main/java/com/whyc/config/RedisConfig.java
@@ -31,7 +31,7 @@
@ConditionalOnProperty(name = "redis.model", havingValue = "single")
@Order(1)
RedissonClient redissonClientSingle() {
- log.error("redis鍗曟満鐗坈lient鍒濆鍖栦簡");
+ log.error("redis single client鍒濆鍖栦簡");
Config config = new Config();
String node = redisProperties.getSingle().getAddress();
SingleServerConfig serverConfig = config.useSingleServer()
@@ -53,7 +53,7 @@
@Bean("redisClient")
@ConditionalOnProperty(name = "redis.model", havingValue = "sentinel")
RedissonClient redissonClientSentinel() {
- log.error("redis鍗曟満鐗坈lient鍒濆鍖栦簡");
+ log.error("redis sentinel client鍒濆鍖栦簡");
Config config = new Config();
String[] nodes = redisProperties.getSentinel().getNodes().split(",");
@@ -79,7 +79,7 @@
@Bean("redisClient")
@ConditionalOnProperty(name = "redis.model", havingValue = "cluster")
RedissonClient redissonClientCluster() {
- log.error("redis鍗曟満鐗坈lient鍒濆鍖栦簡");
+ log.error("redis cluster client鍒濆鍖栦簡");
Config config = new Config();
RedisClusterProperties cluster = redisProperties.getCluster();
RedisPoolProperties pool = redisProperties.getPool();
@@ -102,4 +102,25 @@
return Redisson.create(config);
}
+ /**
+ *
+ */
+ @Bean("redisClient")
+ @ConditionalOnProperty(name = "redis.model", havingValue = "master-slave")
+ RedissonClient redissonClientMasterSlave() {
+ log.error("redis master-slave client鍒濆鍖栦簡");
+ Config config = new Config();
+ RedisClusterProperties cluster = redisProperties.getCluster();
+ RedisPoolProperties pool = redisProperties.getPool();
+ String[] nodes = cluster.getNodes().split(",");
+ MasterSlaveServersConfig serversConfig = config.useMasterSlaveServers()
+ .setMasterAddress(nodes[0])
+ .addSlaveAddress(nodes[1]);
+
+ if (!StringUtils.isEmpty(redisProperties.getPassword())) {
+ serversConfig.setPassword(redisProperties.getPassword());
+ }
+ return Redisson.create(config);
+ }
+
}
--
Gitblit v1.9.1