diff --git a/das/src/main/java/com/das/common/interceptor/FilterConfig.java b/das/src/main/java/com/das/common/interceptor/FilterConfig.java index cc1d2099..b148e5c6 100644 --- a/das/src/main/java/com/das/common/interceptor/FilterConfig.java +++ b/das/src/main/java/com/das/common/interceptor/FilterConfig.java @@ -22,7 +22,7 @@ public class FilterConfig { FilterRegistrationBean registrationBean = new FilterRegistrationBean(); //注册过滤器 registrationBean.setFilter(new DecryptingOncePerRequestFilter(aesProperties.getKey())); - registrationBean.addUrlPatterns("/api/*"); // 设置过滤器应用的URL模式 + registrationBean.addUrlPatterns("/api/auth/role"); // 设置过滤器应用的URL模式 registrationBean.setOrder(2); // 设置过滤器的顺序 return registrationBean; } diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java index 6d5dbefb..cbe2ed49 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java @@ -6,7 +6,6 @@ import com.das.common.utils.PageQuery; import com.das.modules.auth.domain.dto.DeleteDto; import com.das.modules.auth.domain.dto.SysMenuDto; import com.das.modules.auth.domain.dto.SysMenuQueryDto; -import com.das.modules.auth.domain.vo.SysMenuVo; import com.das.modules.auth.entity.SysMenu; import com.das.modules.auth.service.SysMenuService; import lombok.extern.slf4j.Slf4j; @@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @author chenhaojie * @Description 菜单控制层 diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java index 1d74b2d1..4d06a270 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java @@ -60,6 +60,7 @@ public class SysMenuServiceImpl implements SysMenuService { public List queryAllMenuList(SysMenuQueryDto sysMenuQueryDto) { List list = new ArrayList<>(); if(sysMenuQueryDto.getRecursive()) { + sysMenuQueryDto.setParentMenuId(0L); list = sysMenuMapper.queryAllMenuList(sysMenuQueryDto); } else { list = sysMenuMapper.queryAllMenuListByParentId(sysMenuQueryDto); diff --git a/das/src/main/resources/mapper/SysMenuMapper.xml b/das/src/main/resources/mapper/SysMenuMapper.xml index 95f670cd..ecf33b24 100644 --- a/das/src/main/resources/mapper/SysMenuMapper.xml +++ b/das/src/main/resources/mapper/SysMenuMapper.xml @@ -50,7 +50,7 @@