zhouhao пре 7 година
родитељ
комит
d9403076e4

+ 2 - 2
hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/src/main/java/org/hswebframework/web/concurrent/counter/CounterAutoConfiguration.java

@@ -9,11 +9,11 @@ import org.springframework.context.annotation.Configuration;
  * @since 3.0
  */
 @Configuration
-@ConditionalOnMissingBean(CounterManager.class)
 public class CounterAutoConfiguration {
 
     @Bean
-    public CounterManager inMemoryCounterManager() {
+    @ConditionalOnMissingBean(CounterManager.class)
+    public CounterManager counterManager() {
         return new SimpleCounterManager();
     }
 }

+ 6 - 4
hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/src/main/java/org/hswebframework/web/counter/redis/RedisCounterAutoConfiguration.java

@@ -1,8 +1,10 @@
 package org.hswebframework.web.counter.redis;
 
+import org.hswebframework.web.concurrent.counter.CounterAutoConfiguration;
+import org.hswebframework.web.concurrent.counter.CounterManager;
 import org.redisson.api.RedissonClient;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,12 +13,12 @@ import org.springframework.context.annotation.Configuration;
  * @since 3.0
  */
 @Configuration
-@ConditionalOnMissingBean(RedissonCounterManager.class)
-@ConditionalOnBean(RedissonClient.class)
+@AutoConfigureBefore(CounterAutoConfiguration.class)
 public class RedisCounterAutoConfiguration {
 
     @Bean
-    public RedissonCounterManager redissonCounterManager(RedissonClient client) {
+    @ConditionalOnBean(RedissonClient.class)
+    public CounterManager counterManager(RedissonClient client) {
         return new RedissonCounterManager(client);
     }
 }