From dbfce1e5310b5e15a69725add2ed0998e657b0c9 Mon Sep 17 00:00:00 2001
From: diaobisong <bitdbsd11@163.com>
Date: Thu, 25 Jan 2024 18:45:34 +0800
Subject: [PATCH] fix code

---
 .../java3y/austin/web/config/JwtConfig.java    |  3 ---
 .../web/interceptor/TokenInterceptor.java      | 18 +++++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/austin-web/src/main/java/com/java3y/austin/web/config/JwtConfig.java b/austin-web/src/main/java/com/java3y/austin/web/config/JwtConfig.java
index bc61902..754cd46 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/config/JwtConfig.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/config/JwtConfig.java
@@ -1,11 +1,8 @@
 package com.java3y.austin.web.config;
 
 import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import java.util.Set;
-
 @Data
 @Component
 public class JwtConfig {
diff --git a/austin-web/src/main/java/com/java3y/austin/web/interceptor/TokenInterceptor.java b/austin-web/src/main/java/com/java3y/austin/web/interceptor/TokenInterceptor.java
index a9fca2e..40d4758 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/interceptor/TokenInterceptor.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/interceptor/TokenInterceptor.java
@@ -7,8 +7,6 @@ import com.java3y.austin.web.utils.JwtUtil;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -17,29 +15,27 @@ import javax.servlet.http.HttpServletResponse;
 
 
 @Slf4j
-@Component
 public class TokenInterceptor implements HandlerInterceptor {
 
-
-    @Autowired
-    private JwtConfig jwtConfig;
-
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
             return true;
         }
 
-        if(request.getRequestURI().startsWith("/actuator") || request.getRequestURI().startsWith("/swagger") || request.getRequestURI().startsWith("/v3/api-docs") || request.getRequestURI().startsWith("/user/login")) {
+        if (request.getRequestURI().startsWith("/actuator") || request.getRequestURI().startsWith("/swagger") || request.getRequestURI().startsWith("/v3/api-docs") || request.getRequestURI().startsWith("/user/login")) {
             return true;
         }
 
-        String jwtToken = request.getHeader("Authorization");
+        String jwtToken = StringUtils.defaultIfEmpty(request.getHeader("Authorization"), request.getHeader("authorization"));
         if (ObjectUtils.isEmpty(jwtToken)) {
             throw new RuntimeException("need token");
         }
+        if (jwtToken.startsWith("Bearer")) {
+            jwtToken = jwtToken.substring("Bearer".length() + 1);
+        }
 
-        Claims claims = JwtUtil.decodeAndVerify(jwtToken, jwtConfig.getKey());
+        Claims claims = JwtUtil.decodeAndVerify(jwtToken, new JwtConfig().getKey());
         String subject = claims.getSubject();
         String creator = StringUtils.defaultIfEmpty(JSON.parseObject(subject).getString("creator"), JSON.parseObject(subject).getString("userId"));