From ded40ebbd1613490fc68190dbd92db5d7243267f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 22 八月 2023 16:25:20 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/filter/JwtFilter.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 91e8d8c..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,12 +106,20 @@
      */
     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 = authorization.substring("Bearer ".length());
+        }
+
         if (StringUtil.isNullOrNone(token)) {
             throw new FilterException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "鎮ㄨ繕娌℃湁鐧诲綍锛岃鍏堢櫥褰�");
         }

--
Gitblit v1.8.0