From 333065f8d9b599b048668a0686ba2ee58944b0e4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 11:26:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java b/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java
index 03fae5d..74e3059 100644
--- a/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java
+++ b/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java
@@ -8,21 +8,28 @@
 import org.springframework.web.servlet.HandlerInterceptor;
 
 import com.moral.redis.RedisUtil;
+import com.moral.util.TokenUtils;
 
 @Component
 public class AuthenticationInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        request.getSession();
         if (!(handler instanceof HandlerMethod)) {
             return true;
         }
         String token = request.getHeader("token");
-        if (token != null) {
-            return RedisUtil.hasKey(token);
+        if (token == null) {
+            return false;
         }
-        return false;
-
+        try {
+            //������token
+            TokenUtils.checkToken(token);
+            //������token
+            TokenUtils.extendTokenTime(token);
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
     }
 }

--
Gitblit v1.8.0