diff --git a/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java b/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java index 5becb7b..d57e47e 100644 --- a/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java +++ b/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java @@ -3,13 +3,11 @@ package top.suyiiyii.sims.common; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import top.suyiiyii.sims.service.RoleService; -import top.suyiiyii.sims.service.UserService; import top.suyiiyii.sims.utils.JwtUtils; /** @@ -20,32 +18,29 @@ import top.suyiiyii.sims.utils.JwtUtils; * @Description: TODO 拦截器配置 * @Version 1.0 */ - @Configuration - public class InterceptorConfig extends WebMvcConfigurationSupport { +@Configuration +public class InterceptorConfig extends WebMvcConfigurationSupport { @Autowired - private RoleService roleService; + private RoleService roleService; + @Autowired + private JwtInterceptor jwtInterceptor; - //UserService userService; - @Override - protected void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(jwtInterceptor()) - .addPathPatterns("/**") - .excludePathPatterns("/user/login") // 排除不需要验证的路径 - .excludePathPatterns("/user/register") - .excludePathPatterns("/v3/api-docs/**"); + @Override + protected void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(jwtInterceptor) + .addPathPatterns("/**") + .excludePathPatterns("/user/login") // 排除不需要验证的路径 + .excludePathPatterns("/user/register") + .excludePathPatterns("/v3/api-docs/**"); - // 注册AdminInterceptor,只拦截以admin/开头的路径 - registry.addInterceptor(new AdminInterceptor()) - .addPathPatterns("/admin/**"); - super.addInterceptors(registry); - } + // 注册AdminInterceptor,只拦截以admin/开头的路径 + registry.addInterceptor(new AdminInterceptor()) + .addPathPatterns("/admin/**"); + super.addInterceptors(registry); + } - @Bean - public JwtInterceptor jwtInterceptor() { - return new JwtInterceptor(); - } // AdminInterceptor的实现 public class AdminInterceptor implements HandlerInterceptor { @@ -78,5 +73,5 @@ import top.suyiiyii.sims.utils.JwtUtils; } } } - } +} diff --git a/src/main/java/top/suyiiyii/sims/common/JwtInterceptor.java b/src/main/java/top/suyiiyii/sims/common/JwtInterceptor.java index a946758..ed198c6 100644 --- a/src/main/java/top/suyiiyii/sims/common/JwtInterceptor.java +++ b/src/main/java/top/suyiiyii/sims/common/JwtInterceptor.java @@ -1,14 +1,15 @@ package top.suyiiyii.sims.common; import cn.hutool.core.util.StrUtil; -import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import top.suyiiyii.sims.entity.User; import top.suyiiyii.sims.exception.ServiceException; -import top.suyiiyii.sims.mapper.UserMapper; +import top.suyiiyii.sims.mapper.MpUserMapper; import top.suyiiyii.sims.utils.JwtUtils; /** @@ -20,10 +21,11 @@ import top.suyiiyii.sims.utils.JwtUtils; * @Version 1.0 */ +@Component public class JwtInterceptor implements HandlerInterceptor { - @Resource - UserMapper userMapper; + @Autowired + MpUserMapper userMapper; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { // 从 Authorization 头中获取 token