diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index 802554d..35d8ac3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -1,10 +1,8 @@ package com.ruoyi.framework.aspectj; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import com.ruoyi.common.utils.ServletUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; @@ -19,8 +17,6 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.security.context.PermissionContextHolder; -import javax.servlet.http.HttpServletRequest; - /** * 数据过滤处理 * @@ -60,25 +56,9 @@ public class DataScopeAspect */ public static final String DATA_SCOPE = "dataScope"; - /** - * 放行接口 - */ - private static final List IGNORE_URLS = Arrays.asList( - "/sso/pcms/code/login" - ); - @Before("@annotation(controllerDataScope)") public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable { - //处理放行接口 - HttpServletRequest request = ServletUtils.getRequest(); - if (request != null) { - String uri = request.getRequestURI(); - if (IGNORE_URLS.stream().anyMatch(uri::contains)) { - return; - } - } - clearDataScope(point); handleDataScope(point, controllerDataScope); }