⚡ 优化权限逻辑.

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/meta/TraceIdHolder.java

@@ -1,6 +1,8 @@
 package com.orion.visor.framework.common.meta;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
+import com.orion.lang.id.UUIds;
+import org.slf4j.MDC;
 
 /**
  * traceId 持有者
@@ -23,16 +25,74 @@ public class TraceIdHolder {
      */
     private static final ThreadLocal<String> HOLDER = new TransmittableThreadLocal<>();
 
+    /**
+     * 获取 traceId
+     *
+     * @return traceId
+     */
     public static String get() {
         return HOLDER.get();
     }
 
-    public static void set(String traceId) {
-        HOLDER.set(traceId);
+    /**
+     * 设置 traceId
+     */
+    public static void set() {
+        set(createTraceId());
     }
 
+    /**
+     * 设置 traceId
+     *
+     * @param traceId traceId
+     */
+    public static void set(String traceId) {
+        // 设置应用上下文
+        HOLDER.set(traceId);
+        // 设置日志上下文
+        setMdc(traceId);
+    }
+
+    /**
+     * 删除 traceId
+     */
     public static void remove() {
+        // 移除应用上下文
         HOLDER.remove();
+        // 移除日志上下文
+        removeMdc();
+    }
+
+    /**
+     * 从应用上下文 设置到日志上下文
+     */
+    public static void setMdc() {
+        setMdc(HOLDER.get());
+    }
+
+    /**
+     * 设置到日志上下文
+     *
+     * @param traceId traceId
+     */
+    public static void setMdc(String traceId) {
+        MDC.put(TRACE_ID_MDC, traceId);
+    }
+
+    /**
+     * 移除日志上下文
+     */
+    public static void removeMdc() {
+        MDC.remove(TRACE_ID_MDC);
+    }
+
+    /**
+     * 创建 traceId
+     *
+     * @return traceId
+     */
+    public static String createTraceId() {
+        return UUIds.random32();
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/utils/SecurityUtils.java

@@ -98,6 +98,13 @@ public class SecurityUtils {
         return loginUser != null ? loginUser.getTimestamp() : null;
     }
 
+    /**
+     * 清空用户上下文
+     */
+    public static void clearAuthentication() {
+        SecurityContextHolder.getContext().setAuthentication(null);
+    }
+
     /**
      * 设置当前用户
      *
@@ -107,7 +114,9 @@ public class SecurityUtils {
     public static void setLoginUser(LoginUser loginUser, HttpServletRequest request) {
         // 创建 authentication
         UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(loginUser, null, Collections.emptyList());
-        authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+        if (request != null) {
+            authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+        }
         // 设置上下文
         SecurityContextHolder.getContext().setAuthentication(authentication);
     }

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/filter/TraceIdFilter.java

@@ -1,8 +1,6 @@
 package com.orion.visor.framework.web.core.filter;
 
-import com.orion.lang.id.UUIds;
 import com.orion.visor.framework.common.meta.TraceIdHolder;
-import org.slf4j.MDC;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
@@ -23,21 +21,17 @@ public class TraceIdFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
         try {
-            // 获 traceId
-            String traceId = UUIds.random32();
-            // 设置应用上下文
+            // 获取 traceId
+            String traceId = TraceIdHolder.createTraceId();
+            // 设置 traceId 上下文
             TraceIdHolder.set(traceId);
-            // 设置日志上下文
-            MDC.put(TraceIdHolder.TRACE_ID_MDC, traceId);
             // 设置响应头
             response.setHeader(TraceIdHolder.TRACE_ID_HEADER, traceId);
             // 执行请求
             filterChain.doFilter(request, response);
         } finally {
-            // 清理应用上下文
+            // 清空 traceId 上下文
             TraceIdHolder.remove();
-            // 清理日志上下文
-            MDC.clear();
         }
     }