From ac2115114c061fa2e3f830857b831431b22f8862 Mon Sep 17 00:00:00 2001
From: youken9980 <youken9980@163.com>
Date: Thu, 1 Apr 2021 15:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Redis=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=90=91=E5=85=B6?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E8=BA=AB=E4=BB=BD=E9=AA=8C=E8=AF=81=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/main/config/application.properties             | 2 +-
 server/src/main/java/cn/keking/config/RedissonConfig.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/main/config/application.properties b/server/src/main/config/application.properties
index cde6c068..5b1bb54f 100644
--- a/server/src/main/config/application.properties
+++ b/server/src/main/config/application.properties
@@ -33,7 +33,7 @@ office.home = ${KK_OFFICE_HOME:default}
 cache.type =  ${KK_CACHE_TYPE:jdk}
 #redis连接，只有当cache.type = redis时才有用
 spring.redisson.address = ${KK_SPRING_REDISSON_ADDRESS:127.0.0.1:6379}
-spring.redisson.password = ${KK_SPRING_REDISSON_PASSWORD:123456}
+spring.redisson.password = ${KK_SPRING_REDISSON_PASSWORD:}
 #缓存是否自动清理 true 为开启，注释掉或其他值都为关闭
 cache.clean.enabled = ${KK_CACHE_CLEAN_ENABLED:true}
 #缓存自动清理时间，cache.clean.enabled = true时才有用，cron表达式，基于Quartz cron
diff --git a/server/src/main/java/cn/keking/config/RedissonConfig.java b/server/src/main/java/cn/keking/config/RedissonConfig.java
index 2a3d7d27..6fb27acb 100644
--- a/server/src/main/java/cn/keking/config/RedissonConfig.java
+++ b/server/src/main/java/cn/keking/config/RedissonConfig.java
@@ -1,6 +1,7 @@
 package cn.keking.config;
 
 import io.netty.channel.nio.NioEventLoopGroup;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.client.codec.Codec;
 import org.redisson.config.Config;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@@ -63,7 +64,7 @@ public class RedissonConfig {
                 .setConnectTimeout(connectTimeout)
                 .setIdleConnectionTimeout(idleConnectionTimeout)
                 .setPingTimeout(pingTimeout)
-                .setPassword(password);
+                .setPassword(StringUtils.trimToNull(password));
         Codec codec=(Codec) ClassUtils.forName(getCodec(), ClassUtils.getDefaultClassLoader()).newInstance();
         config.setCodec(codec);
         config.setThreads(thread);