From 31491756542c892f4509cb427daa21fb18bcd18a Mon Sep 17 00:00:00 2001 From: qxo <49526356@qq.com> Date: Mon, 27 Mar 2023 23:45:06 +0800 Subject: [PATCH] feat: add ssuport for ignore redissonProperties.getFile empty by using we want using spring.redis.host/port and ignore spring.redis.redisson config ie: -Dspring.redis.redisson.file= -Dspring.redis.host=xxx -Dspring.redis.port=xxx --- .../org/redisson/spring/starter/RedissonAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfiguration.java b/redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfiguration.java index 1a057b35e..c32b63397 100644 --- a/redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfiguration.java +++ b/redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfiguration.java @@ -164,7 +164,7 @@ public class RedissonAutoConfiguration { throw new IllegalArgumentException("Can't parse config", e1); } } - } else if (redissonProperties.getFile() != null) { + } else if (redissonProperties.getFile() != null && !redissonProperties.getFile().isEmpty()) { try { InputStream is = getConfigStream(); config = Config.fromYAML(is);