From ccbcb9487250f063dc7c4e72cfa18228dca8dac8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 六月 2025 12:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
index 45a5047..179623f 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
@@ -1,5 +1,7 @@
 package com.doumee.config.cloudfilter;
 
+import com.doumee.config.jwt.JwtProperties;
+import com.doumee.config.jwt.JwtTokenUtil;
 import com.doumee.core.utils.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -9,25 +11,29 @@
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import javax.annotation.Resource;
 import javax.servlet.Filter;
 
 @Configuration
 public class CloudWebConfig implements WebMvcConfigurer {
     @Autowired
     private RedisTemplate<String,Object> stringRedisTemplate;
+    @Resource
+    private JwtProperties jwtProperties;
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new LoginHandlerInterceptor(stringRedisTemplate))
+        registry.addInterceptor(new LoginHandlerInterceptor(stringRedisTemplate,
+                        jwtProperties==null || jwtProperties.getExpiration()==null?1800000l:jwtProperties.getExpiration()))
                 .addPathPatterns(Constants.CLOUD_SERVICE_URL_INDEX+"/**");
     }
 
 //    @Bean
-    public FilterRegistrationBean addRequestWrapperFilter() {
-        FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<>();
-        registration.setFilter(new RequestWrapperFilter());
-        registration.setName("RequestWrapperFilter");
-        registration.addUrlPatterns(Constants.CLOUD_SERVICE_URL_INDEX+"/*");
-        registration.setOrder(1);
-        return registration;
-    }
+//    public FilterRegistrationBean addRequestWrapperFilter() {
+//        FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<>();
+//        registration.setFilter(new RequestWrapperFilter());
+//        registration.setName("RequestWrapperFilter");
+//        registration.addUrlPatterns(Constants.CLOUD_SERVICE_URL_INDEX+"/**");
+//        registration.setOrder(1);
+//        return registration;
+//    }
 }
\ No newline at end of file

--
Gitblit v1.9.3