From d516e38fd44e186f393bbb05c4e7ca34b323b609 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:50:52 +0800
Subject: [PATCH] optimize report

---
 java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java b/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java
index 7e22d14..397398d 100755
--- a/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java
+++ b/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java
@@ -40,8 +40,8 @@
     @Autowired
     private RedisTemplate redisTemplate;
 
-    @Bean(name = "jedisPool")
-    @Autowired
+    //@Bean(name = "jedisPool")
+    //@Autowired
     public JedisPool jedisPool(@Qualifier("jedis.pool.config") JedisPoolConfig config,
                                @Value("${jedis.pool.host}") String host,
                                @Value("${jedis.pool.port}") int port,
@@ -59,8 +59,9 @@
         }
     }
 
-    @Bean(name = "jedisCluster")
-    @Autowired
+
+//    @Bean(name = "jedisCluster")
+//    @Autowired
     public JedisCluster jedisCluster(@Qualifier("jedis.pool.config") JedisPoolConfig config,
                                      @Value("${jedis.pool.host}") String host,
                                      @Value("${jedis.pool.port}") int port,
@@ -70,10 +71,6 @@
         if (timeout == 0) {
             timeout = 2000;
         }
-        if (!host.contains(",")) {
-            return null;
-        }
-
         String[] hosts = host.split(",");
         Set<HostAndPort> nodes = new HashSet<>();
         String[] tmpHosts = null;
@@ -83,10 +80,9 @@
         }
         JedisCluster cluster = new JedisCluster(nodes);
         return cluster;
-
     }
 
-    @Bean(name = "jedis.pool.config")
+    //@Bean(name = "jedis.pool.config")
     public JedisPoolConfig jedisPoolConfig(@Value("${jedis.pool.config.maxTotal}") int maxTotal,
                                            @Value("${jedis.pool.config.maxIdle}") int maxIdle,
                                            @Value("${jedis.pool.config.maxWaitMillis}") int maxWaitMillis) {

--
Gitblit v1.8.0