From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-api/src/main/java/com/java110/api/filter/JwtFilter.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/filter/JwtFilter.java b/service-api/src/main/java/com/java110/api/filter/JwtFilter.java
index 2c677a9..a1ab814 100644
--- a/service-api/src/main/java/com/java110/api/filter/JwtFilter.java
+++ b/service-api/src/main/java/com/java110/api/filter/JwtFilter.java
@@ -79,6 +79,7 @@
 
         } catch (Exception e) {
             //response.sendRedirect("/flow/login");
+            logger.error("涓氬姟澶勭悊澶辫触", e);
             noLogin(request,response);
         }
     }
@@ -105,16 +106,18 @@
      */
     private String getToken(HttpServletRequest request) throws FilterException {
         String token = "";
-        for (Cookie cookie : request.getCookies()) {
-            if (CommonConstant.COOKIE_AUTH_TOKEN.equals(cookie.getName())) {
-                token = cookie.getValue();
+        if (request.getCookies() != null && request.getCookies().length > 0) {
+            for (Cookie cookie : request.getCookies()) {
+                if (CommonConstant.COOKIE_AUTH_TOKEN.equals(cookie.getName())) {
+                    token = cookie.getValue();
+                }
             }
         }
 
         String authorization = request.getHeader("Authorization");
 
         if(StringUtil.isEmpty(token) && !StringUtil.isEmpty(authorization)){
-            token = token.substring("Bearer ".length());
+            token = authorization.substring("Bearer ".length());
         }
 
         if (StringUtil.isNullOrNone(token)) {

--
Gitblit v1.8.0