🏗️ 迁移 PasswordUtils 到 common-security,并精简一些 common 模块的依赖
This commit is contained in:
@@ -66,6 +66,10 @@
|
||||
<groupId>org.hibernate.validator</groupId>
|
||||
<artifactId>hibernate-validator</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-core</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
|
||||
@@ -45,6 +45,10 @@
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- slf4j日志 -->
|
||||
<dependency>
|
||||
|
||||
@@ -16,6 +16,11 @@
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-crypto</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-core</artifactId>
|
||||
@@ -24,14 +29,15 @@
|
||||
<groupId>org.springframework.security.oauth</groupId>
|
||||
<artifactId>spring-security-oauth2</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-autoconfigure</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-redis</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-autoconfigure</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.hccake.ballcat.common.util;
|
||||
package com.hccake.ballcat.common.security.util;
|
||||
|
||||
import cn.hutool.core.codec.Base64;
|
||||
import cn.hutool.crypto.Mode;
|
||||
@@ -45,21 +45,11 @@
|
||||
|
||||
|
||||
<!-- Hutool 工具 -->
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-crypto</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-extra</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- security -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-core</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.hccake.ballcat.common.util;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.hccake.ballcat.common.model.tree.TreeNode;
|
||||
import lombok.experimental.UtilityClass;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
@@ -130,7 +129,7 @@ public class TreeUtils {
|
||||
public <T extends TreeNode> void fillLeaf(T parent, List<T> leafs) {
|
||||
List<T> children = parent.getChildren();
|
||||
// 如果节点没有子节点则说明为叶子节点
|
||||
if (CollectionUtils.isEmpty(children)) {
|
||||
if (CollectionUtil.isEmpty(children)) {
|
||||
leafs.add(parent);
|
||||
return;
|
||||
}
|
||||
@@ -162,7 +161,7 @@ public class TreeUtils {
|
||||
*/
|
||||
public <T extends TreeNode<I>, I> void fillTreeNodeIds(List<I> ids, List<T> treeList) {
|
||||
// 如果节点没有子节点则说明为叶子节点
|
||||
if (CollectionUtils.isEmpty(treeList)) {
|
||||
if (CollectionUtil.isEmpty(treeList)) {
|
||||
return;
|
||||
}
|
||||
for (T treeNode : treeList) {
|
||||
|
||||
Reference in New Issue
Block a user