oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加管理员拥有的菜单列表

Browse Source
This commit is contained in:
YunaiV
2020-07-08 20:21:55 +08:00
parent e4d3254869
commit 6bddebafff
28 changed files with 288 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/common-framework/src/main/java/cn/iocoder/common/framework/util/CollectionUtil.java → common/common-framework/src/main/java/cn/iocoder/common/framework/util/CollectionUtils.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.common.framework.util;
import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
public class CollectionUtil {
public class CollectionUtils {
public static boolean isEmpty(Collection collection) {
return collection == null || collection.isEmpty();
@@ -43,12 +41,11 @@ public class CollectionUtil {
// 暂时没想好名字，先以 2 结尾噶
public static <T, K, V> Map<K, Set<V>> convertMultiMap2(List<T> from, Function<T, K> keyFunc, Function<T, V> valueFunc) {
return from.stream().collect(Collectors.groupingBy(keyFunc,
Collectors.mapping(valueFunc, Collectors.toSet())));
return from.stream().collect(Collectors.groupingBy(keyFunc, Collectors.mapping(valueFunc, Collectors.toSet())));
}
public static boolean containsAny(Collection<?> source, Collection<?> candidates) {
return CollectionUtils.containsAny(source, candidates);
return org.springframework.util.CollectionUtils.containsAny(source, candidates);
}
}

4
common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminSecurityInterceptor.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.mall.security.admin.core.interceptor;
import cn.iocoder.common.framework.enums.UserTypeEnum;
import cn.iocoder.common.framework.util.CollectionUtil;
import cn.iocoder.common.framework.util.CollectionUtils;
import cn.iocoder.common.framework.util.HttpUtil;
import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.CommonResult;
@@ -73,7 +73,7 @@ public class AdminSecurityInterceptor extends HandlerInterceptorAdapter {
return;
}
String[] permissions = requiresPermissions.value();
if (CollectionUtil.isEmpty(permissions)) {
if (CollectionUtils.isEmpty(permissions)) {
return;
}
// 权限验证 TODO 待完成