lilonglong/magic-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
jmxd 2025-05-11 10:54:07 +08:00
commit 2958617f1c
3 changed files with 4 additions and 6 deletions
Show Stats 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);
}

2
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/Dialect.java
View File

@ -14,7 +14,7 @@ import java.util.regex.Pattern;
*/
public interface Dialect {
Pattern REPLACE_ORDER_BY = Pattern.compile("order\\s+by\\s+[^,\\s]+(\\s+asc|\\s+desc)?(\\s*,\\s*[^,\\s]+(\\s+asc|\\s+desc)?)*", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
Pattern REPLACE_ORDER_BY = Pattern.compile("\\s+order\\s+by\\s+[^,\\s]+(\\s+asc|\\s+desc)?(\\s*,\\s*[^,\\s]+(\\s+asc|\\s+desc)?)*\\s*$", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
/**
* 根据jdbcUrl匹配