diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 031d282..a587ea6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -2,6 +2,7 @@ package com.ruoyi.framework.config; import com.ruoyi.framework.config.properties.WhitelistProperties; import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; +import com.ruoyi.framework.security.filter.TraceIdFilter; import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -140,6 +141,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { // 添加JWT filter httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class); // 添加CORS filter + httpSecurity.addFilterBefore(corsFilter, TraceIdFilter.class); httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class); httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java index 2a2560c..58aad2d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java @@ -1,11 +1,14 @@ package com.ruoyi.framework.config; +import java.util.Map; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor; import org.apache.commons.lang3.concurrent.BasicThreadFactory; +import org.slf4j.MDC; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.task.TaskDecorator; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import com.ruoyi.common.utils.Threads; @@ -41,6 +44,23 @@ public class ThreadPoolConfig executor.setKeepAliveSeconds(keepAliveSeconds); // 线程池对拒绝任务(无线程可用)的处理策略 executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); + executor.setTaskDecorator(new TaskDecorator() { + /** + * 使异步线程池获得主线程的上下文 + */ + @Override + public Runnable decorate(Runnable runnable) { + Map map = MDC.getCopyOfContextMap(); + return () -> { + try { + MDC.setContextMap(map); + runnable.run(); + } finally { + MDC.clear(); + } + }; + } + }); return executor; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/TraceIdFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/TraceIdFilter.java new file mode 100644 index 0000000..b5ace9e --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/TraceIdFilter.java @@ -0,0 +1,53 @@ +package com.ruoyi.framework.security.filter; + +import com.ruoyi.common.utils.uuid.UUID; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.MDC; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +@Slf4j + +@Component +public class TraceIdFilter extends OncePerRequestFilter { + + private static final String TRACE_ID = "traceId"; + private static final String TRACE_ID_HEADER = "X-Trace-Id"; + + @Override + protected void doFilterInternal( + HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) + throws ServletException, IOException { + + String traceId = request.getHeader(TRACE_ID_HEADER); + if (traceId == null || traceId.isEmpty()) { + traceId = UUID.randomUUID() + .toString() + .replace("-", ""); + } + + long start = System.currentTimeMillis(); + + try { + MDC.put(TRACE_ID, traceId); + response.setHeader(TRACE_ID_HEADER, traceId); + filterChain.doFilter(request, response); + + } finally { + long cost = System.currentTimeMillis() - start; + log.info("HTTP {} {} status={} cost={}ms", + request.getMethod(), + request.getRequestURI(), + response.getStatus(), + cost); + MDC.remove(TRACE_ID); + } + } +} \ No newline at end of file