升级3.0

das/src/main/java/com/das/common/interceptor/TokenInterceptor.java

@@ -1,14 +1,11 @@
 package com.das.common.interceptor;
 
 import com.das.common.utils.AESUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 public class TokenInterceptor implements HandlerInterceptor {
 
     @Resource
@@ -20,9 +17,18 @@ public class TokenInterceptor implements HandlerInterceptor {
         TokenInterceptor.key = key;
     }
 
+
+
+    // 示例Token验证方法，需要根据实际情况实现
+    private boolean validateToken(String token) {
+        // 实现Token验证逻辑
+        // ...
+        return true; // 假设Token总是有效的，实际应进行真实验证
+    }
+
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-
         String param = request.getParameter("param");
         // 从请求头中获取Token
 //        String token = request.getHeader("token");
@@ -45,11 +51,4 @@ public class TokenInterceptor implements HandlerInterceptor {
 //            return false; // 阻止请求继续
 //        }
     }
-
-    // 示例Token验证方法，需要根据实际情况实现
-    private boolean validateToken(String token) {
-        // 实现Token验证逻辑
-        // ...
-        return true; // 假设Token总是有效的，实际应进行真实验证
-    }
 }

das/src/main/java/com/das/common/log/RequestLogInterceptor.java

@@ -1,5 +1,7 @@
 package com.das.common.log;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.util.StringUtils;
@@ -8,8 +10,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.UUID;
 
 /**
@@ -19,22 +19,11 @@ import java.util.UUID;
 @Slf4j
 public class RequestLogInterceptor implements HandlerInterceptor {
 
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String servletPath = request.getServletPath();
-        // 生成RequestId
-        String requestId = this.getRequestId();
-        // 配置日志文件打印 REQUEST_ID
-        MDC.put("REQUEST_ID", requestId);
 
-        log.info("servletPath:{}", servletPath);
-        log.info("preHandle 前置处理----------");
-        return true;
-    }
 
     @Override
     public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-        log.info("preHandle 处理中----------");
+
     }
 
     @Override
@@ -69,4 +58,17 @@ public class RequestLogInterceptor implements HandlerInterceptor {
         RequestIdUtils.generateRequestId();
         return RequestIdUtils.getRequestId().toString();
     }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String servletPath = request.getServletPath();
+        // 生成RequestId
+        String requestId = this.getRequestId();
+        // 配置日志文件打印 REQUEST_ID
+        MDC.put("REQUEST_ID", requestId);
+
+        log.info("servletPath:{}", servletPath);
+        log.info("preHandle 前置处理----------");
+        return true;
+    }
 }