From 45479ec2fee2daebf178b57cbbb758520637b40f Mon Sep 17 00:00:00 2001
From: zhaoyunxing92 <2385585770@qq.com>
Date: Thu, 31 Oct 2019 16:35:46 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E8=AE=BE=E7=BD=AE=E5=9C=A8web=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E4=B8=8B=E6=89=8D=E6=B3=A8=E5=85=A5=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java    | 2 ++
 .../cloud/seata/web/SeataHandlerInterceptorConfiguration.java   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
index dcc0b28c0..da8dde252 100644
--- a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
+++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
@@ -23,6 +23,7 @@ import io.seata.core.context.RootContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -35,6 +36,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
  * And clean up Seata information after servlet method invocation in
  * {@link org.springframework.web.servlet.HandlerInterceptor#afterCompletion(HttpServletRequest, HttpServletResponse, Object, Exception)}
  */
+@ConditionalOnWebApplication
 public class SeataHandlerInterceptor implements HandlerInterceptor {
 
 	private static final Logger log = LoggerFactory
diff --git a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java
index 347b0de56..10aa3858b 100644
--- a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java
+++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java
@@ -16,12 +16,14 @@
 
 package com.alibaba.cloud.seata.web;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * @author xiaojing
  */
+@ConditionalOnWebApplication
 public class SeataHandlerInterceptorConfiguration implements WebMvcConfigurer {
 
 	@Override