解决DefaultAuthorizationInterceptor下关闭授权报错的问题

erupts · javamxd · commit 46ddfef8a7c5 · 2025-04-30T06:47:31.000Z
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/interceptor/MagicWebRequestInterceptor.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/interceptor/MagicWebRequestInterceptor.java
@@ -34,8 +34,7 @@ public void handle(Object handler, MagicHttpServletRequest request, MagicHttpSer
 				boolean requiredLogin = authorizationInterceptor.requireLogin();
 				boolean validRequiredLogin = (valid == null || valid.requireLogin());
 				if ((validRequiredLogin && requiredLogin) || !(authorizationInterceptor instanceof DefaultAuthorizationInterceptor)) {
-					request.setAttribute(Constants.ATTRIBUTE_MAGIC_USER,
-							authorizationInterceptor.getUserByToken(request.getHeader(Constants.MAGIC_TOKEN_HEADER)));
+					request.setAttribute(Constants.ATTRIBUTE_MAGIC_USER, authorizationInterceptor.getUserByToken(request.getHeader(Constants.MAGIC_TOKEN_HEADER)));
 				}
 				((MagicController) handler).doValid(request, valid);
 			}

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ public void handle(Object handler, MagicHttpServletRequest request, MagicHttpSer`
`34`	`34`	`boolean requiredLogin = authorizationInterceptor.requireLogin();`
`35`	`35`	`boolean validRequiredLogin = (valid == null \|\| valid.requireLogin());`
`36`	`36`	`if ((validRequiredLogin && requiredLogin) \|\| !(authorizationInterceptor instanceof DefaultAuthorizationInterceptor)) {`
`37`		`- request.setAttribute(Constants.ATTRIBUTE_MAGIC_USER,`
`38`		`- authorizationInterceptor.getUserByToken(request.getHeader(Constants.MAGIC_TOKEN_HEADER)));`
	`37`	`+ request.setAttribute(Constants.ATTRIBUTE_MAGIC_USER, authorizationInterceptor.getUserByToken(request.getHeader(Constants.MAGIC_TOKEN_HEADER)));`
`39`	`38`	`}`
`40`	`39`	`((MagicController) handler).doValid(request, valid);`
`41`	`40`	`}`