fix(wx-java-mp): 修复 Spring Boot Starter 的 Redisson 客户端回退

spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml

@@ -51,6 +51,16 @@
       <artifactId>redisson</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/storage/WxMpInRedissonConfigStorageConfiguration.java

@@ -15,7 +15,11 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.type.AnnotatedTypeMetadata;
 
 /**
  * @author <a href="https://github.com/buaazyl">zhangyl</a>
@@ -29,6 +33,8 @@
 @ConditionalOnClass({Redisson.class, RedissonClient.class})
 @RequiredArgsConstructor
 public class WxMpInRedissonConfigStorageConfiguration extends AbstractWxMpConfigStorageConfiguration {
+  private static final String REDISSON_CLIENT_BEAN = "wxMpRedissonClient";
+
   private final WxMpProperties properties;
   private final ApplicationContext applicationContext;
 
@@ -40,18 +46,17 @@ public WxMpConfigStorage wxMpConfigStorage() {
   }
 
   private WxMpRedissonConfigImpl getWxMpInRedissonConfigStorage() {
-    RedisProperties redisProperties = properties.getConfigStorage().getRedis();
     RedissonClient redissonClient;
-    if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) {
-      redissonClient = applicationContext.getBean("wxMpRedissonClient", RedissonClient.class);
+    if (applicationContext.containsBean(REDISSON_CLIENT_BEAN)) {
+      redissonClient = applicationContext.getBean(REDISSON_CLIENT_BEAN, RedissonClient.class);
     } else {
       redissonClient = applicationContext.getBean(RedissonClient.class);
     }
     return new WxMpRedissonConfigImpl(redissonClient, properties.getConfigStorage().getKeyPrefix());
   }
 
-  @Bean
-  @ConditionalOnProperty(prefix = WxMpProperties.PREFIX + ".config-storage.redis", name = "host")
+  @Bean(REDISSON_CLIENT_BEAN)
+  @Conditional(RedisHostConfiguredCondition.class)
   public RedissonClient wxMpRedissonClient() {
     WxMpProperties.ConfigStorage storage = properties.getConfigStorage();
     RedisProperties redis = storage.getRedis();
@@ -66,4 +71,13 @@ public RedissonClient wxMpRedissonClient() {
     config.setTransportMode(TransportMode.NIO);
     return Redisson.create(config);
   }
+
+  static class RedisHostConfiguredCondition implements Condition {
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+      String host = context.getEnvironment().getProperty(WxMpProperties.PREFIX + ".config-storage.redis.host");
+      return StringUtils.isNotBlank(host) && !"false".equalsIgnoreCase(host);
+    }
+  }
 }

spring-boot-starters/wx-java-mp-spring-boot-starter/src/test/java/com/binarywang/spring/starter/wxjava/mp/config/storage/WxMpInRedissonConfigStorageConfigurationTest.java

@@ -0,0 +1,64 @@
+package com.binarywang.spring.starter.wxjava.mp.config.storage;
+
+import com.binarywang.spring.starter.wxjava.mp.config.WxMpAutoConfiguration;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.core.env.MapPropertySource;
+import org.testng.annotations.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertSame;
+
+public class WxMpInRedissonConfigStorageConfigurationTest {
+  private static final String CLIENT_BEAN_NAME = "wxMpRedissonClient";
+
+  @Test
+  public void reusesExistingClientWithoutDedicatedHost() {
+    RedissonClient sharedClient = mock(RedissonClient.class);
+    try (AnnotationConfigApplicationContext context = context(null, sharedClient)) {
+      context.refresh();
+
+      assertFalse(context.containsBean(CLIENT_BEAN_NAME));
+      verify(sharedClient, atLeastOnce()).getLock(anyString());
+    }
+  }
+
+  @Test
+  public void usesDedicatedClientWithExplicitHost() {
+    RedissonClient sharedClient = mock(RedissonClient.class);
+    RedissonClient dedicatedClient = mock(RedissonClient.class);
+    try (AnnotationConfigApplicationContext context = context("redis.example.test", sharedClient)) {
+      // Verify that Spring registers the dedicated bean without opening a Redis connection.
+      context.addBeanFactoryPostProcessor(beanFactory -> {
+        AbstractBeanDefinition definition = (AbstractBeanDefinition) beanFactory.getBeanDefinition(CLIENT_BEAN_NAME);
+        definition.setInstanceSupplier(() -> dedicatedClient);
+      });
+      context.refresh();
+
+      assertSame(context.getBean(CLIENT_BEAN_NAME), dedicatedClient);
+      verify(dedicatedClient, atLeastOnce()).getLock(anyString());
+    }
+  }
+
+  private AnnotationConfigApplicationContext context(String host, RedissonClient sharedClient) {
+    AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("wx.mp.app-id", "test-app");
+    properties.put("wx.mp.config-storage.type", "redisson");
+    if (host != null) {
+      properties.put("wx.mp.config-storage.redis.host", host);
+    }
+    context.getEnvironment().getPropertySources().addFirst(new MapPropertySource("test", properties));
+    context.registerBean("sharedRedissonClient", RedissonClient.class, () -> sharedClient);
+    context.register(WxMpAutoConfiguration.class);
+    return context;
+  }
+}