From cc6bc22c1de296b195ffdff00ae7b6d6436bffc8 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 28 Nov 2021 23:36:32 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/config/WxMpStorageAutoConfiguration.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java index 145c663ef..cf3c48656 100644 --- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java +++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java @@ -30,7 +30,7 @@ import java.util.Set; /** * 微信公众号存储策略自动配置. * - * @author someone + * @author Luo */ @Slf4j @Configuration @@ -40,12 +40,6 @@ public class WxMpStorageAutoConfiguration { private final WxMpProperties wxMpProperties; - @Value("${wx.mp.config-storage.redis.host:") - private String redisHost; - - @Value("${wx.mp.configStorage.redis.host:") - private String redisHost2; - @Bean @ConditionalOnMissingBean(WxMpConfigStorage.class) public WxMpConfigStorage wxMpConfigStorage() { @@ -81,14 +75,15 @@ public class WxMpStorageAutoConfiguration { private WxMpConfigStorage jedisConfigStorage() { JedisPoolAbstract jedisPool; - if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) { + if (wxMpProperties.getConfigStorage() != null && wxMpProperties.getConfigStorage().getRedis() != null + && StringUtils.isNotEmpty(wxMpProperties.getConfigStorage().getRedis().getHost())) { jedisPool = getJedisPool(); } else { jedisPool = applicationContext.getBean(JedisPool.class); } WxRedisOps redisOps = new JedisWxRedisOps(jedisPool); WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, - wxMpProperties.getConfigStorage().getKeyPrefix()); + wxMpProperties.getConfigStorage().getKeyPrefix()); setWxMpInfo(wxMpRedisConfig); return wxMpRedisConfig; } @@ -114,7 +109,7 @@ public class WxMpStorageAutoConfiguration { WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate); WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, - wxMpProperties.getConfigStorage().getKeyPrefix()); + wxMpProperties.getConfigStorage().getKeyPrefix()); setWxMpInfo(wxMpRedisConfig); return wxMpRedisConfig; @@ -160,6 +155,6 @@ public class WxMpStorageAutoConfiguration { } return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(), - redis.getDatabase()); + redis.getDatabase()); } }