diff --git a/fizz-core/src/main/java/we/api/pairing/ApiPairingController.java b/fizz-core/src/main/java/we/api/pairing/ApiPairingController.java
index 7afda73..532869d 100644
--- a/fizz-core/src/main/java/we/api/pairing/ApiPairingController.java
+++ b/fizz-core/src/main/java/we/api/pairing/ApiPairingController.java
@@ -20,6 +20,7 @@ package we.api.pairing;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -51,7 +52,7 @@ import java.util.stream.Collectors;
  * @author hongqiaowei
  */
 
-@ConditionalOnBean({ApiPairingDocSetService.class})
+@ConditionalOnProperty(name = SystemConfig.FIZZ_API_PAIRING_SERVER_ENABLE, havingValue = "true")
 @RestController
 @RequestMapping(SystemConfig.DEFAULT_GATEWAY_PREFIX + "/_fizz-pairing")
 public class ApiPairingController {
diff --git a/fizz-core/src/main/java/we/api/pairing/ApiPairingDocSetService.java b/fizz-core/src/main/java/we/api/pairing/ApiPairingDocSetService.java
index f599d8b..8d9d45b 100644
--- a/fizz-core/src/main/java/we/api/pairing/ApiPairingDocSetService.java
+++ b/fizz-core/src/main/java/we/api/pairing/ApiPairingDocSetService.java
@@ -27,6 +27,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import we.Fizz;
 import we.config.AggregateRedisConfig;
+import we.config.SystemConfig;
 import we.plugin.auth.ApiConfig;
 import we.util.JacksonUtils;
 import we.util.ReactiveResult;
@@ -40,7 +41,7 @@ import java.util.*;
  * @author hongqiaowei
  */
 
-@ConditionalOnProperty(name = "fizz.api.pairing.server.enable", havingValue = "true")
+@ConditionalOnProperty(name = SystemConfig.FIZZ_API_PAIRING_SERVER_ENABLE, havingValue = "true")
 @Service
 public class ApiPairingDocSetService {
 
diff --git a/fizz-core/src/main/java/we/api/pairing/ApiPairingInfoService.java b/fizz-core/src/main/java/we/api/pairing/ApiPairingInfoService.java
index 9bf4008..8f26d31 100644
--- a/fizz-core/src/main/java/we/api/pairing/ApiPairingInfoService.java
+++ b/fizz-core/src/main/java/we/api/pairing/ApiPairingInfoService.java
@@ -26,6 +26,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import we.Fizz;
 import we.config.AggregateRedisConfig;
+import we.config.SystemConfig;
 import we.util.JacksonUtils;
 import we.util.ReactiveResult;
 import we.util.Result;
@@ -40,7 +41,7 @@ import java.util.Map;
  * @author hongqiaowei
  */
 
-@ConditionalOnProperty(name = "fizz.api.pairing.client.enable", havingValue = "true")
+@ConditionalOnProperty(name = SystemConfig.FIZZ_API_PAIRING_CLIENT_ENABLE, havingValue = "true")
 @Service
 public class ApiPairingInfoService {
 
diff --git a/fizz-core/src/main/java/we/api/pairing/ApiPairingServiceRegistration.java b/fizz-core/src/main/java/we/api/pairing/ApiPairingServiceRegistration.java
index 6739fc9..fca55ae 100644
--- a/fizz-core/src/main/java/we/api/pairing/ApiPairingServiceRegistration.java
+++ b/fizz-core/src/main/java/we/api/pairing/ApiPairingServiceRegistration.java
@@ -17,15 +17,16 @@
 
 package we.api.pairing;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
+import we.config.SystemConfig;
 
 /**
  * @author hongqiaowei
  */
 
-@ConditionalOnBean({FizzApiPairingWebServer.class})
+@ConditionalOnProperty(name = SystemConfig.FIZZ_API_PAIRING_CLIENT_ENABLE, havingValue = "true")
 @Component
 public class ApiPairingServiceRegistration implements ApplicationListener<FizzApiPairingWebServerInitializedEvent> {
 
diff --git a/fizz-core/src/main/java/we/api/pairing/FizzApiPairingWebServer.java b/fizz-core/src/main/java/we/api/pairing/FizzApiPairingWebServer.java
index 86021b1..e2a0eac 100644
--- a/fizz-core/src/main/java/we/api/pairing/FizzApiPairingWebServer.java
+++ b/fizz-core/src/main/java/we/api/pairing/FizzApiPairingWebServer.java
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.context.ReactiveWebServerApplicationContext;
@@ -30,6 +30,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.web.server.adapter.HttpWebHandlerAdapter;
 import org.springframework.web.server.session.DefaultWebSessionManager;
+import we.config.SystemConfig;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -39,7 +40,7 @@ import javax.annotation.Resource;
  * @author hongqiaowei
  */
 
-@ConditionalOnBean({ApiPairingInfoService.class})
+@ConditionalOnProperty(name = SystemConfig.FIZZ_API_PAIRING_CLIENT_ENABLE, havingValue = "true")
 @Configuration
 @AutoConfigureAfter({HttpHandlerAutoConfiguration.class})
 public class FizzApiPairingWebServer {
diff --git a/fizz-core/src/main/java/we/config/SystemConfig.java b/fizz-core/src/main/java/we/config/SystemConfig.java
index 99906c8..f62b497 100644
--- a/fizz-core/src/main/java/we/config/SystemConfig.java
+++ b/fizz-core/src/main/java/we/config/SystemConfig.java
@@ -55,6 +55,9 @@ public class SystemConfig {
     public  static  final  String   FIZZ_SIGN                        = "fizz-sign";
     public  static  final  String   FIZZ_TIMESTAMP                   = "fizz-ts";
 
+    public  static  final  String   FIZZ_API_PAIRING_SERVER_ENABLE   = "fizz.api.pairing.server.enable";
+    public  static  final  String   FIZZ_API_PAIRING_CLIENT_ENABLE   = "fizz.api.pairing.client.enable";
+
     private  String       gatewayPrefix      = DEFAULT_GATEWAY_PREFIX;
 
     private  List<String> appHeaders         = Stream.of(FIZZ_APP_ID)   .collect(Collectors.toList());
diff --git a/fizz-plugin/src/main/java/we/plugin/apidoc/ApiDocAuthPluginFilter.java b/fizz-plugin/src/main/java/we/plugin/apidoc/ApiDocAuthPluginFilter.java
index 5367946..8b85371 100644
--- a/fizz-plugin/src/main/java/we/plugin/apidoc/ApiDocAuthPluginFilter.java
+++ b/fizz-plugin/src/main/java/we/plugin/apidoc/ApiDocAuthPluginFilter.java
@@ -17,33 +17,31 @@
 
 package we.plugin.apidoc;
 
-import java.util.Map;
-
-import javax.annotation.Resource;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
-
 import reactor.core.publisher.Mono;
 import we.api.pairing.ApiPairingDocSetService;
-import we.api.pairing.ApiPairingInfoService;
+import we.config.SystemConfig;
 import we.plugin.FizzPluginFilter;
 import we.plugin.FizzPluginFilterChain;
 import we.util.ReactorUtils;
 import we.util.WebUtils;
 
+import javax.annotation.Resource;
+import java.util.Map;
+
 /**
  * 
  * @author Francis Dong
  *
  */
-@ConditionalOnBean({ApiPairingInfoService.class})
+@ConditionalOnProperty(name = SystemConfig.FIZZ_API_PAIRING_SERVER_ENABLE, havingValue = "true")
 @Component(ApiDocAuthPluginFilter.API_DOC_AUTH_PLUGIN_FILTER)
 public class ApiDocAuthPluginFilter implements FizzPluginFilter {