🎨 优化项目模块.

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>org.dromara.visor</groupId>
-            <artifactId>orion-visor-framework-common</artifactId>
+            <artifactId>orion-visor-common</artifactId>
         </dependency>
     </dependencies>
 

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>org.dromara.visor</groupId>
-            <artifactId>orion-visor-framework-common</artifactId>
+            <artifactId>orion-visor-common</artifactId>
         </dependency>
 
         <!-- infra provider -->

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;
 

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;
 

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;

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;

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;
 

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;
 
 /**

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.*;
 

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;

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;

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;

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;

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;

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;

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;
 

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;
 
 /**
  * 主机拓展信息 - 标签模型

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 模型

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;