From 2680c5e92195a294d5a5e2df743dbaa92ebede9c Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sun, 9 Aug 2020 11:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/toesbieya/jxc/config/WebConfig.java   |  2 --
 .../jxc/interceptor/SecurityInterceptor.java      |  1 +
 .../jxc/interceptor/UserActionInterceptor.java    | 15 ---------------
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java

diff --git a/java/local/src/main/java/cn/toesbieya/jxc/config/WebConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/WebConfig.java
index 0fb750d..0ef5dbd 100644
--- a/java/local/src/main/java/cn/toesbieya/jxc/config/WebConfig.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/config/WebConfig.java
@@ -1,7 +1,6 @@
 package cn.toesbieya.jxc.config;
 
 import cn.toesbieya.jxc.interceptor.SecurityInterceptor;
-import cn.toesbieya.jxc.interceptor.UserActionInterceptor;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
@@ -39,7 +38,6 @@ public class WebConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         String[] exclude = {"/test/**", "/account/login", "/account/logout", "/account/register", "/account/checkName", "/error"};
         addInterceptor(registry, new SecurityInterceptor(), exclude);
-        addInterceptor(registry, new UserActionInterceptor(), exclude);
     }
 
     private void addInterceptor(InterceptorRegistry registry, HandlerInterceptor interceptor, String[] exclude) {
diff --git a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java
index 86f16da..7d9c659 100644
--- a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java
@@ -32,6 +32,7 @@ public class SecurityInterceptor implements HandlerInterceptor {
         }
 
         ThreadUtil.setUser(user);
+        ThreadUtil.quicklySetAction(request);
 
         return true;
     }
diff --git a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java
deleted file mode 100644
index ae3a2b0..0000000
--- a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.toesbieya.jxc.interceptor;
-
-import cn.toesbieya.jxc.util.ThreadUtil;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class UserActionInterceptor implements HandlerInterceptor {
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        ThreadUtil.quicklySetAction(request);
-        return true;
-    }
-}