diff --git a/orion-visor-framework/orion-visor-framework-common/pom.xml b/orion-visor-common/pom.xml similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/pom.xml rename to orion-visor-common/pom.xml index c377e6fb..0a5bea45 100644 --- a/orion-visor-framework/orion-visor-framework-common/pom.xml +++ b/orion-visor-common/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara.visor - orion-visor-framework + orion-visor ${revision} 4.0.0 - orion-visor-framework-common + orion-visor-common ${project.artifactId} jar diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java index b2feccfa..e5ae290b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; import cn.orionsec.kit.lang.constant.OrionConst; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AutoConfigureOrderConst.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/AutoConfigureOrderConst.java index 6c235e3e..92922b2b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AutoConfigureOrderConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 自动装配排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/BeanOrderConst.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/BeanOrderConst.java index eab285f8..a84c8b3b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/BeanOrderConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * bean 排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CnConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/CnConst.java index d794a91f..2d88c772 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CnConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 常量 - 中文 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java index 87219af0..74b25a24 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorCode.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorCode.java index 32701d56..7af51c47 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorCode.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; import cn.orionsec.kit.lang.define.wrapper.CodeInfo; import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java index 2e5735c5..bc1f7ff3 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; import cn.orionsec.kit.lang.exception.ApplicationException; import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ExtraFieldConst.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ExtraFieldConst.java index 8a1580a8..fcbf2ce6 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ExtraFieldConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 额外字段常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FieldConst.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/FieldConst.java index 9785cdf3..ae879dcf 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FieldConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 字段常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java index 5c5bc155..df4b1d5f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 文件常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FilterOrderConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/FilterOrderConst.java index d81107c3..73c1f3b7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FilterOrderConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 过滤器排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ValidConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ValidConst.java index 7c7e48ac..5d46a402 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ValidConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 验证常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java b/orion-visor-common/src/main/java/org/dromara/visor/common/crypto/ValueCrypto.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/crypto/ValueCrypto.java index b56e20fa..d3667c87 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/crypto/ValueCrypto.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.crypto; +package org.dromara.visor.common.crypto; import cn.orionsec.kit.lang.utils.codec.Base62s; import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/AutoClearConfig.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/AutoClearConfig.java index bcce76dc..79075e12 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/AutoClearConfig.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/DataClearRequest.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/DataClearRequest.java index 47031a8e..00e7089c 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/DataClearRequest.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; /** * 数据清理请求 定义 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java index 77793001..409cb4dc 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentity.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentity.java index eced4b20..7f314d8d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentity.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import java.io.Serializable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentityModel.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentityModel.java index b5a8e7ea..f2989619 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentityModel.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/StatisticsRange.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/StatisticsRange.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/StatisticsRange.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/StatisticsRange.java index ae60b873..a3f3af72 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/StatisticsRange.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/StatisticsRange.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.time.DateStream; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/TreeNode.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/TreeNode.java index a1342c8d..1643bc29 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/TreeNode.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/BarSingleChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/BarSingleChartData.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/BarSingleChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/BarSingleChartData.java index 3a2fc865..c06de2a2 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/BarSingleChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/BarSingleChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineChartData.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineChartData.java index ededf971..3af23887 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineSingleChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineSingleChartData.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineSingleChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineSingleChartData.java index 47a00d47..f44fe5ff 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineSingleChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineSingleChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/PieChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/PieChartData.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/PieChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/PieChartData.java index 615cfea6..b95500b9 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/PieChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/PieChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/BooleanBit.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/BooleanBit.java index b9a07ec2..3d841622 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/BooleanBit.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EnableStatus.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/EnableStatus.java index 77c8a1bb..2db0e372 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EnableStatus.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EndpointDefine.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/EndpointDefine.java index 02528c28..6fbd42f7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EndpointDefine.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import cn.orionsec.kit.lang.utils.Strings; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/MovePosition.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/MovePosition.java index 74303484..dbace534 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/MovePosition.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java b/orion-visor-common/src/main/java/org/dromara/visor/common/file/FileClient.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/file/FileClient.java index dd2d0350..572c60de 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/file/FileClient.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.file; +package org.dromara.visor.common.file; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsStrategyDefinition.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/GenericsStrategyDefinition.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsStrategyDefinition.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/GenericsStrategyDefinition.java index 0a628c9d..16eb0cee 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsStrategyDefinition.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/GenericsStrategyDefinition.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data; +package org.dromara.visor.common.handler.data; import cn.orionsec.kit.spring.SpringHolder; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy; /** * 标准数据定义 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java index a46c561b..29facd9d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data.model; +package org.dromara.visor.common.handler.data.model; import com.alibaba.fastjson.JSON; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java index 25d32968..29a46fc5 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data.strategy; +package org.dromara.visor.common.handler.data.strategy; import com.alibaba.fastjson.JSON; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * 标准数据处理策略 基类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/GenericsDataStrategy.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/GenericsDataStrategy.java index 74043f37..c0cd853a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/GenericsDataStrategy.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data.strategy; +package org.dromara.visor.common.handler.data.strategy; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * 标准数据处理策略 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java b/orion-visor-common/src/main/java/org/dromara/visor/common/json/filter/FieldDesensitizeFilter.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/json/filter/FieldDesensitizeFilter.java index 42557916..ba7b1362 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/json/filter/FieldDesensitizeFilter.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.json.filter; +package org.dromara.visor.common.json.filter; import cn.orionsec.kit.lang.utils.Desensitizes; import cn.orionsec.kit.lang.utils.Objects1; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java b/orion-visor-common/src/main/java/org/dromara/visor/common/json/filter/FieldIgnoreFilter.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/json/filter/FieldIgnoreFilter.java index 6ec0af7d..74ff9796 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/json/filter/FieldIgnoreFilter.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.json.filter; +package org.dromara.visor.common.json.filter; import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.serializer.PropertyFilter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java b/orion-visor-common/src/main/java/org/dromara/visor/common/lock/Locker.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/lock/Locker.java index 4f561970..a3340a82 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/lock/Locker.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.lock; +package org.dromara.visor.common.lock; import java.util.function.Supplier; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java b/orion-visor-common/src/main/java/org/dromara/visor/common/meta/TraceIdHolder.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/meta/TraceIdHolder.java index d36f4633..c955ddba 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/meta/TraceIdHolder.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.meta; +package org.dromara.visor.common.meta; import cn.orionsec.kit.lang.id.UUIds; import com.alibaba.ttl.TransmittableThreadLocal; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/LoginUser.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/LoginUser.java index 4ee621d7..4818f7fa 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/LoginUser.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/PasswordModifier.java similarity index 90% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/PasswordModifier.java index 7d0e7281..2f17d835 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/PasswordModifier.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; import cn.orionsec.kit.lang.utils.Booleans; import cn.orionsec.kit.lang.utils.Strings; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.CryptoUtils; /** * 密码修改器 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/SecurityHolder.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/SecurityHolder.java index 7157266f..d23c27d1 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/SecurityHolder.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; /** * SecurityUtils 的 bean 对象 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java index 06eebb16..5f1d3cfc 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; import java.io.Serializable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UserRole.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/UserRole.java index 304662f4..5de1c380 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UserRole.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java b/orion-visor-common/src/main/java/org/dromara/visor/common/thread/ThreadPoolMdcTaskExecutor.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/thread/ThreadPoolMdcTaskExecutor.java index cb85fa53..9a393b94 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/thread/ThreadPoolMdcTaskExecutor.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.thread; +package org.dromara.visor.common.thread; -import org.dromara.visor.framework.common.utils.ThreadMdcUtils; +import org.dromara.visor.common.utils.ThreadMdcUtils; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.Callable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ConfigUtils.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/ConfigUtils.java index a6c15d98..42d4931e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ConfigUtils.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.constant.Const; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/CryptoUtils.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/CryptoUtils.java index c7744208..0cb89e83 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/CryptoUtils.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.crypto.ValueCrypto; +import org.dromara.visor.common.crypto.ValueCrypto; /** * 加密工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/FileNames.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/FileNames.java index eb4ace1f..0241420f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/FileNames.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.time.Dates; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; /** * 文件名称 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/IpUtils.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/IpUtils.java index c532a5a6..7781ae42 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/IpUtils.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.ext.location.Region; import cn.orionsec.kit.ext.location.region.LocationRegions; import cn.orionsec.kit.web.servlet.web.Servlets; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/LockerUtils.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/LockerUtils.java index 73e3d985..b6dcd90b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/LockerUtils.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.lock.Locker; +import org.dromara.visor.common.lock.Locker; import java.util.function.Supplier; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/PathUtils.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/PathUtils.java index 0b69296d..3befea39 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/PathUtils.java @@ -20,13 +20,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.Systems; import cn.orionsec.kit.lang.utils.io.Files1; -import org.dromara.visor.framework.common.constant.AppConst; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.AppConst; +import org.dromara.visor.common.constant.Const; /** * 路径工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Requests.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/Requests.java index 99b3643a..a41f7f36 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Requests.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.web.servlet.web.Servlets; -import org.dromara.visor.framework.common.entity.RequestIdentity; -import org.dromara.visor.framework.common.entity.RequestIdentityModel; +import org.dromara.visor.common.entity.RequestIdentity; +import org.dromara.visor.common.entity.RequestIdentityModel; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SqlUtils.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/SqlUtils.java index 0aa29296..0af399c1 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SqlUtils.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; /** * sql 工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SwaggerUtils.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/SwaggerUtils.java index aa589a07..d33e4428 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SwaggerUtils.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.reflect.Annotations; import io.swagger.v3.oas.annotations.Operation; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.lang.reflect.Method; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ThreadMdcUtils.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/ThreadMdcUtils.java index c77540db..eff9a89c 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ThreadMdcUtils.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; -import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.common.meta.TraceIdHolder; import org.slf4j.MDC; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/TreeUtils.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/TreeUtils.java index 967b1d08..a274d72b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/TreeUtils.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.collect.Lists; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.entity.TreeNode; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.entity.TreeNode; import java.util.Comparator; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java index feaa085e..35fecb7a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.Arrays1; import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.kit.spring.SpringHolder; -import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ErrorMessage; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Batch.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Batch.java index f2b7c64f..af869ac7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Batch.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 批量验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Clear.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Clear.java index e7470732..f6266077 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Clear.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 清理验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Export.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Export.java index 38ba7cf8..7ca74a1d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Export.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 导出验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Id.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Id.java index 0eb04f50..5fccd109 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Id.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 分页验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Import.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Import.java index 25b42e36..307f0a5e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Import.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 导出验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Page.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Page.java index 83a7b142..ac01fd6d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Page.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 分页验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java b/orion-visor-common/src/main/java/org/dromara/visor/common/web/filter/FilterCreator.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/web/filter/FilterCreator.java index b331885d..7d3bc1d7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/web/filter/FilterCreator.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.web.filter; +package org.dromara.visor.common.web.filter; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 2ac6deef..21c625b6 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -62,7 +62,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common ${revision} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml index 9fc7bce2..bca53d1f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java index fef1099e..4c831056 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.banner.configuration; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.banner.core.runner.BannerApplicationRunner; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.context.annotation.Bean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml index e738642b..174f571b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java index 8964b735..381fe971 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java @@ -24,15 +24,15 @@ package org.dromara.visor.framework.biz.operator.log.configuration; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.json.filter.FieldDesensitizeFilter; +import org.dromara.visor.common.json.filter.FieldIgnoreFilter; import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; import org.dromara.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect; import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.json.filter.FieldDesensitizeFilter; -import org.dromara.visor.framework.common.json.filter.FieldIgnoreFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java index a69f6bba..75a9542e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.biz.operator.log.configuration.config; import lombok.Data; -import org.dromara.visor.framework.common.utils.ConfigUtils; +import org.dromara.visor.common.utils.ConfigUtils; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java index 9039d48f..283e55dd 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java @@ -30,6 +30,9 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; +import org.dromara.visor.common.constant.BeanOrderConst; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.biz.operator.log.core.annotation.IgnoreParameter; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; @@ -38,9 +41,6 @@ import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.BeanOrderConst; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.SecurityHolder; import org.springframework.core.annotation.Order; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java index e2b067cd..a55430c5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.biz.operator.log.core.model; import lombok.Data; -import org.dromara.visor.framework.common.entity.RequestIdentity; +import org.dromara.visor.common.entity.RequestIdentity; import java.util.Date; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java index 5dc0d345..5679c2db 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java @@ -29,16 +29,16 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializeFilter; +import org.dromara.visor.common.entity.RequestIdentity; +import org.dromara.visor.common.enums.BooleanBit; +import org.dromara.visor.common.meta.TraceIdHolder; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.Requests; import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType; import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; -import org.dromara.visor.framework.common.entity.RequestIdentity; -import org.dromara.visor.framework.common.enums.BooleanBit; -import org.dromara.visor.framework.common.meta.TraceIdHolder; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.utils.Requests; import java.util.Date; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java index 3d2298a2..f0d8a67b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java @@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.collect.Maps; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializeFilter; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.security.LoginUser; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml index 3571a237..1f872166 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java index 5d21efdb..96d656a7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.datasource.configuration; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.datasource.core.filter.DruidAdRemoveFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml index d3e280ae..856aff7b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java index 7d81e35f..7090a2ca 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.desensitize.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.desensitize.core.filter.DesensitizeValueFilter; import org.dromara.visor.framework.desensitize.core.serializer.DesensitizeJsonSerializer; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java index 68ca496e..de32c264 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java @@ -30,7 +30,7 @@ import cn.orionsec.kit.lang.utils.reflect.Annotations; import cn.orionsec.kit.lang.utils.reflect.Fields; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ValueFilter; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml index 789edbd9..2bd119dd 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java index e663fa2a..30427ded 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.job.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.thread.ThreadPoolMdcTaskExecutor; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.thread.ThreadPoolMdcTaskExecutor; import org.dromara.visor.framework.job.configuration.config.AsyncExecutorConfig; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java index 07224b25..19a67faa 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.job.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.job.core.utils.QuartzUtils; import org.quartz.Scheduler; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java index e59b7d8a..c6c78804 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.job.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.context.annotation.Bean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/core/utils/QuartzUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/core/utils/QuartzUtils.java index c6a34df1..3da04c6e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/core/utils/QuartzUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/core/utils/QuartzUtils.java @@ -25,7 +25,7 @@ package org.dromara.visor.framework.job.core.utils; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.collect.Maps; -import org.dromara.visor.framework.common.constant.FieldConst; +import org.dromara.visor.common.constant.FieldConst; import org.quartz.*; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml index 95c39220..6a80ad83 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/OrionLogPrinterConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/OrionLogPrinterConfiguration.java index 868f4d43..9b2d8c16 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/OrionLogPrinterConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/OrionLogPrinterConfiguration.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.log.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.constant.BeanOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.BeanOrderConst; import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; import org.dromara.visor.framework.log.core.interceptor.LogPrinterInterceptor; import org.dromara.visor.framework.log.core.interceptor.PrettyLogPrinterInterceptor; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/config/LogPrinterConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/config/LogPrinterConfig.java index a67aba95..c5e05aa5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/config/LogPrinterConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/config/LogPrinterConfig.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.log.configuration.config; import lombok.Data; -import org.dromara.visor.framework.common.utils.ConfigUtils; +import org.dromara.visor.common.utils.ConfigUtils; import org.dromara.visor.framework.log.core.enums.LogPrinterMode; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java index 8ce29aa8..42b3b344 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java @@ -29,10 +29,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; import org.aopalliance.intercept.MethodInvocation; -import org.dromara.visor.framework.common.json.filter.FieldDesensitizeFilter; -import org.dromara.visor.framework.common.json.filter.FieldIgnoreFilter; -import org.dromara.visor.framework.common.meta.TraceIdHolder; -import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.common.json.filter.FieldDesensitizeFilter; +import org.dromara.visor.common.json.filter.FieldIgnoreFilter; +import org.dromara.visor.common.meta.TraceIdHolder; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java index 5663582f..1031ad25 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java @@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInvocation; -import org.dromara.visor.framework.common.utils.IpUtils; -import org.dromara.visor.framework.common.utils.SwaggerUtils; +import org.dromara.visor.common.utils.IpUtils; +import org.dromara.visor.common.utils.SwaggerUtils; import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java index 612e40af..6e7696a0 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java @@ -29,8 +29,8 @@ import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInvocation; -import org.dromara.visor.framework.common.utils.IpUtils; -import org.dromara.visor.framework.common.utils.SwaggerUtils; +import org.dromara.visor.common.utils.IpUtils; +import org.dromara.visor.common.utils.SwaggerUtils; import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; import org.dromara.visor.framework.log.core.enums.LogFieldConst; import org.springframework.web.context.request.RequestContextHolder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml index eb036f5f..0b102228 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java index afadb3af..023a28e3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import de.codecentric.boot.admin.server.config.EnableAdminServer; import de.codecentric.boot.admin.server.utils.jackson.AdminServerModule; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml index 85cb2fcd..673f5d2d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java index 30a4fa20..75b47958 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java @@ -26,8 +26,8 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import org.apache.ibatis.annotations.Mapper; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.mybatis.core.handler.FieldFillHandler; import org.dromara.visor.framework.mybatis.core.utils.DomainFillUtils; import org.mybatis.spring.annotation.MapperScan; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java index b4aa6b18..f34eb502 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java @@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.apache.ibatis.type.JdbcType; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.io.Serializable; import java.util.Date; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java index d6b2b787..d2d0ec94 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java @@ -36,7 +36,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.ibatis.annotations.Mapper; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import org.dromara.visor.framework.mybatis.core.generator.template.Table; import org.dromara.visor.framework.mybatis.core.mapper.IMapper; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java index 425d5547..7fa0a07a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java @@ -31,8 +31,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.generator.config.OutputFile; import com.baomidou.mybatisplus.generator.config.builder.CustomFile; import com.baomidou.mybatisplus.generator.config.po.TableInfo; -import org.dromara.visor.framework.common.constant.AppConst; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.AppConst; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.generator.template.Table; import org.jetbrains.annotations.NotNull; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java index 77c2e227..e66a8487 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java @@ -27,8 +27,8 @@ import cn.orionsec.kit.lang.utils.Strings; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.FieldConst; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.framework.mybatis.core.generator.template.DictMeta; import org.dromara.visor.framework.mybatis.core.generator.template.Table; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictTemplate.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictTemplate.java index 0dcabd1b..376ca74b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictTemplate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictTemplate.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.mybatis.core.generator.template; import cn.orionsec.kit.lang.utils.collect.Lists; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.util.LinkedHashMap; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IMapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IMapper.java index 7ba8e2a9..33f33b62 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IMapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IMapper.java @@ -25,7 +25,7 @@ package org.dromara.visor.framework.mybatis.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.toolkit.Db; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.mybatis.core.query.DataQuery; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java index 261068c8..2024c27f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java @@ -24,8 +24,8 @@ package org.dromara.visor.framework.mybatis.core.query; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import java.util.Collection; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java index ccdd9295..aa52f133 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java @@ -37,8 +37,8 @@ import com.baomidou.mybatisplus.core.conditions.interfaces.Join; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.utils.SqlUtils; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.SqlUtils; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.io.Serializable; @@ -96,8 +96,8 @@ public class DataQuery { return new DataQuery<>(dao, wrapper); } - public DataQuery page(org.dromara.visor.framework.common.entity.PageRequest page) { - org.dromara.visor.framework.common.entity.PageRequest pr = Valid.notNull(page, "page is null"); + public DataQuery page(org.dromara.visor.common.entity.PageRequest page) { + org.dromara.visor.common.entity.PageRequest pr = Valid.notNull(page, "page is null"); this.page = new PageRequest(pr.getPage(), pr.getLimit()); return this; } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/IntegerListTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/IntegerListTypeHandler.java index f16f25c1..14182c84 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/IntegerListTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/IntegerListTypeHandler.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/LongListTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/LongListTypeHandler.java index 340c7bac..bcc4c02a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/LongListTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/LongListTypeHandler.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/StringListTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/StringListTypeHandler.java index 61644c14..cda7a58f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/StringListTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/StringListTypeHandler.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/utils/DomainFillUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/utils/DomainFillUtils.java index b81d4372..73182c78 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/utils/DomainFillUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/utils/DomainFillUtils.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.mybatis.core.utils; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm index adb0063d..2c95ae5b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm @@ -27,10 +27,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.validator.group.Page; #if($meta.enableOperatorLog) import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; #end -import org.dromara.visor.framework.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; #if($meta.enableDemoApi) import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm index 1dba8eb3..ddb8269f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm @@ -25,7 +25,7 @@ package ${currentPackage}; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm index 91c5191b..839fd3e2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm @@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; #if($meta.enableCache) import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm index bef47300..350941ae 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm @@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; #end diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml index 8b4ddb23..096f6547 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java index bc1fa57e..37b9bde4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.redis.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.cache.CacheProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java index 857a3df3..072096a7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.framework.redis.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.lock.Locker; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.lock.Locker; +import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.framework.redis.configuration.config.RedissonConfig; import org.dromara.visor.framework.redis.core.lock.RedisLocker; import org.dromara.visor.framework.redis.core.utils.RedisUtils; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java index ca2c95dd..84d390ff 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.redis.core.lock; import cn.orionsec.kit.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.lock.Locker; +import org.dromara.visor.common.lock.Locker; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java index 8928ce3d..7ec5ab11 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java @@ -25,7 +25,7 @@ package org.dromara.visor.framework.redis.core.utils; import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.util.List; import java.util.function.Function; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/barrier/CacheBarriers.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/barrier/CacheBarriers.java index 4919d998..cda0e5d7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/barrier/CacheBarriers.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/barrier/CacheBarriers.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.define.barrier.GenericsAnonymousMapBarrier; import cn.orionsec.kit.lang.define.barrier.GenericsBarrier; import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import cn.orionsec.kit.lang.utils.collect.Lists; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.util.Collection; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml index 7ebd4451..3ed32b2c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java index 73df8560..a96a28c0 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java @@ -22,8 +22,9 @@ */ package org.dromara.visor.framework.security.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.crypto.ValueCrypto; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.crypto.ValueCrypto; +import org.dromara.visor.common.utils.CryptoUtils; import org.dromara.visor.framework.security.configuration.config.AesCryptoConfig; import org.dromara.visor.framework.security.core.crypto.PrimaryValueCrypto; import org.dromara.visor.framework.security.core.crypto.processor.AesCryptoProcessor; @@ -52,7 +53,11 @@ public class OrionCryptoAutoConfiguration { @Bean(name = "valueCrypto") @Primary public ValueCrypto primaryValueCrypto() { - return new PrimaryValueCrypto(); + // 创建加密器 + PrimaryValueCrypto valueCrypto = new PrimaryValueCrypto(); + // 设置工具类 + CryptoUtils.setDelegate(valueCrypto); + return valueCrypto; } /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java index 4da10c72..0e18775c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.security.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.security.configuration.config.SecurityConfig; import org.dromara.visor.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy; import org.dromara.visor.framework.security.core.filter.TokenAuthenticationFilter; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/SecurityConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/SecurityConfig.java index cd1c99d2..ee3d4057 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/SecurityConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/SecurityConfig.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.security.configuration.config; import lombok.Data; -import org.dromara.visor.framework.common.utils.ConfigUtils; +import org.dromara.visor.common.utils.ConfigUtils; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java index c0010c58..49100e52 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java @@ -22,8 +22,7 @@ */ package org.dromara.visor.framework.security.core.crypto; -import org.dromara.visor.framework.common.crypto.ValueCrypto; -import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.common.crypto.ValueCrypto; /** * 数据加密器 @@ -41,7 +40,6 @@ public abstract class CryptoProcessor implements Va // 设置为默认加密器 if (config.isPrimary()) { PrimaryValueCrypto.setDelegate(this); - CryptoUtils.setDelegate(this); } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java index b86ef211..b7af38b4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.security.core.crypto; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.crypto.ValueCrypto; +import org.dromara.visor.common.crypto.ValueCrypto; /** * 默认加密器 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/filter/TokenAuthenticationFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/filter/TokenAuthenticationFilter.java index ea0d200b..c0acf8e8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/filter/TokenAuthenticationFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/filter/TokenAuthenticationFilter.java @@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.exception.argument.HttpWrapperException; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorCode; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.constant.ErrorCode; +import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.framework.security.core.service.SecurityFrameworkService; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java index b278b1b6..6e96dbf6 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.security.core.handler; import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorCode; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java index e67e04c4..ba5e62b3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.security.core.handler; import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorCode; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkService.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkService.java index 91c24a03..7f2679d2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkService.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.security.core.service; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; /** * 权限校验服务 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java index 86c80428..53ddaea4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.security.core.service; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; /** * 权限校验服务委托类 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityHolderDelegate.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityHolderDelegate.java index 536faf60..000cfaa7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityHolderDelegate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityHolderDelegate.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.security.core.service; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.security.core.utils.SecurityUtils; /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/utils/SecurityUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/utils/SecurityUtils.java index 3321426b..08cc7b4c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/utils/SecurityUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/utils/SecurityUtils.java @@ -24,8 +24,8 @@ package org.dromara.visor.framework.security.core.utils; import cn.orionsec.kit.lang.constant.StandardHttpHeader; import cn.orionsec.kit.lang.utils.Strings; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.security.LoginUser; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml index 698525c6..e0bb5cc4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java index 7ee1617b..debe2cc3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java @@ -22,12 +22,13 @@ */ package org.dromara.visor.framework.storage.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.file.FileClient; import org.dromara.visor.framework.storage.configuration.config.LocalStorageConfig; import org.dromara.visor.framework.storage.configuration.config.LogsStorageConfig; import org.dromara.visor.framework.storage.core.client.PrimaryFileClient; import org.dromara.visor.framework.storage.core.client.local.LocalFileClient; +import org.dromara.visor.framework.storage.core.utils.FileClientUtils; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -52,10 +53,14 @@ public class OrionStorageAutoConfiguration { /** * @return 默认文件客户端 */ - @Bean(name = "primaryFileClient") + @Bean(name = "fileClient") @Primary public FileClient primaryFileClient() { - return new PrimaryFileClient(); + // 创建客户端 + PrimaryFileClient client = new PrimaryFileClient(); + // 设置工具类 + FileClientUtils.setDelegate(client); + return client; } /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java index 47d5ba61..20a67c18 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java @@ -25,9 +25,8 @@ package org.dromara.visor.framework.storage.core.client; import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.kit.lang.utils.time.Dates; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.file.FileClient; -import org.dromara.visor.framework.common.utils.FileClientUtils; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.file.FileClient; import java.io.InputStream; import java.io.OutputStream; @@ -49,7 +48,6 @@ public abstract class AbstractFileClient implem // 设置默认文件客户端 if (config.isPrimary()) { PrimaryFileClient.setDelegate(this); - FileClientUtils.setDelegate(this); } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java index 2c63ad19..43476de5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.storage.core.client; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.common.file.FileClient; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClient.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClient.java index a94a2fe5..3904b068 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClient.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClient.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.storage.core.client.local; import cn.orionsec.kit.lang.utils.io.FileWriters; import cn.orionsec.kit.lang.utils.io.Files1; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.storage.core.client.AbstractFileClient; import java.io.InputStream; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileClientUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/utils/FileClientUtils.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileClientUtils.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/utils/FileClientUtils.java index e4fa0932..979c8e42 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileClientUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/utils/FileClientUtils.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.framework.storage.core.utils; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.common.file.FileClient; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml index 6e923407..fb8c56e2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java index e991d915..9b54f15b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.swagger.configuration.config.SwaggerConfig; import org.springdoc.core.*; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml index 62514a9a..4f286b4a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common org.dromara.visor diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java index 436c0a99..b3949ad8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java @@ -23,8 +23,8 @@ package org.dromara.visor.framework.test.configuration; import cn.orionsec.kit.lang.utils.collect.Sets; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.test.core.utils.EntityRandoms; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java index 47bb23a9..6ab577ee 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java @@ -23,8 +23,8 @@ package org.dromara.visor.framework.test.configuration; import com.github.fppt.jedismock.RedisServer; -import org.dromara.visor.framework.common.lock.Locker; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.lock.Locker; +import org.dromara.visor.common.utils.LockerUtils; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml index 0c1251e7..c4587e31 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java index 3159bf72..b6c10061 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java @@ -25,9 +25,9 @@ package org.dromara.visor.framework.web.configuration; import cn.orionsec.kit.lang.utils.collect.Lists; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.constant.FilterOrderConst; -import org.dromara.visor.framework.common.web.filter.FilterCreator; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.FilterOrderConst; +import org.dromara.visor.common.web.filter.FilterCreator; import org.dromara.visor.framework.web.core.aspect.DemoDisableApiAspect; import org.dromara.visor.framework.web.core.filter.TraceIdFilter; import org.dromara.visor.framework.web.core.handler.GlobalExceptionHandler; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/aspect/DemoDisableApiAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/aspect/DemoDisableApiAspect.java index 9ebb2f4b..2dc45e96 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/aspect/DemoDisableApiAspect.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/aspect/DemoDisableApiAspect.java @@ -26,8 +26,8 @@ import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; -import org.dromara.visor.framework.common.constant.BeanOrderConst; -import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.common.constant.BeanOrderConst; +import org.dromara.visor.common.constant.ErrorCode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; import org.springframework.core.annotation.Order; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java index 5e6294e6..e514d3d4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.web.core.filter; -import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.common.meta.TraceIdHolder; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/GlobalExceptionHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/GlobalExceptionHandler.java index e4a5c9fc..0a47cd58 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/GlobalExceptionHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/GlobalExceptionHandler.java @@ -32,9 +32,9 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.apache.poi.EncryptedDocumentException; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorCode; -import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorMessage; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.security.access.AccessDeniedException; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/WrapperResultHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/WrapperResultHandler.java index 1e231b9c..ad55d484 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/WrapperResultHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/WrapperResultHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.framework.web.core.handler; import cn.orionsec.kit.lang.constant.StandardContentType; import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.kit.lang.define.wrapper.RpcWrapper; -import org.dromara.visor.framework.common.constant.BeanOrderConst; +import org.dromara.visor.common.constant.BeanOrderConst; import org.dromara.visor.framework.web.core.annotation.IgnoreWrapper; import org.dromara.visor.framework.web.core.annotation.RestWrapper; import org.jetbrains.annotations.NotNull; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml index ce8e971f..00b72ded 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java index c7f60b74..885e4e95 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.websocket.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.websocket.configuration.config.WebSocketConfig; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java index 23540159..cba8eb6c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Threads; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.websocket.core.constant.WsCloseCode; import org.dromara.visor.framework.websocket.core.session.WebSocketSyncSession; import org.springframework.web.socket.CloseStatus; diff --git a/orion-visor-framework/pom.xml b/orion-visor-framework/pom.xml index 5f73606d..ed45894e 100644 --- a/orion-visor-framework/pom.xml +++ b/orion-visor-framework/pom.xml @@ -16,7 +16,6 @@ https://github.com/dromara/orion-visor - orion-visor-framework-common orion-visor-spring-boot-starter-web orion-visor-spring-boot-starter-banner orion-visor-spring-boot-starter-swagger diff --git a/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java index f060fe7f..5d893310 100644 --- a/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java +++ b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java @@ -23,7 +23,7 @@ package org.dromara.visor.launch; import cn.orionsec.kit.lang.utils.Strings; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; diff --git a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java index 9aeb3407..fef40fd8 100644 --- a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java +++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java @@ -61,7 +61,7 @@ public class ReplaceVersion { "orion-visor-dependencies/pom.xml" }; - private static final String APP_CONST_FILE = "orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java"; + private static final String APP_CONST_FILE = "orion-visor-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java"; private static final String PACKAGE_JSON_FILE = "orion-visor-ui/package.json"; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml index f43901e8..b9ddc97a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml @@ -18,7 +18,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml index e6693a93..e4d30cad 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml @@ -18,7 +18,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java index a10228c3..439071b8 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.common.validator.group.Id; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java index f85ffc2b..7462e505 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java @@ -28,8 +28,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.utils.Valid; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.security.core.utils.SecurityUtils; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java index f94eb64c..89130a75 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java index 5a424a59..a8e7404d 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java @@ -28,8 +28,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.utils.Valid; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java index 32808d61..8849749a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java index cdf1723a..19e145fd 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java index aa3bc979..6dc4e9e4 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java index 45ca24ed..768b8962 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java index 4e88daaa..59f0b2e0 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.common.validator.group.Id; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java index d6476bfa..4589f2c2 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java @@ -28,8 +28,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Id; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Id; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java index 9b084f17..64b8d625 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.IgnoreWrapper; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java index 531b9b1b..aa8a4019 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java @@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java index db79ff4c..ef8eedc6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.asset.define; import cn.orionsec.kit.lang.define.thread.ExecutorBuilder; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java index 9973c373..ad5be0d3 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.define.config; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.AutoClearConfig; +import org.dromara.visor.common.entity.AutoClearConfig; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java index 8b5901a6..7c9930e7 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.define.config; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.AutoClearConfig; +import org.dromara.visor.common.entity.AutoClearConfig; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java index 4ae65956..9cd07111 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.common.validator.group.Id; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java index 3bc690f7..93c6efcf 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java index e767041c..fdc4d096 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java index a894cc55..c77f6932 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java index e102df79..5856dab0 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java index d3a84fb9..6ea0d6cf 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java index bb42e2e8..e814f08b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java index 4b425f28..ed05421b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.security.UpdatePasswordAction; +import org.dromara.visor.common.security.UpdatePasswordAction; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java index f7254e3f..4bb70c5c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java index f5602a1f..4a4a5b0f 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.security.UpdatePasswordAction; +import org.dromara.visor.common.security.UpdatePasswordAction; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java index 524e3831..f673e054 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java index 7d01520f..4247744c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java index 339534ab..f0505da6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java @@ -25,8 +25,8 @@ package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; -import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.validator.group.Id; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java index ccc5a1aa..b66aa514 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java index 0281acda..b7ada2b7 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.common.validator.group.Id; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java index 8d04c786..87d28dff 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.upload; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java index c772f7d4..e578975a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.upload; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java index eb77614c..5b2c5d7d 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java index 4b015089..2ab416f2 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java @@ -28,7 +28,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.TreeNode; +import org.dromara.visor.common.entity.TreeNode; import java.io.Serializable; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java index a3fd5fb5..92e45cef 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.GenericsStrategyDefinition; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy; import org.dromara.visor.module.asset.handler.host.extra.strategy.HostLabelExtraStrategy; import org.dromara.visor.module.asset.handler.host.extra.strategy.HostSshExtraStrategy; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java index 157b79c5..3d1d0bf6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.GenericsStrategyDefinition; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy; import org.dromara.visor.module.asset.handler.host.config.strategy.HostSshConfigStrategy; /** diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java index ddb8e2e0..8382d5ed 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java @@ -26,8 +26,8 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.security.UpdatePasswordAction; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.security.UpdatePasswordAction; import javax.validation.constraints.*; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java index f839236b..da8536dd 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java @@ -26,11 +26,11 @@ import cn.orionsec.kit.lang.utils.Booleans; import cn.orionsec.kit.lang.utils.Charsets; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Strings; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import org.dromara.visor.framework.common.security.PasswordModifier; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.security.PasswordModifier; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.asset.dao.HostIdentityDAO; import org.dromara.visor.module.asset.dao.HostKeyDAO; import org.dromara.visor.module.asset.enums.HostSshAuthTypeEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java index a573537d..53671a48 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java @@ -39,9 +39,9 @@ import cn.orionsec.kit.spring.SpringHolder; import com.alibaba.fastjson.JSON; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.file.FileClient; -import org.dromara.visor.framework.common.utils.PathUtils; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.file.FileClient; +import org.dromara.visor.common.utils.PathUtils; import org.dromara.visor.module.asset.dao.ExecHostLogDAO; import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java index 0f30e275..8fc2ab57 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java @@ -29,7 +29,7 @@ import cn.orionsec.kit.lang.utils.ansi.AnsiAppender; import cn.orionsec.kit.lang.utils.ansi.style.color.AnsiForeground; import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.kit.net.host.ssh.ExitCode; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.module.asset.enums.ExecHostStatusEnum; import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java index 8168e1c4..b82efddd 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java @@ -34,7 +34,7 @@ import cn.orionsec.kit.net.host.ssh.ExitCode; import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.module.asset.dao.ExecLogDAO; import org.dromara.visor.module.asset.define.AssetThreadPools; import org.dromara.visor.module.asset.define.config.AppExecLogConfig; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/job/ExecCommandJob.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/job/ExecCommandJob.java index b00e1280..9dd3c291 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/job/ExecCommandJob.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/job/ExecCommandJob.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.exec.job; import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.FieldConst; +import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.module.asset.dao.ExecJobDAO; import org.dromara.visor.module.asset.entity.domain.ExecJobDO; import org.dromara.visor.module.asset.entity.request.exec.ExecJobTriggerRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java index 5d9c7bdf..5e9d98eb 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.asset.handler.host.exec.log; import cn.orionsec.kit.lang.annotation.Keep; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.file.FileClient; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.define.AssetThreadPools; import org.dromara.visor.module.asset.entity.dto.ExecHostLogTailDTO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java index e3767a81..68de7382 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.handler.host.exec.log.manager; import cn.orionsec.kit.lang.utils.Threads; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.module.asset.handler.host.exec.log.tracker.IExecLogTracker; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java index 2549814c..8c6cf68d 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java @@ -26,7 +26,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * 主机拓展信息 - 标签模型 diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java index 471410b6..b99a0a16 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java @@ -26,7 +26,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * 主机拓展信息 - ssh 模型 diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java index e8db9fc8..9c3a2d83 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.module.asset.handler.host.extra.strategy; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; import org.dromara.visor.module.asset.handler.host.extra.model.HostLabelExtraModel; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java index 9eb3155f..e6ef57d9 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.asset.handler.host.extra.strategy; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.dao.HostIdentityDAO; import org.dromara.visor.module.asset.dao.HostKeyDAO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionStores.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionStores.java index dd938864..735d74bd 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionStores.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionStores.java @@ -30,9 +30,9 @@ import cn.orionsec.kit.net.host.SessionHolder; import cn.orionsec.kit.net.host.SessionLogger; import cn.orionsec.kit.net.host.SessionStore; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.AppConst; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.common.constant.AppConst; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.CryptoUtils; import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; import java.util.Optional; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java index a6b8fbcc..4fd86c4c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.manager.TerminalManager; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java index ce1da410..a80fdea6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpChangeModeRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java index 1719b8ae..5ac61934 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpDownloadFlatDirectoryRequest; import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpDownloadFlatDirectoryResponse; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java index 531ce753..4b2f5bba 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.id.UUIds; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.module.asset.define.cache.TerminalCacheKeyDefine; import org.dromara.visor.module.asset.entity.dto.SftpGetContentCacheDTO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java index fb14721b..db2fa591 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpListRequest; import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java index 1d42fc4d..323d7d32 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java index 8fa61aa8..cb787712 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpMoveRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java index 3d642e0e..ddfc7bf6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java index d54f1cb7..305ac81f 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.id.UUIds; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.module.asset.define.cache.TerminalCacheKeyDefine; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java index b5b527a7..3a27fc0f 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java index 5acd5ee6..263af800 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java index 2d6bf5b0..63824e92 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java @@ -30,9 +30,9 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.dao.HostDAO; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java index 59ebb005..5afbf62a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java @@ -30,9 +30,9 @@ import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.kit.net.host.SessionStore; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SftpSession.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SftpSession.java index 062a5530..6589169a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SftpSession.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SftpSession.java @@ -31,9 +31,9 @@ import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.kit.net.host.sftp.SftpExecutor; import cn.orionsec.kit.net.host.sftp.SftpFile; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SshSession.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SshSession.java index 66ac7115..f16d16b2 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SshSession.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SshSession.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.kit.net.host.ssh.shell.ShellExecutor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.define.AssetThreadPools; import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/TerminalSession.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/TerminalSession.java index 689e2a55..09865c72 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/TerminalSession.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/TerminalSession.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.session; import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; import org.dromara.visor.module.asset.handler.host.terminal.constant.TerminalMessage; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java index 0d7ba941..4708c388 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.handler.host.terminal.utils; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/TransferHandler.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/TransferHandler.java index f4e16644..e308e713 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/TransferHandler.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/TransferHandler.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; import org.dromara.visor.module.asset.handler.host.jsch.SessionStores; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/DownloadSession.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/DownloadSession.java index 47c7e0ca..2c5b9a87 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/DownloadSession.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/DownloadSession.java @@ -29,8 +29,8 @@ import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.kit.net.host.sftp.SftpFile; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.module.asset.define.AssetThreadPools; import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/utils/TransferUtils.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/utils/TransferUtils.java index 2c69e32d..d95c5963 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/utils/TransferUtils.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/utils/TransferUtils.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.transfer.utils; import cn.orionsec.kit.lang.utils.Strings; import com.alibaba.fastjson.JSON; import org.apache.catalina.connector.ClientAbortException; -import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferReceiver; import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorResponse; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/FileUploadTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/FileUploadTask.java index 7edd7aef..3e4dbbec 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/FileUploadTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/FileUploadTask.java @@ -28,7 +28,7 @@ import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.module.asset.dao.UploadTaskDAO; import org.dromara.visor.module.asset.dao.UploadTaskFileDAO; import org.dromara.visor.module.asset.define.AssetThreadPools; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java index 32b7a47f..ba7291c7 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java @@ -31,12 +31,12 @@ import cn.orionsec.kit.net.host.sftp.SftpExecutor; import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.enums.EndpointDefine; -import org.dromara.visor.framework.common.file.FileClient; -import org.dromara.visor.framework.common.utils.PathUtils; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.enums.EndpointDefine; +import org.dromara.visor.common.file.FileClient; +import org.dromara.visor.common.utils.PathUtils; import org.dromara.visor.module.asset.dao.UploadTaskFileDAO; import org.dromara.visor.module.asset.define.config.AppSftpConfig; import org.dromara.visor.module.asset.entity.domain.UploadTaskFileDO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/ExecLogTailInterceptor.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/ExecLogTailInterceptor.java index 14fb0231..35b05cab 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/ExecLogTailInterceptor.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/ExecLogTailInterceptor.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.interceptor; import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.module.asset.entity.dto.ExecLogTailDTO; import org.dromara.visor.module.asset.service.ExecLogService; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalAccessInterceptor.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalAccessInterceptor.java index 78caa02d..8ba67501 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalAccessInterceptor.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalAccessInterceptor.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.asset.interceptor; import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.meta.TraceIdHolder; -import org.dromara.visor.framework.common.utils.Requests; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.meta.TraceIdHolder; +import org.dromara.visor.common.utils.Requests; import org.dromara.visor.module.asset.entity.dto.TerminalAccessDTO; import org.dromara.visor.module.asset.service.TerminalService; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalTransferInterceptor.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalTransferInterceptor.java index 33a8d376..d95aa1c7 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalTransferInterceptor.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalTransferInterceptor.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.asset.interceptor; import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.meta.TraceIdHolder; -import org.dromara.visor.framework.common.utils.Requests; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.meta.TraceIdHolder; +import org.dromara.visor.common.utils.Requests; import org.dromara.visor.module.asset.entity.dto.TerminalTransferDTO; import org.dromara.visor.module.asset.service.TerminalService; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetStatisticsService.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetStatisticsService.java index 105c113d..a3897081 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetStatisticsService.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetStatisticsService.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.asset.service; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import org.dromara.visor.module.asset.entity.vo.AssetWorkplaceStatisticsVO; import org.dromara.visor.module.asset.enums.ExecSourceEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConfigService.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConfigService.java index 19074898..91bad8cc 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConfigService.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConfigService.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.asset.service; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; import org.dromara.visor.module.asset.entity.domain.HostDO; import org.dromara.visor.module.asset.enums.HostTypeEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java index 90d5b6ad..8c8a8594 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.asset.service; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; import org.dromara.visor.module.asset.entity.request.host.HostExtraQueryRequest; import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest; import org.dromara.visor.module.asset.enums.HostExtraItemEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java index f51d6686..71317635 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java @@ -27,9 +27,9 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.utils.TreeUtils; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.TreeUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.asset.convert.HostGroupConvert; import org.dromara.visor.module.asset.dao.HostDAO; import org.dromara.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java index 4e5490cc..55580947 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java @@ -26,9 +26,9 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.asset.dao.HostIdentityDAO; import org.dromara.visor.module.asset.dao.HostKeyDAO; import org.dromara.visor.module.asset.entity.domain.HostIdentityDO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetStatisticsServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetStatisticsServiceImpl.java index 4612944b..61a17d53 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetStatisticsServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetStatisticsServiceImpl.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.time.Dates; -import org.dromara.visor.framework.common.entity.StatisticsRange; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.StatisticsRange; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.ExecLogConvert; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java index e5096fb0..cdddc08b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java @@ -25,9 +25,9 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.utils.Booleans; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.CommandSnippetGroupConvert; import org.dromara.visor.module.asset.dao.CommandSnippetDAO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetServiceImpl.java index 937eada0..448f5935 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetServiceImpl.java @@ -27,8 +27,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.framework.security.core.utils.SecurityUtils; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecCommandServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecCommandServiceImpl.java index 0373a097..60d8c564 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecCommandServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecCommandServiceImpl.java @@ -35,14 +35,14 @@ import cn.orionsec.kit.lang.utils.time.Dates; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.FileConst; -import org.dromara.visor.framework.common.enums.EndpointDefine; -import org.dromara.visor.framework.common.file.FileClient; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.utils.PathUtils; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.FileConst; +import org.dromara.visor.common.enums.EndpointDefine; +import org.dromara.visor.common.file.FileClient; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.PathUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.ExecConvert; import org.dromara.visor.module.asset.convert.ExecHostLogConvert; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecHostLogServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecHostLogServiceImpl.java index ac0624a3..2be0f46c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecHostLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecHostLogServiceImpl.java @@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.asset.convert.ExecHostLogConvert; import org.dromara.visor.module.asset.dao.ExecHostLogDAO; import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java index cd8265d3..ea45814f 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java @@ -31,10 +31,10 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.job.core.utils.QuartzUtils; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.ExecJobConvert; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java index 1ce094bc..77429f38 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java @@ -37,13 +37,13 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.FileConst; -import org.dromara.visor.framework.common.enums.EndpointDefine; -import org.dromara.visor.framework.common.file.FileClient; -import org.dromara.visor.framework.common.utils.SqlUtils; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.FileConst; +import org.dromara.visor.common.enums.EndpointDefine; +import org.dromara.visor.common.file.FileClient; +import org.dromara.visor.common.utils.SqlUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.ExecHostLogConvert; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java index fef20f26..5413a16c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java @@ -28,9 +28,9 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.ExecTemplateConvert; import org.dromara.visor.module.asset.dao.ExecTemplateDAO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java index abba04d1..b321944c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.function.Functions; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.asset.dao.HostDAO; import org.dromara.visor.module.asset.entity.domain.HostDO; import org.dromara.visor.module.asset.enums.HostStatusEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java index 612bcb04..444a0c0b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.function.Functions; import cn.orionsec.kit.lang.utils.collect.Maps; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.entity.request.host.HostExtraQueryRequest; import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index de1fa32d..d038056e 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -31,11 +31,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.security.PasswordModifier; -import org.dromara.visor.framework.common.utils.CryptoUtils; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.PasswordModifier; +import org.dromara.visor.common.utils.CryptoUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index f285a060..d99b2bc1 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -29,11 +29,11 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.security.PasswordModifier; -import org.dromara.visor.framework.common.utils.CryptoUtils; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.PasswordModifier; +import org.dromara.visor.common.utils.CryptoUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index f4270189..6833fee7 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -32,10 +32,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.module.asset.convert.HostConvert; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java index c89719a8..b4af1389 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java @@ -25,9 +25,9 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.utils.Booleans; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.PathBookmarkGroupConvert; import org.dromara.visor.module.asset.dao.PathBookmarkDAO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java index a5072eb3..d6756de4 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java @@ -27,8 +27,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.framework.security.core.utils.SecurityUtils; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java index 640baf09..4d222487 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java @@ -29,10 +29,10 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.SqlUtils; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.SqlUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.TerminalConnectLogConvert; import org.dromara.visor.module.asset.dao.TerminalConnectLogDAO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java index bd2aeb0f..3bd170d0 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java @@ -25,10 +25,10 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.id.UUIds; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.dao.HostDAO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java index 422fc57a..6b3c56c2 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java @@ -38,9 +38,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.TerminalSftpLogConvert; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java index 4f58e777..0933cb63 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java @@ -36,13 +36,13 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.enums.EndpointDefine; -import org.dromara.visor.framework.common.file.FileClient; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.utils.SqlUtils; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.enums.EndpointDefine; +import org.dromara.visor.common.file.FileClient; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.SqlUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.asset.convert.HostConvert; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java index 4ecf8deb..7d9c12cd 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.asset.task; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.asset.service.CommandSnippetGroupService; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java index e79a16b9..d128c819 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.task; import cn.orionsec.kit.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.asset.define.config.AppExecLogAutoClearConfig; import org.dromara.visor.module.asset.entity.request.exec.ExecLogClearRequest; import org.dromara.visor.module.asset.enums.ExecStatusEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java index e1f8b784..2d8bd666 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.asset.task; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.asset.service.PathBookmarkGroupService; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java index 37fe51ac..10ee6bbc 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.task; import cn.orionsec.kit.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.asset.define.config.AppTerminalConnectLogAutoClearConfig; import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml index a86edb47..0fea0799 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml @@ -18,7 +18,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java index 3ac259e3..903cbb76 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.TreeNode; +import org.dromara.visor.common.entity.TreeNode; import java.io.Serializable; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java index 932f4422..e134b8d6 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.dto.operator; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml index 5af269eb..25febabc 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml @@ -18,7 +18,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java index 5a9996f3..0be17cee 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java @@ -23,8 +23,8 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.AuthenticationApi; import org.dromara.visor.module.infra.entity.domain.SystemUserDO; import org.dromara.visor.module.infra.entity.dto.user.SystemUserAuthDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java index 281304b1..146f0586 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.DataExtraApi; import org.dromara.visor.module.infra.convert.DataExtraProviderConvert; import org.dromara.visor.module.infra.dao.DataExtraDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java index 84eb860e..862c2983 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java @@ -23,8 +23,8 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.DataGroupApi; import org.dromara.visor.module.infra.convert.DataGroupProviderConvert; import org.dromara.visor.module.infra.dao.DataGroupDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java index 7be1b9bf..c6f02a08 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java @@ -23,8 +23,8 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.DataGroupRelApi; import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java index 1fa730d5..33891592 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.DataGroupUserApi; import org.dromara.visor.module.infra.convert.DataGroupProviderConvert; import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java index baad9a61..51d65057 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.DataGroupUserRelApi; import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java index 4c70c0a7..6a8278b6 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.DataPermissionApi; import org.dromara.visor.module.infra.convert.DataPermissionProviderConvert; import org.dromara.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java index 7b9984a5..a5a2e4b4 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.api.impl; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.FavoriteApi; import org.dromara.visor.module.infra.dao.FavoriteDAO; import org.dromara.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java index 8a91f8dc..4fa2edd4 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.infra.api.impl; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.HistoryValueApi; import org.dromara.visor.module.infra.convert.HistoryValueProviderConvert; import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java index 1e95337b..1ddb8b16 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.api.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.OperatorLogApi; import org.dromara.visor.module.infra.convert.OperatorLogProviderConvert; import org.dromara.visor.module.infra.dao.OperatorLogDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java index 8eab309e..3c6fcc5e 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.SystemMessageApi; import org.dromara.visor.module.infra.convert.SystemMessageProviderConvert; import org.dromara.visor.module.infra.define.SystemMessageDefine; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java index 33199f9d..13f5a5fc 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import cn.orionsec.kit.lang.utils.collect.Lists; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.module.infra.api.TagRelApi; import org.dromara.visor.module.infra.convert.TagProviderConvert; import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java index 3354529b..df192acc 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java @@ -28,8 +28,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java index 88074208..bc5fb8e2 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java index 2a3af874..22baa565 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java @@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java index a32ca845..78d869df 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java @@ -27,8 +27,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java index 1dd3818a..adee2798 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java index af2a3a38..a24793dc 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java @@ -27,8 +27,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java index 0316cfaa..71532fa8 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java @@ -28,8 +28,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import org.dromara.visor.framework.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java index a440a690..b12f633c 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.convert; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.module.infra.entity.domain.SystemUserDO; import org.dromara.visor.module.infra.entity.dto.UserInfoDTO; import org.dromara.visor.module.infra.entity.request.user.*; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java index cefa67fe..c29151c6 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.mapper.IMapper; import org.dromara.visor.module.infra.entity.domain.DictKeyDO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java index bce2180e..3860f7b5 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.define.cache; import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; import org.dromara.visor.module.infra.entity.dto.UserInfoDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java index 57ad142d..b4a50dc8 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java @@ -28,7 +28,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.TreeNode; +import org.dromara.visor.common.entity.TreeNode; import java.io.Serializable; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java index c508df88..989c352d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.entity.dto; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.RequestIdentity; +import org.dromara.visor.common.entity.RequestIdentity; /** * 身份信息 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java index c2980fe2..f4bd24af 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.constant.ValidConst; +import org.dromara.visor.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java index ed5059a1..c08b9359 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java index 6f2311ae..903303a8 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.constant.ValidConst; +import org.dromara.visor.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java index facdad3c..c36aeba1 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java index 051e193e..d95a81ae 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.favorite; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; /** * 收藏 查询请求对象 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java index 9013adbf..fef7d424 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.history; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java index bfc02cfc..2d7fb580 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; /** * 系统消息 查询请求对象 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java index 06e86a08..0e2c121a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.entity.request.operator; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java index 958fec9a..50a3df60 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.entity.request.operator; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java index 9085d923..e508ef44 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java index a0bc2368..85999e24 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java index a855055e..7ae30530 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Collection; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java index e5fe29ba..80f69c34 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.constant.ValidConst; +import org.dromara.visor.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java index 02b3e83b..e5aa40ff 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java index 17ab0135..e3644245 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import java.util.Date; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java index 5beef2bf..0fcfc3df 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.enums; import cn.orionsec.kit.lang.utils.time.Dates; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorCode; import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; import org.dromara.visor.module.infra.entity.dto.LoginTokenIdentityDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java index ec7dc044..a3627828 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java @@ -23,9 +23,9 @@ package org.dromara.visor.module.infra.enums; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.GenericsStrategyDefinition; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy; import org.dromara.visor.module.infra.handler.preference.strategy.SystemPreferenceStrategy; import org.dromara.visor.module.infra.handler.preference.strategy.TerminalPreferenceStrategy; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java index 17ad4cdf..6fb38344 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.GenericsStrategyDefinition; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy; import org.dromara.visor.module.infra.handler.setting.strategy.SftpSystemSettingStrategy; /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java index 4292ab75..8a5d272e 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorCode; /** * 用户状态枚举 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java index ddcaaa17..7676fb26 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.framework.service.impl; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.security.core.service.SecurityFrameworkService; import org.dromara.visor.module.infra.define.cache.UserCacheKeyDefine; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java index a5863853..d31d2419 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java @@ -26,7 +26,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * 系统偏好模型 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java index 7f16237b..d7ad9a5a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java @@ -28,7 +28,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java index db7dc1cc..b031e957 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.handler.preference.strategy; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; import org.dromara.visor.module.infra.handler.preference.model.SystemPreferenceModel; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index 71795665..0ae415c0 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.net.host.ssh.TerminalType; import com.alibaba.fastjson.JSONObject; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; import org.dromara.visor.module.infra.handler.preference.model.TerminalPreferenceModel; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java index 9431ecfc..f1e27b2e 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java @@ -26,7 +26,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * SFTP 系统配置模型 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java index f82c46c7..dc4eed64 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.handler.setting.strategy; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; import org.dromara.visor.module.infra.handler.setting.model.SftpSystemSettingModel; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java index 37e1d955..ccb09581 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java @@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.annotation.Keep; import cn.orionsec.kit.lang.utils.io.Streams; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.file.FileClient; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO; import org.dromara.visor.module.infra.handler.upload.enums.FileUploadOperatorType; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java index c8470836..7d9182b9 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.infra.handler.upload.handler; import cn.orionsec.kit.lang.utils.io.Streams; import com.alibaba.fastjson.JSON; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.file.FileClient; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.infra.handler.upload.enums.FileUploadReceiverType; import org.dromara.visor.module.infra.handler.upload.model.FileUploadResponse; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/interceptor/FileUploadInterceptor.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/interceptor/FileUploadInterceptor.java index 197a378d..168c9442 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/interceptor/FileUploadInterceptor.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/interceptor/FileUploadInterceptor.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.interceptor; import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO; import org.dromara.visor.module.infra.service.FileUploadService; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/AuthenticationService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/AuthenticationService.java index 244a5b19..99a083ae 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/AuthenticationService.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/AuthenticationService.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.service; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.module.infra.entity.domain.SystemUserDO; import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; import org.dromara.visor.module.infra.entity.request.user.UserLoginRequest; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/InfraStatisticsService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/InfraStatisticsService.java index eb827c38..5220bd2d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/InfraStatisticsService.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/InfraStatisticsService.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.service; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import org.dromara.visor.module.infra.entity.vo.InfraWorkplaceStatisticsVO; /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java index 279b771b..895886ea 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java @@ -31,15 +31,15 @@ import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.UserRole; +import org.dromara.visor.common.utils.CryptoUtils; +import org.dromara.visor.common.utils.IpUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.UserRole; -import org.dromara.visor.framework.common.utils.CryptoUtils; -import org.dromara.visor.framework.common.utils.IpUtils; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.framework.security.core.utils.SecurityUtils; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java index 1a2e96b7..f69be9cd 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.query.ThenLambdaWrapper; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java index 0b9e1477..57c850ca 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java @@ -27,9 +27,9 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisLists; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.redis.core.utils.RedisUtils; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java index 3c597e24..f7f9a3fe 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java @@ -26,12 +26,12 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.enums.MovePosition; +import org.dromara.visor.common.utils.TreeUtils; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.enums.MovePosition; -import org.dromara.visor.framework.common.utils.TreeUtils; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.module.infra.convert.DataGroupConvert; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java index 0efc1f78..5b14a203 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.redis.core.utils.RedisLists; import org.dromara.visor.framework.redis.core.utils.RedisUtils; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java index cb0346de..edc92e8a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java @@ -31,10 +31,10 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.redis.core.utils.RedisUtils; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java index 22930473..51470be3 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java @@ -29,11 +29,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.FieldConst; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.constant.FieldConst; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.module.infra.convert.DictValueConvert; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java index 27eddd32..4922b6f3 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.annotation.Keep; import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisLists; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.framework.security.core.utils.SecurityUtils; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java index 44b7782b..28f5e4da 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.entity.StatisticsRange; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.StatisticsRange; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.dao.OperatorLogDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java index 21e56d00..73677ff7 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java @@ -25,8 +25,8 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.crypto.Signatures; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.dao.SystemUserDAO; import org.dromara.visor.module.infra.entity.domain.SystemUserDO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java index 9b7e440f..2024ee46 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java @@ -28,10 +28,10 @@ import cn.orionsec.kit.lang.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.SqlUtils; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.SqlUtils; import org.dromara.visor.module.infra.convert.OperatorLogConvert; import org.dromara.visor.module.infra.dao.OperatorLogDAO; import org.dromara.visor.module.infra.define.operator.AuthenticationOperatorType; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java index e2086258..eca2a86b 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java @@ -28,7 +28,7 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.dao.PreferenceDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java index 7785908a..e48dd218 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java @@ -26,10 +26,10 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.module.infra.convert.SystemMenuConvert; import org.dromara.visor.module.infra.dao.SystemMenuDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java index 90a3ff17..d08515cf 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java @@ -25,10 +25,10 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorCode; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.module.infra.convert.SystemMenuConvert; import org.dromara.visor.module.infra.dao.SystemMenuDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java index 031863b9..8c32a6ab 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java @@ -27,9 +27,9 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.module.infra.convert.SystemRoleConvert; import org.dromara.visor.module.infra.dao.SystemRoleDAO; import org.dromara.visor.module.infra.dao.SystemRoleMenuDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java index b298085c..20b620ae 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java @@ -32,11 +32,11 @@ import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.io.Streams; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.dromara.visor.common.constant.AppConst; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.AppConst; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.dromara.visor.module.infra.dao.SystemSettingDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java index 7b5c0a6e..01a19ef1 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java @@ -24,10 +24,10 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Requests; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Requests; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.dao.SystemUserDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java index 43c7be51..284237ef 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java @@ -24,11 +24,11 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.UserRole; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.UserRole; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.module.infra.dao.SystemRoleDAO; import org.dromara.visor.module.infra.dao.SystemUserDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java index 187f9d56..1428bf0d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -29,12 +29,12 @@ import cn.orionsec.kit.spring.SpringHolder; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.ErrorCode; -import org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.redis.core.utils.RedisUtils; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java index dd12efae..8f08410c 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.redis.core.utils.RedisLists; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java index a0e2a58b..433cd9f2 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java @@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.UserRole; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.UserRole; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.convert.SystemMenuConvert; import org.dromara.visor.module.infra.dao.SystemMenuDAO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java index 37572ba3..3c617637 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.task; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.infra.service.TagService; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/pom.xml b/pom.xml index 5245ca1b..62ba29f1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ orion-visor-dependencies + orion-visor-common orion-visor-framework orion-visor-launch orion-visor-modules - orion-visor-common