diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java
index 5bcaebca..036c662f 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java
@@ -44,7 +44,7 @@ public class SeataFeignClient implements Client {
 
 	SeataFeignClient(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
-		this.delegate = new Client.Default(null, null);
+		this.delegate = new Default(null, null);
 	}
 
 	SeataFeignClient(BeanFactory beanFactory, Client delegate) {
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java
index 98f670ea..77b9c08d 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java
@@ -65,19 +65,19 @@ public class SeataFeignClientAutoConfiguration {
 	protected static class FeignBeanPostProcessorConfiguration {
 
 		@Bean
-		SeataBeanPostProcessor seataBeanPostProcessor(
+        SeataBeanPostProcessor seataBeanPostProcessor(
 				SeataFeignObjectWrapper seataFeignObjectWrapper) {
 			return new SeataBeanPostProcessor(seataFeignObjectWrapper);
 		}
 
 		@Bean
-		SeataContextBeanPostProcessor seataContextBeanPostProcessor(
+        SeataContextBeanPostProcessor seataContextBeanPostProcessor(
 				BeanFactory beanFactory) {
 			return new SeataContextBeanPostProcessor(beanFactory);
 		}
 
 		@Bean
-		SeataFeignObjectWrapper seataFeignObjectWrapper(BeanFactory beanFactory) {
+        SeataFeignObjectWrapper seataFeignObjectWrapper(BeanFactory beanFactory) {
 			return new SeataFeignObjectWrapper(beanFactory);
 		}
 
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java
index 8204fed8..54a8de51 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java
@@ -33,9 +33,9 @@ import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 public class SeataLoadBalancerFeignClient extends LoadBalancerFeignClient {
 
 	SeataLoadBalancerFeignClient(Client delegate,
-			CachingSpringLoadBalancerFactory lbClientFactory,
-			SpringClientFactory clientFactory,
-			SeataFeignObjectWrapper seataFeignObjectWrapper) {
+                                 CachingSpringLoadBalancerFactory lbClientFactory,
+                                 SpringClientFactory clientFactory,
+                                 SeataFeignObjectWrapper seataFeignObjectWrapper) {
 		super((Client) seataFeignObjectWrapper.wrap(delegate), lbClientFactory,
 				clientFactory);
 	}
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java
index e3295ed1..3f4fe50f 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
 public class SeataHystrixAutoConfiguration {
 
 	@Bean
-	SeataHystrixConcurrencyStrategy seataHystrixConcurrencyStrategy() {
+    SeataHystrixConcurrencyStrategy seataHystrixConcurrencyStrategy() {
 		return new SeataHystrixConcurrencyStrategy();
 	}
 
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
index 338d1c92..2aa507bd 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
@@ -46,6 +46,7 @@ public class SeataHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy
 
 	private final Logger logger = LoggerFactory
 			.getLogger(SeataHystrixConcurrencyStrategy.class);
+
 	private HystrixConcurrencyStrategy delegate;
 
 	public SeataHystrixConcurrencyStrategy() {
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java
index 829ef079..47bba98d 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java
@@ -34,7 +34,7 @@ public class SeataRestTemplateInterceptor implements ClientHttpRequestIntercepto
 
 	@Override
 	public ClientHttpResponse intercept(HttpRequest httpRequest, byte[] bytes,
-			ClientHttpRequestExecution clientHttpRequestExecution) throws IOException {
+                                        ClientHttpRequestExecution clientHttpRequestExecution) throws IOException {
 		HttpRequestWrapper requestWrapper = new HttpRequestWrapper(httpRequest);
 
 		String xid = RootContext.getXID();
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
index dcc0b28c..7f661ee2 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
@@ -19,21 +19,21 @@ package com.alibaba.cloud.seata.web;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import io.seata.common.util.StringUtils;
 import io.seata.core.context.RootContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
 /**
  * @author xiaojing
  *
  * Seata HandlerInterceptor, Convert Seata information into
- * @see io.seata.core.context.RootContext from http request's header in
- * {@link org.springframework.web.servlet.HandlerInterceptor#preHandle(HttpServletRequest , HttpServletResponse , Object )},
+ * @see RootContext from http request's header in
+ * {@link HandlerInterceptor#preHandle(HttpServletRequest, HttpServletResponse, Object )},
  * And clean up Seata information after servlet method invocation in
- * {@link org.springframework.web.servlet.HandlerInterceptor#afterCompletion(HttpServletRequest, HttpServletResponse, Object, Exception)}
+ * {@link HandlerInterceptor#afterCompletion(HttpServletRequest, HttpServletResponse, Object, Exception)}
  */
 public class SeataHandlerInterceptor implements HandlerInterceptor {
 
@@ -42,7 +42,7 @@ public class SeataHandlerInterceptor implements HandlerInterceptor {
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
-			Object handler) {
+                             Object handler) {
 
 		String xid = RootContext.getXID();
 		String rpcXid = request.getHeader(RootContext.KEY_XID);
@@ -50,7 +50,7 @@ public class SeataHandlerInterceptor implements HandlerInterceptor {
 			log.debug("xid in RootContext {} xid in RpcContext {}", xid, rpcXid);
 		}
 
-		if (xid == null && rpcXid != null) {
+		if (StringUtils.isBlank(xid) && rpcXid != null) {
 			RootContext.bind(rpcXid);
 			if (log.isDebugEnabled()) {
 				log.debug("bind {} to RootContext", rpcXid);
@@ -61,23 +61,24 @@ public class SeataHandlerInterceptor implements HandlerInterceptor {
 
 	@Override
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
-			Object handler, Exception e) {
+                                Object handler, Exception e) {
+		if (StringUtils.isNotBlank(RootContext.getXID())) {
+			String rpcXid = request.getHeader(RootContext.KEY_XID);
 
-		String rpcXid = request.getHeader(RootContext.KEY_XID);
+			if (StringUtils.isEmpty(rpcXid)) {
+				return;
+			}
 
-		if (StringUtils.isEmpty(rpcXid)) {
-			return;
-		}
-
-		String unbindXid = RootContext.unbind();
-		if (log.isDebugEnabled()) {
-			log.debug("unbind {} from RootContext", unbindXid);
-		}
-		if (!rpcXid.equalsIgnoreCase(unbindXid)) {
-			log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid);
-			if (unbindXid != null) {
-				RootContext.bind(unbindXid);
-				log.warn("bind {} back to RootContext", unbindXid);
+			String unbindXid = RootContext.unbind();
+			if (log.isDebugEnabled()) {
+				log.debug("unbind {} from RootContext", unbindXid);
+			}
+			if (!rpcXid.equalsIgnoreCase(unbindXid)) {
+				log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid);
+				if (unbindXid != null) {
+					RootContext.bind(unbindXid);
+					log.warn("bind {} back to RootContext", unbindXid);
+				}
 			}
 		}
 	}