From 4b4c67783b61d1cf2149a8303c58844c943a071f Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:00:49 +0800 Subject: [PATCH] =?UTF-8?q?:building=5Fconstruction:=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=20TreeNode=20=E6=A8=A1=E5=9E=8B=E5=88=B0=20common-util=20?= =?UTF-8?q?=E5=8C=85=E4=B8=AD=EF=BC=8C=E4=BB=A5=E4=BE=BF=E5=87=8F=E5=B0=91?= =?UTF-8?q?=20common-util=20=E5=8C=85=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ballcat-common-security/pom.xml | 10 ++++++++ ballcat-common/ballcat-common-util/pom.xml | 23 +++++-------------- .../common/util}/tree/SimpleTreeNode.java | 2 +- .../ballcat/common/util}/tree/TreeNode.java | 2 +- .../common/util/{ => tree}/TreeUtils.java | 3 +-- .../impl/SysOrganizationServiceImpl.java | 2 +- .../system/model/vo/SysOrganizationTree.java | 2 +- 7 files changed, 21 insertions(+), 23 deletions(-) rename ballcat-common/{ballcat-common-model/src/main/java/com/hccake/ballcat/common/model => ballcat-common-util/src/main/java/com/hccake/ballcat/common/util}/tree/SimpleTreeNode.java (88%) rename ballcat-common/{ballcat-common-model/src/main/java/com/hccake/ballcat/common/model => ballcat-common-util/src/main/java/com/hccake/ballcat/common/util}/tree/TreeNode.java (91%) rename ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/{ => tree}/TreeUtils.java (98%) diff --git a/ballcat-common/ballcat-common-security/pom.xml b/ballcat-common/ballcat-common-security/pom.xml index e8b66625..46be8d42 100644 --- a/ballcat-common/ballcat-common-security/pom.xml +++ b/ballcat-common/ballcat-common-security/pom.xml @@ -12,6 +12,10 @@ ballcat-common-security + + com.hccake + ballcat-common-model + com.hccake ballcat-common-util @@ -59,6 +63,12 @@ spring-data-redis true + + + jakarta.servlet + jakarta.servlet-api + provided + \ No newline at end of file diff --git a/ballcat-common/ballcat-common-util/pom.xml b/ballcat-common/ballcat-common-util/pom.xml index 513a4421..77c1a80d 100644 --- a/ballcat-common/ballcat-common-util/pom.xml +++ b/ballcat-common/ballcat-common-util/pom.xml @@ -11,17 +11,7 @@ ballcat-common-util - - 8 - 8 - - - - com.hccake - ballcat-common-model - - com.fasterxml.jackson.core @@ -43,28 +33,27 @@ true - cn.hutool hutool-extra - - javax.servlet - javax.servlet-api - - org.jsoup jsoup + + javax.servlet + javax.servlet-api + true + + org.springframework spring-context true - \ No newline at end of file diff --git a/ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/tree/SimpleTreeNode.java b/ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/SimpleTreeNode.java similarity index 88% rename from ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/tree/SimpleTreeNode.java rename to ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/SimpleTreeNode.java index 16481845..556fd121 100644 --- a/ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/tree/SimpleTreeNode.java +++ b/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; diff --git a/ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/tree/TreeNode.java b/ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java similarity index 91% rename from ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/tree/TreeNode.java rename to ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java index 54a4de6d..22c0675b 100644 --- a/ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/tree/TreeNode.java +++ b/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; diff --git a/ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/TreeUtils.java b/ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java similarity index 98% rename from ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/TreeUtils.java rename to ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java index aa40a5be..5d39813d 100644 --- a/ballcat-common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/TreeUtils.java +++ b/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.*; diff --git a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysOrganizationServiceImpl.java b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysOrganizationServiceImpl.java index ece53d4a..0f15e06f 100644 --- a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysOrganizationServiceImpl.java +++ b/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; diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java index 8020ff3f..d9c07ed1 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java +++ b/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;