🐛 binarywang#2015 【小程序】解决starter模块强制依赖jedis的问题

Author: huayanYu

spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java

@@ -77,7 +77,7 @@ public WxMaConfig wxMaConfig(){
 WxMaDefaultConfigImplconfig;
 switch (wxMaProperties.getConfigStorage().getType()){
 caseJedis:
-config = wxMaJedisConfigStorage();
+config = WxMaRedisBetterConfig.config(wxMaProperties, applicationContext);
 break;
 caseRedisTemplate:
 config = wxMaRedisTemplateConfigStorage();
@@ -107,35 +107,39 @@ private WxMaDefaultConfigImpl wxMaDefaultConfigStorage(){
 returnnewWxMaDefaultConfigImpl();
  }
 
-privateWxMaDefaultConfigImplwxMaJedisConfigStorage(){
-RedisPropertiesredisProperties = wxMaProperties.getConfigStorage().getRedis();
-JedisPooljedisPool;
-if (StringUtils.isNotEmpty(redisProperties.getHost())){
-JedisPoolConfigconfig = newJedisPoolConfig();
-if (redisProperties.getMaxActive() != null){
-config.setMaxTotal(redisProperties.getMaxActive());
- }
-if (redisProperties.getMaxIdle() != null){
-config.setMaxIdle(redisProperties.getMaxIdle());
- }
-if (redisProperties.getMaxWaitMillis() != null){
-config.setMaxWaitMillis(redisProperties.getMaxWaitMillis());
- }
-if (redisProperties.getMinIdle() != null){
-config.setMinIdle(redisProperties.getMinIdle());
- }
-config.setTestOnBorrow(true);
-config.setTestWhileIdle(true);
+privatestaticclassWxMaRedisBetterConfig{
 
-jedisPool = newJedisPool(config, redisProperties.getHost(), redisProperties.getPort(),
-redisProperties.getTimeout(), redisProperties.getPassword(), redisProperties.getDatabase());
- } else{
-jedisPool = applicationContext.getBean(JedisPool.class);
+privatestaticWxMaDefaultConfigImplconfig(WxMaPropertieswxMaProperties, ApplicationContextcontext){
+RedisPropertiesredisProperties = wxMaProperties.getConfigStorage().getRedis();
+JedisPooljedisPool;
+if (StringUtils.isNotEmpty(redisProperties.getHost())){
+JedisPoolConfigconfig = newJedisPoolConfig();
+if (redisProperties.getMaxActive() != null){
+config.setMaxTotal(redisProperties.getMaxActive());
+ }
+if (redisProperties.getMaxIdle() != null){
+config.setMaxIdle(redisProperties.getMaxIdle());
+ }
+if (redisProperties.getMaxWaitMillis() != null){
+config.setMaxWaitMillis(redisProperties.getMaxWaitMillis());
+ }
+if (redisProperties.getMinIdle() != null){
+config.setMinIdle(redisProperties.getMinIdle());
+ }
+config.setTestOnBorrow(true);
+config.setTestWhileIdle(true);
+
+jedisPool = newJedisPool(config, redisProperties.getHost(), redisProperties.getPort(),
+redisProperties.getTimeout(), redisProperties.getPassword(), redisProperties.getDatabase());
+ } else{
+jedisPool = context.getBean(JedisPool.class);
+ }
+WxRedisOpsredisOps = newJedisWxRedisOps(jedisPool);
+returnnewWxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
  }
-WxRedisOpsredisOps = newJedisWxRedisOps(jedisPool);
-returnnewWxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
  }
 
+
 privateWxMaDefaultConfigImplwxMaRedisTemplateConfigStorage(){
 StringRedisTemplateredisTemplate = applicationContext.getBean(StringRedisTemplate.class);
 WxRedisOpsredisOps = newRedisTemplateWxRedisOps(redisTemplate);