🏗️ 移动 TreeNode 模型到 common-util 包中，以便减少 common-util 包的依赖

ballcat-common/ballcat-common-security/pom.xml

@@ -12,6 +12,10 @@
 	<artifactId>ballcat-common-security</artifactId>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.hccake</groupId>
+			<artifactId>ballcat-common-model</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.hccake</groupId>
 			<artifactId>ballcat-common-util</artifactId>
@@ -59,6 +63,12 @@
 			<artifactId>spring-data-redis</artifactId>
 			<optional>true</optional>
 		</dependency>
+
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 </project>

ballcat-common/ballcat-common-util/pom.xml

@@ -11,17 +11,7 @@
 
     <artifactId>ballcat-common-util</artifactId>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
     <dependencies>
-		<dependency>
-			<groupId>com.hccake</groupId>
-			<artifactId>ballcat-common-model</artifactId>
-		</dependency>
-
 		<!-- json 工具支持, 默认 jackson 按需替换-->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -43,28 +33,27 @@
             <optional>true</optional>
         </dependency>
 
-
 		<!-- Hutool 工具 -->
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-extra</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 	</dependencies>
 </project>

ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/SimpleTreeNode.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.model.tree;
+package com.hccake.ballcat.common.util.tree;
 
 import lombok.Data;
 

ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.model.tree;
+package com.hccake.ballcat.common.util.tree;
 
 import java.util.List;
 

ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java

@@ -1,7 +1,6 @@
-package com.hccake.ballcat.common.util;
+package com.hccake.ballcat.common.util.tree;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.hccake.ballcat.common.model.tree.TreeNode;
 import lombok.experimental.UtilityClass;
 
 import java.util.*;

ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysOrganizationServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.hccake.ballcat.common.core.constant.GlobalConstants;
 import com.hccake.ballcat.common.core.exception.BusinessException;
 import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.util.TreeUtils;
+import com.hccake.ballcat.common.util.tree.TreeUtils;
 import com.hccake.ballcat.system.converter.SysOrganizationConverter;
 import com.hccake.ballcat.system.mapper.SysOrganizationMapper;
 import com.hccake.ballcat.system.model.dto.OrganizationMoveChildParam;

ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java

@@ -1,6 +1,6 @@
 package com.hccake.ballcat.system.model.vo;
 
-import com.hccake.ballcat.common.model.tree.TreeNode;
+import com.hccake.ballcat.common.util.tree.TreeNode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;