From 623ca1b91a1ccb866f6b1d8d08abd329d69bc3d9 Mon Sep 17 00:00:00 2001
From: landaiqing <3517283258@qq.com>
Date: Sun, 2 Jun 2024 16:07:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/application/config/GlobalConfig.java |  2 +-
 .../interceptor/FeignConfiguration.java       | 14 +++++-----
 .../interceptor/FeignRequestInterceptor.java  | 26 +++++++++----------
 .../gateway/filter/LoginFilter.java           |  3 ++-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java
index c5f51b6..65e09c1 100644
--- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java
+++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java
@@ -41,6 +41,6 @@ public class GlobalConfig extends WebMvcConfigurationSupport {
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new LoginInterceptor())
-                .addPathPatterns("/**");
+                .addPathPatterns("/**").excludePathPatterns("/oauth/**","/system/getConfigByKey","/user/**");
     }
 }
diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java
index 0e584e4..4a7030c 100644
--- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java
+++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java
@@ -13,10 +13,10 @@ import org.springframework.context.annotation.Configuration;
  * @Description: TODO
  * @Version: 1.0
  */
-@Configuration
-public class FeignConfiguration {
-    @Bean
-    public RequestInterceptor requestInterceptor(){
-        return new FeignRequestInterceptor();
-    }
-}
+//@Configuration
+//public class FeignConfiguration {
+//    @Bean
+//    public RequestInterceptor requestInterceptor(){
+//        return new FeignRequestInterceptor();
+//    }
+//}
diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java
index e6e1370..2245147 100644
--- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java
+++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java
@@ -19,16 +19,16 @@ import java.util.Objects;
  * @Description: Feign请求拦截器
  * @Version: 1.0
  */
-@Component
-public class FeignRequestInterceptor implements RequestInterceptor {
-
-    @Override
-    public void apply(RequestTemplate requestTemplate) {
-        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        HttpServletRequest request = requestAttributes.getRequest();
-        String userId = request.getHeader("userId");
-        if (StringUtils.isNotBlank(userId)) {
-            requestTemplate.header("userId", userId);
-        }
-    }
-}
+//@Component
+//public class FeignRequestInterceptor implements RequestInterceptor {
+//
+//    @Override
+//    public void apply(RequestTemplate requestTemplate) {
+//        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+//        HttpServletRequest request = requestAttributes.getRequest();
+//        String userId = request.getHeader("userId");
+//        if (StringUtils.isNotBlank(userId)) {
+//            requestTemplate.header("userId", userId);
+//        }
+//    }
+//}
diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java
index b103e0e..5fa485a 100644
--- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java
+++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java
@@ -31,11 +31,12 @@ public class LoginFilter implements GlobalFilter {
         ServerHttpRequest.Builder mutate = request.mutate();
         String url = request.getURI().getPath();
         log.info("LoginFilter.filter.url:{}", url);
-        if (url.equals("/auth/render/") || url.equals("/auth/callback/") || url.equals("/auth/user/register") || url.equals("/auth/user/login") || url.equals("/system/getConfigByKey")) {
+        if (url.equals("/oauth/render/gitee") || url.equals("/oauth/callback/gitee") || url.equals("/auth/user/register") || url.equals("/auth/user/login") || url.equals("/system/getConfigByKey")) {
             return chain.filter(exchange);
         }
         SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
         String userId = (String) tokenInfo.getLoginId();
+        System.out.println("userId:" + userId);
         if (StringUtils.isEmpty(userId)) {
             throw new Exception("未获取到用户信息");
         }