lywsvip/magic-api
1
0
Fork 0
mirror of https://gitee.com/ssssssss-team/magic-api.git synced 2026-06-05 13:29:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 回退 https://gitee.com/ssssssss-team/magic-api/pulls/71 中 处理 MagicWebRequestInterceptor 在 requireLogin 为 false时对接第三方系统无法传递用户上下文的问题 代码(影响自定义UI鉴权登录逻辑);资源进行按照名称进行排序

Browse Source
This commit is contained in:
陶刚
2025-05-06 13:28:53 +08:00
parent 956a0381f7
commit df201f3bce
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
magic-api/src/main/java/org/ssssssss/magicapi/core/interceptor/MagicWebRequestInterceptor.java
View File

@@ -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);

6
magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java
View File

@@ -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);
}