bug fix

src/main/java/com/yunzhi/marketing/common/JWTUtils.java

@@ -24,14 +24,11 @@ public class JWTUtils {
      * @return
      */
     public static String getSubject(HttpServletRequest request) {
-        String jwtHeader = request.getHeader("authorization");
-        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
-
-        String[] jwtAuths = jwtHeader.split("Bearer ");
-        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        String token = getToken(request);
+        if (StringUtils.isEmpty(token)) return null;
 
         try {
-            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody().getSubject();
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody().getSubject();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -45,14 +42,11 @@ public class JWTUtils {
      * @return
      */
     public static Map getUserIdAndOrgId(HttpServletRequest request) {
-        String jwtHeader = request.getHeader("authorization");
-        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
-        
-        String[] jwtAuths = jwtHeader.split("Bearer ");
-        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        String token = getToken(request);
+        if (StringUtils.isEmpty(token)) return null;
         
         try {
-            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -70,13 +64,14 @@ public class JWTUtils {
         if (null == jwtHeader || "".equals(jwtHeader.trim())) {
             return null;
         }
-        
+
         String[] jwtAuths = jwtHeader.split("Bearer ");
         if (null == jwtAuths || jwtAuths.length < 2) {
             return null;
         }
-        
-        
+
+        if (StringUtils.isEmpty(jwtAuths[1])) return null;
+
         return jwtAuths[1];
     }
 

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -142,7 +142,7 @@ public class AccessInterceptor implements HandlerInterceptor {
         }
 
         String[] jwtAuths = jwtHeader.split("Bearer ");
-        if (null == jwtAuths || jwtAuths.length < 2) {
+        if (null == jwtAuths || jwtAuths.length < 2 || StringUtils.isEmpty(jwtAuths[1])) {
             ResponseBean resp = ResponseBean.error("权限验证非法, 数据格式不正确", ResponseBean.ERROR_AUTH_FAIL);
 
             response.addHeader("Content-type", "application/json");