bug fixed

wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/filter/AuthFilter.java

@@ -21,6 +21,7 @@ import java.io.IOException;
 
 /**
  * oauth2过滤器
+ *
  * @author 86187
  */
 @Slf4j
@@ -68,21 +69,25 @@ public class AuthFilter extends AuthenticatingFilter {
      */
     @Override
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
-        //获取请求token，如果token不存在，直接返回40101
-        String token = getRequestToken((HttpServletRequest) request);
-        if (StringUtils.isBlank(token)) {
-            HttpServletResponse httpResponse = (HttpServletResponse) response;
-            httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
-            httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
-            httpResponse.setCharacterEncoding("UTF-8");
+        if (isLoginRequest(request, response) || isEnabled(request, response)) {
+            return true;
+        } else {
+            //获取请求token，如果token不存在，直接返回40101
+            String token = getRequestToken((HttpServletRequest) request);
+            if (StringUtils.isBlank(token)) {
+                HttpServletResponse httpResponse = (HttpServletResponse) response;
+                httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
+                httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
+                httpResponse.setCharacterEncoding("UTF-8");
 
-            Result result = new Result();
-            result.setResult(Result.RESULT_FLG.FAIL.getValue());
-            result.setErrorCode(RespCodeEnum.NO_AUTH_REQUEST.getCode());
-            result.setErrorMsg(RespCodeEnum.NO_AUTH_REQUEST.getMsg());
-            String json = JSON.toJSONString(result);
-            httpResponse.getWriter().print(json);
-            return false;
+                Result result = new Result();
+                result.setResult(Result.RESULT_FLG.FAIL.getValue());
+                result.setErrorCode(RespCodeEnum.NO_AUTH_REQUEST.getCode());
+                result.setErrorMsg(RespCodeEnum.NO_AUTH_REQUEST.getMsg());
+                String json = JSON.toJSONString(result);
+                httpResponse.getWriter().print(json);
+                return false;
+            }
         }
 
         return executeLogin(request, response);