From df201f3bceebf1ec8fd249d8813298ba78983e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E5=88=9A?= <1102014862@qq.com>
Date: Tue, 6 May 2025 13:28:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=9E=E9=80=80=20https://gitee.com/?=
 =?UTF-8?q?ssssssss-team/magic-api/pulls/71=20=E4=B8=AD=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20MagicWebRequestInterceptor=20=E5=9C=A8=20requireLog?=
 =?UTF-8?q?in=20=E4=B8=BA=20false=E6=97=B6=E5=AF=B9=E6=8E=A5=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F=E6=97=A0=E6=B3=95=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=E7=94=A8=E6=88=B7=E4=B8=8A=E4=B8=8B=E6=96=87=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BB=A3=E7=A0=81(=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89UI=E9=89=B4=E6=9D=83=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91);=E8=B5=84=E6=BA=90=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=8C=89=E7=85=A7=E5=90=8D=E7=A7=B0=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/interceptor/MagicWebRequestInterceptor.java        | 2 +-
 .../ssssssss/magicapi/core/web/MagicResourceController.java | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

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
index 5b33e5ac..49c669b2 100644
--- 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
@@ -33,7 +33,7 @@ public abstract class MagicWebRequestInterceptor {
 				Valid valid = handlerMethod.getMethodAnnotation(Valid.class);
 				boolean requiredLogin = authorizationInterceptor.requireLogin();
 				boolean validRequiredLogin = (valid == null || valid.requireLogin());
-				if ((validRequiredLogin && requiredLogin) || !(authorizationInterceptor instanceof DefaultAuthorizationInterceptor)) {
+				if (validRequiredLogin && requiredLogin) {
 					request.setAttribute(Constants.ATTRIBUTE_MAGIC_USER, authorizationInterceptor.getUserByToken(request.getHeader(Constants.MAGIC_TOKEN_HEADER)));
 				}
 				((MagicController) handler).doValid(request, valid);
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java
index 6542d2ad..cd23255e 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java
@@ -14,10 +14,7 @@ import org.ssssssss.magicapi.core.servlet.MagicHttpServletRequest;
 import org.ssssssss.magicapi.utils.IoUtils;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 
 public class MagicResourceController extends MagicController implements MagicExceptionHandler {
@@ -180,6 +177,7 @@ public class MagicResourceController extends MagicController implements MagicExc
 					.stream()
 					.filter(it -> allowVisit(request, Authorization.VIEW, it))
 					.map(MagicEntity::simple)
+					.sorted(Comparator.comparing(MagicEntity::getName))
 					.map((Function<MagicEntity, TreeNode>) TreeNode::new)
 					.forEach(value::addChild);
 		}