fix: 修复合并冲突后的若干错误

1.完善 @Serial
2.完善 javax => jakarta
3.修复 canAccess() 使用错误
4.兼容 JustAuth Spring Boot Starter
5.CI 脚本更新 JDK 8 => 17
This commit is contained in:
2023-11-05 10:41:26 +08:00
parent 51e1cd9307
commit 8dbec9d1a3
63 changed files with 144 additions and 49 deletions

View File

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -65,7 +64,6 @@ public class QueryHelper {
if (null == query) {
return queryWrapper;
}
// 获取查询条件中所有的字段
List<Field> fieldList = ReflectUtils.getNonStaticFields(query.getClass());
fieldList.forEach(field -> buildQuery(query, field, queryWrapper));
@@ -87,7 +85,7 @@ public class QueryHelper {
* 查询数据类型
*/
private static <Q, R> void buildQuery(Q query, Field field, QueryWrapper<R> queryWrapper) {
boolean accessible = field.canAccess(null);
boolean accessible = field.canAccess(query);
try {
field.setAccessible(true);
// 没有 @Query直接返回