From 8b795e889ad8307f45fa4135336be9466a2275ab Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Thu, 26 Jun 2025 01:23:13 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/data/model/GenericsDataModel.java | 1 - .../module/asset/api/HostConnectApi.java | 1 - .../controller/ExecCommandLogController.java | 10 +++---- .../exec/controller/ExecJobLogController.java | 10 +++---- .../exec/controller/UploadTaskController.java | 10 +++---- .../exec/define/cache/ExecCacheKeyDefine.java | 2 +- .../exec/entity/domain/ExecHostLogDO.java | 2 +- .../module/exec/entity/domain/ExecJobDO.java | 2 +- .../module/exec/entity/domain/ExecLogDO.java | 2 +- .../exec/entity/domain/ExecTemplateDO.java | 2 +- .../entity/domain/ExecTemplateHostDO.java | 2 +- .../exec/entity/domain/UploadTaskDO.java | 2 +- .../exec/entity/domain/UploadTaskFileDO.java | 2 +- .../exec/entity/dto/UploadTaskExtraDTO.java | 2 +- .../request/exec/ExecCommandRequest.java | 4 +-- .../request/exec/ExecJobCreateRequest.java | 4 +-- .../request/exec/ExecJobQueryRequest.java | 2 +- .../exec/ExecJobUpdateExecUserRequest.java | 2 +- .../request/exec/ExecJobUpdateRequest.java | 4 +-- .../request/exec/ExecLogClearRequest.java | 2 +- .../request/exec/ExecLogQueryRequest.java | 2 +- .../exec/ExecTemplateCreateRequest.java | 4 +-- .../exec/ExecTemplateQueryRequest.java | 2 +- .../exec/ExecTemplateUpdateRequest.java | 4 +-- .../upload/UploadTaskClearRequest.java | 2 +- .../upload/UploadTaskQueryRequest.java | 2 +- .../module/exec/entity/vo/ExecJobVO.java | 2 +- .../entity/vo/ExecWorkplaceStatisticsVO.java | 2 +- .../command/handler/IExecCommandHandler.java | 2 +- .../exec/handler/exec/job/ExecCommandJob.java | 4 +-- .../handler/exec/log/ExecLogTailHandler.java | 4 +-- .../exec/log/manager/ExecLogManager.java | 4 +-- .../exec/log/tracker/ExecLogTracker.java | 20 +++++++------- .../handler/upload/task/IFileUploadTask.java | 2 +- .../upload/uploader/IFileUploader.java | 2 +- .../interceptor/ExecLogTailInterceptor.java | 4 +-- .../module/exec/service/ExecLogService.java | 4 +-- .../exec/service/UploadTaskService.java | 4 +-- .../service/impl/ExecHostLogServiceImpl.java | 6 ++--- .../service/impl/ExecJobHostServiceImpl.java | 2 +- .../exec/service/impl/ExecLogServiceImpl.java | 26 +++++++++---------- .../impl/ExecTemplateHostServiceImpl.java | 6 ++--- .../impl/UploadTaskFileServiceImpl.java | 4 +-- .../exec/task/ExecLogFileAutoClearTask.java | 6 ++--- .../visor/module/exec/utils/ExecUtils.java | 4 +-- .../api/impl/CommandSnippetApiImpl.java | 2 +- .../api/impl/PathBookmarkApiImpl.java | 2 +- .../controller/CommandSnippetController.java | 8 +++--- .../terminal/dao/CommandSnippetDAO.java | 4 +-- .../module/terminal/dao/PathBookmarkDAO.java | 4 +-- .../cache/CommandSnippetCacheKeyDefine.java | 2 +- .../cache/PathBookmarkCacheKeyDefine.java | 2 +- .../define/message/UploadMessageDefine.java | 2 +- .../entity/domain/CommandSnippetDO.java | 2 +- .../entity/domain/PathBookmarkDO.java | 2 +- .../entity/domain/TerminalConnectLogDO.java | 2 +- .../path/PathBookmarkGroupDeleteRequest.java | 2 +- .../CommandSnippetGroupDeleteRequest.java | 2 +- .../TerminalConnectLogClearRequest.java | 2 +- .../TerminalConnectLogQueryRequest.java | 4 +-- .../terminal/TerminalSftpLogQueryRequest.java | 2 +- .../entity/vo/TerminalConnectLogVO.java | 2 +- .../handler/GuacdInstructionHandler.java | 2 +- .../SftpDownloadFlatDirectoryHandler.java | 4 +-- .../handler/TerminalCloseHandler.java | 2 +- .../terminal/handler/TerminalPingHandler.java | 2 +- .../terminal/model/TerminalChannelProps.java | 2 +- .../config/TerminalSessionSftpConfig.java | 2 +- .../request/GuacdInstructionRequest.java | 2 +- .../model/request/SftpBaseRequest.java | 2 +- .../model/request/SshInputRequest.java | 2 +- .../model/response/SftpBaseResponse.java | 2 +- .../model/response/SshOutputResponse.java | 2 +- .../model/response/SshResizeResponse.java | 2 +- .../response/TerminalClosedResponse.java | 2 +- .../model/response/TerminalSetIdResponse.java | 2 +- .../sender/WebsocketGuacdTerminalSender.java | 2 +- .../sender/WebsocketSftpTerminalSender.java | 3 +-- .../session/AbstractGuacdSession.java | 2 +- .../terminal/session/ITerminalSession.java | 2 +- .../transfer/handler/ITransferHandler.java | 2 +- .../transfer/model/TerminalConnection.java | 2 +- .../transfer/session/DownloadSession.java | 14 +++++----- .../transfer/session/ITransferSession.java | 2 +- .../transfer/session/TransferSession.java | 16 ++++++------ .../transfer/session/UploadSession.java | 6 ++--- .../handler/transfer/utils/TransferUtils.java | 6 ++--- .../TerminalTransferInterceptor.java | 6 ++--- .../impl/CommandSnippetGroupServiceImpl.java | 6 ++--- .../impl/CommandSnippetServiceImpl.java | 10 +++---- .../impl/PathBookmarkGroupServiceImpl.java | 6 ++--- .../CommandSnippetGroupAutoClearTask.java | 2 +- .../task/PathBookmarkGroupAutoClearTask.java | 2 +- .../task/TerminalConnectLogAutoClearTask.java | 6 ++--- .../module/terminal/utils/SftpFileUtils.java | 2 +- 95 files changed, 181 insertions(+), 184 deletions(-) diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java index 29facd9d..38c403bb 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java @@ -44,7 +44,6 @@ public interface GenericsDataModel { return JSON.toJSONString(this); } - /** * 转为 map * diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java index fbd89f9f..02764b9a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/HostConnectApi.java @@ -87,5 +87,4 @@ public interface HostConnectApi { */ RdpConnectConfig getRdpConnectConfig(HostDTO host, Long userId); - } diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java index 2108aeb0..cdb54988 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java @@ -22,6 +22,11 @@ */ package org.dromara.visor.module.exec.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +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.utils.Valid; import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; @@ -39,11 +44,6 @@ import org.dromara.visor.module.exec.entity.vo.ExecLogVO; import org.dromara.visor.module.exec.enums.ExecSourceEnum; import org.dromara.visor.module.exec.service.ExecHostLogService; import org.dromara.visor.module.exec.service.ExecLogService; -import cn.orionsec.kit.lang.define.wrapper.DataGrid; -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.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java index 222c6bc6..d354779c 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java @@ -22,6 +22,11 @@ */ package org.dromara.visor.module.exec.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +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.utils.Valid; import org.dromara.visor.common.validator.group.Page; import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; @@ -38,11 +43,6 @@ import org.dromara.visor.module.exec.entity.vo.ExecLogVO; import org.dromara.visor.module.exec.enums.ExecSourceEnum; import org.dromara.visor.module.exec.service.ExecHostLogService; import org.dromara.visor.module.exec.service.ExecLogService; -import cn.orionsec.kit.lang.define.wrapper.DataGrid; -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.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/UploadTaskController.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/UploadTaskController.java index 346a994d..d189fff1 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/UploadTaskController.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/UploadTaskController.java @@ -22,6 +22,11 @@ */ package org.dromara.visor.module.exec.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +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.log.core.annotation.IgnoreLog; @@ -36,11 +41,6 @@ import org.dromara.visor.module.exec.entity.vo.UploadTaskCreateVO; import org.dromara.visor.module.exec.entity.vo.UploadTaskStatusVO; import org.dromara.visor.module.exec.entity.vo.UploadTaskVO; import org.dromara.visor.module.exec.service.UploadTaskService; -import cn.orionsec.kit.lang.define.wrapper.DataGrid; -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.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/define/cache/ExecCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/define/cache/ExecCacheKeyDefine.java index 34ee5d5a..63029862 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/define/cache/ExecCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/define/cache/ExecCacheKeyDefine.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.define.cache; -import org.dromara.visor.module.exec.entity.dto.ExecLogTailDTO; 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.module.exec.entity.dto.ExecLogTailDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecHostLogDO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecHostLogDO.java index 65a3eeaf..79256ab1 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecHostLogDO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecHostLogDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.exec.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecJobDO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecJobDO.java index 07fe7e62..1368d63e 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecJobDO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecJobDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.exec.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 计划任务 实体对象 diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecLogDO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecLogDO.java index 9c583dc3..9b0d9c9b 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecLogDO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecLogDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.exec.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateDO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateDO.java index aae73166..ed70e719 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateDO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.exec.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 执行模板 实体对象 diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateHostDO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateHostDO.java index 4776360e..a46fdb36 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateHostDO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/ExecTemplateHostDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.exec.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 执行模板主机 实体对象 diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskDO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskDO.java index 3d3fc45f..4efacc48 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskDO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.exec.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskFileDO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskFileDO.java index b71f62e6..a91330fa 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskFileDO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/domain/UploadTaskFileDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.exec.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/dto/UploadTaskExtraDTO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/dto/UploadTaskExtraDTO.java index 594cc861..18775cf8 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/dto/UploadTaskExtraDTO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/dto/UploadTaskExtraDTO.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.exec.entity.dto; -import org.dromara.visor.module.asset.entity.dto.host.HostBaseDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.asset.entity.dto.host.HostBaseDTO; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecCommandRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecCommandRequest.java index 49a414eb..a7b3733d 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecCommandRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecCommandRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; -import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobCreateRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobCreateRequest.java index 7a1f2879..959f963b 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobCreateRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; -import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobQueryRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobQueryRequest.java index 649dd739..38be96ae 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobQueryRequest.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.common.entity.BaseQueryRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateExecUserRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateExecUserRequest.java index 80134fa7..0408a580 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateExecUserRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateExecUserRequest.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.common.entity.BaseQueryRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateRequest.java index 49404595..5b80fbb8 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecJobUpdateRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; -import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogClearRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogClearRequest.java index 2639fe59..19fee089 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogClearRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.common.entity.DataClearRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +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-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogQueryRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogQueryRequest.java index 88110094..d6cb48d9 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecLogQueryRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.common.entity.BaseQueryRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateCreateRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateCreateRequest.java index c276a289..8000e69e 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateCreateRequest.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; -import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateQueryRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateQueryRequest.java index 50a1c909..d3b697f9 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateQueryRequest.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.common.entity.BaseQueryRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateUpdateRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateUpdateRequest.java index 942a3ca8..6a4193c1 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/exec/ExecTemplateUpdateRequest.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.exec.entity.request.exec; -import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; -import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskClearRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskClearRequest.java index 7ac89692..bbd6a902 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskClearRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskClearRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.entity.request.upload; -import org.dromara.visor.common.entity.DataClearRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +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-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskQueryRequest.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskQueryRequest.java index 49a42ee4..ff9e15b4 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/request/upload/UploadTaskQueryRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.entity.request.upload; -import org.dromara.visor.common.entity.BaseQueryRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecJobVO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecJobVO.java index d2ede11e..a199a8e6 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecJobVO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecJobVO.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.exec.entity.vo; -import org.dromara.visor.module.asset.entity.dto.host.HostBaseDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.asset.entity.dto.host.HostBaseDTO; import java.io.Serializable; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecWorkplaceStatisticsVO.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecWorkplaceStatisticsVO.java index 16179dad..f8d6d630 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecWorkplaceStatisticsVO.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/entity/vo/ExecWorkplaceStatisticsVO.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.exec.entity.vo; -import org.dromara.visor.common.entity.chart.LineSingleChartData; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/IExecCommandHandler.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/IExecCommandHandler.java index f104bf56..52231c3f 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/IExecCommandHandler.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/IExecCommandHandler.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.module.exec.handler.exec.command.handler; -import org.dromara.visor.module.exec.enums.ExecHostStatusEnum; import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.exec.enums.ExecHostStatusEnum; /** * 命令执行器定义 diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/job/ExecCommandJob.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/job/ExecCommandJob.java index 5cadf130..97853e09 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/job/ExecCommandJob.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/job/ExecCommandJob.java @@ -22,6 +22,8 @@ */ package org.dromara.visor.module.exec.handler.exec.job; +import cn.orionsec.kit.spring.SpringHolder; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.module.exec.dao.ExecJobDAO; @@ -29,8 +31,6 @@ import org.dromara.visor.module.exec.entity.domain.ExecJobDO; import org.dromara.visor.module.exec.entity.request.exec.ExecJobTriggerRequest; import org.dromara.visor.module.exec.enums.ExecModeEnum; import org.dromara.visor.module.exec.service.ExecJobService; -import cn.orionsec.kit.spring.SpringHolder; -import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/ExecLogTailHandler.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/ExecLogTailHandler.java index fc2f2e12..5386362a 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/ExecLogTailHandler.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/ExecLogTailHandler.java @@ -22,6 +22,8 @@ */ package org.dromara.visor.module.exec.handler.exec.log; +import cn.orionsec.kit.lang.utils.Strings; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.exec.define.ExecThreadPools; @@ -29,8 +31,6 @@ import org.dromara.visor.module.exec.entity.dto.ExecLogTailDTO; import org.dromara.visor.module.exec.handler.exec.log.constant.LogConst; import org.dromara.visor.module.exec.handler.exec.log.manager.ExecLogManager; import org.dromara.visor.module.exec.handler.exec.log.tracker.ExecLogTracker; -import cn.orionsec.kit.lang.utils.Strings; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/manager/ExecLogManager.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/manager/ExecLogManager.java index 63a814ec..541689fe 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/manager/ExecLogManager.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/manager/ExecLogManager.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.handler.exec.log.manager; -import org.dromara.visor.common.constant.Const; -import org.dromara.visor.module.exec.handler.exec.log.tracker.IExecLogTracker; import cn.orionsec.kit.lang.utils.Threads; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.module.exec.handler.exec.log.tracker.IExecLogTracker; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java index d1158921..483c8360 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java @@ -22,16 +22,6 @@ */ package org.dromara.visor.module.exec.handler.exec.log.tracker; -import org.dromara.visor.common.constant.Const; -import org.dromara.visor.common.constant.ErrorMessage; -import org.dromara.visor.common.interfaces.FileClient; -import org.dromara.visor.common.utils.Valid; -import org.dromara.visor.framework.websocket.core.utils.WebSockets; -import org.dromara.visor.module.common.config.AppLogConfig; -import org.dromara.visor.module.exec.dao.ExecHostLogDAO; -import org.dromara.visor.module.exec.entity.domain.ExecHostLogDO; -import org.dromara.visor.module.exec.enums.ExecHostStatusEnum; -import org.dromara.visor.module.exec.handler.exec.log.constant.LogConst; import cn.orionsec.kit.ext.tail.Tracker; import cn.orionsec.kit.ext.tail.delay.DelayTrackerListener; import cn.orionsec.kit.ext.tail.mode.FileNotFoundMode; @@ -46,6 +36,16 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.interfaces.FileClient; +import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.common.config.AppLogConfig; +import org.dromara.visor.module.exec.dao.ExecHostLogDAO; +import org.dromara.visor.module.exec.entity.domain.ExecHostLogDO; +import org.dromara.visor.module.exec.enums.ExecHostStatusEnum; +import org.dromara.visor.module.exec.handler.exec.log.constant.LogConst; import org.springframework.web.socket.WebSocketSession; import java.io.IOException; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/task/IFileUploadTask.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/task/IFileUploadTask.java index 290b01d0..de064a2a 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/task/IFileUploadTask.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/task/IFileUploadTask.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.module.exec.handler.upload.task; -import org.dromara.visor.module.exec.handler.upload.uploader.IFileUploader; import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.exec.handler.upload.uploader.IFileUploader; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/uploader/IFileUploader.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/uploader/IFileUploader.java index f773878d..2f22f2cf 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/uploader/IFileUploader.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/uploader/IFileUploader.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.module.exec.handler.upload.uploader; -import org.dromara.visor.module.exec.handler.upload.model.FileUploadFileItemDTO; import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.exec.handler.upload.model.FileUploadFileItemDTO; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/interceptor/ExecLogTailInterceptor.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/interceptor/ExecLogTailInterceptor.java index e77424f3..c7851160 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/interceptor/ExecLogTailInterceptor.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/interceptor/ExecLogTailInterceptor.java @@ -22,11 +22,11 @@ */ package org.dromara.visor.module.exec.interceptor; +import cn.orionsec.kit.lang.utils.Urls; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.module.exec.entity.dto.ExecLogTailDTO; import org.dromara.visor.module.exec.service.ExecLogService; -import cn.orionsec.kit.lang.utils.Urls; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/ExecLogService.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/ExecLogService.java index 05c3206d..ff2e98bf 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/ExecLogService.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/ExecLogService.java @@ -22,14 +22,14 @@ */ package org.dromara.visor.module.exec.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.visor.module.exec.entity.domain.ExecLogDO; import org.dromara.visor.module.exec.entity.dto.ExecLogTailDTO; import org.dromara.visor.module.exec.entity.request.exec.ExecLogClearRequest; import org.dromara.visor.module.exec.entity.request.exec.ExecLogQueryRequest; import org.dromara.visor.module.exec.entity.vo.ExecLogStatusVO; import org.dromara.visor.module.exec.entity.vo.ExecLogVO; -import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/UploadTaskService.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/UploadTaskService.java index 8e5b89fd..026172bb 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/UploadTaskService.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/UploadTaskService.java @@ -22,6 +22,8 @@ */ package org.dromara.visor.module.exec.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.visor.module.exec.entity.domain.UploadTaskDO; import org.dromara.visor.module.exec.entity.request.upload.UploadTaskClearRequest; import org.dromara.visor.module.exec.entity.request.upload.UploadTaskCreateRequest; @@ -30,8 +32,6 @@ import org.dromara.visor.module.exec.entity.request.upload.UploadTaskRequest; import org.dromara.visor.module.exec.entity.vo.UploadTaskCreateVO; import org.dromara.visor.module.exec.entity.vo.UploadTaskStatusVO; import org.dromara.visor.module.exec.entity.vo.UploadTaskVO; -import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java index 5dcbf73a..ffbb8eb0 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java @@ -22,6 +22,9 @@ */ package org.dromara.visor.module.exec.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.ErrorMessage; import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; @@ -33,9 +36,6 @@ import org.dromara.visor.module.exec.handler.exec.command.handler.IExecCommandHa import org.dromara.visor.module.exec.handler.exec.command.handler.IExecTaskHandler; import org.dromara.visor.module.exec.handler.exec.command.manager.ExecTaskManager; import org.dromara.visor.module.exec.service.ExecHostLogService; -import cn.orionsec.kit.lang.utils.collect.Lists; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobHostServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobHostServiceImpl.java index 07d69454..354094ab 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobHostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobHostServiceImpl.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.exec.service.impl; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.exec.dao.ExecJobHostDAO; import org.dromara.visor.module.exec.entity.domain.ExecJobHostDO; import org.dromara.visor.module.exec.service.ExecJobHostService; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java index 499332d2..6c7483ff 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java @@ -22,6 +22,19 @@ */ package org.dromara.visor.module.exec.service.impl; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.spring.SpringHolder; +import cn.orionsec.kit.web.servlet.web.Servlets; +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.constant.FileConst; @@ -52,19 +65,6 @@ import org.dromara.visor.module.exec.handler.exec.command.handler.IExecTaskHandl import org.dromara.visor.module.exec.handler.exec.command.manager.ExecTaskManager; import org.dromara.visor.module.exec.service.ExecHostLogService; import org.dromara.visor.module.exec.service.ExecLogService; -import cn.orionsec.kit.lang.annotation.Keep; -import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import cn.orionsec.kit.lang.id.UUIds; -import cn.orionsec.kit.lang.utils.Arrays1; -import cn.orionsec.kit.lang.utils.Strings; -import cn.orionsec.kit.lang.utils.collect.Lists; -import cn.orionsec.kit.lang.utils.io.Files1; -import cn.orionsec.kit.lang.utils.io.Streams; -import cn.orionsec.kit.spring.SpringHolder; -import cn.orionsec.kit.web.servlet.web.Servlets; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateHostServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateHostServiceImpl.java index e622994c..fd24af92 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateHostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateHostServiceImpl.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.exec.service.impl; -import org.dromara.visor.module.exec.dao.ExecTemplateHostDAO; -import org.dromara.visor.module.exec.entity.domain.ExecTemplateHostDO; -import org.dromara.visor.module.exec.service.ExecTemplateHostService; import cn.orionsec.kit.lang.function.Functions; 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.module.exec.dao.ExecTemplateHostDAO; +import org.dromara.visor.module.exec.entity.domain.ExecTemplateHostDO; +import org.dromara.visor.module.exec.service.ExecTemplateHostService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskFileServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskFileServiceImpl.java index 3ef8872b..6b57b2b1 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskFileServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskFileServiceImpl.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.exec.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.exec.convert.UploadTaskFileConvert; import org.dromara.visor.module.exec.dao.UploadTaskFileDAO; import org.dromara.visor.module.exec.entity.domain.UploadTaskFileDO; import org.dromara.visor.module.exec.entity.vo.UploadTaskFileVO; import org.dromara.visor.module.exec.service.UploadTaskFileService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/task/ExecLogFileAutoClearTask.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/task/ExecLogFileAutoClearTask.java index ac5426d0..8e9e9c83 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/task/ExecLogFileAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/task/ExecLogFileAutoClearTask.java @@ -22,15 +22,15 @@ */ package org.dromara.visor.module.exec.task; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.time.Dates; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.common.config.AppAutoClearConfig; import org.dromara.visor.module.exec.entity.request.exec.ExecLogClearRequest; import org.dromara.visor.module.exec.enums.ExecStatusEnum; import org.dromara.visor.module.exec.service.ExecLogService; -import cn.orionsec.kit.lang.utils.Booleans; -import cn.orionsec.kit.lang.utils.time.Dates; -import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java index 05cb7ef4..ae5a21c3 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java @@ -22,8 +22,6 @@ */ package org.dromara.visor.module.exec.utils; -import org.dromara.visor.common.constant.Const; -import org.dromara.visor.module.exec.entity.dto.ExecParameterSchemaDTO; import cn.orionsec.kit.lang.function.Functions; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; @@ -32,6 +30,8 @@ import cn.orionsec.kit.lang.utils.json.matcher.NoMatchStrategy; import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatter; import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters; import com.alibaba.fastjson.JSON; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.module.exec.entity.dto.ExecParameterSchemaDTO; import java.util.List; import java.util.Map; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/CommandSnippetApiImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/CommandSnippetApiImpl.java index bcd270e2..4580cf76 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/CommandSnippetApiImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/CommandSnippetApiImpl.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.terminal.api.impl; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.terminal.api.CommandSnippetApi; import org.dromara.visor.module.terminal.service.CommandSnippetService; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/PathBookmarkApiImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/PathBookmarkApiImpl.java index 5698212c..674b8252 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/PathBookmarkApiImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/api/impl/PathBookmarkApiImpl.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.terminal.api.impl; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.terminal.api.PathBookmarkApi; import org.dromara.visor.module.terminal.service.PathBookmarkService; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/controller/CommandSnippetController.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/controller/CommandSnippetController.java index 5c413350..95a7adc9 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/controller/CommandSnippetController.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/controller/CommandSnippetController.java @@ -22,6 +22,10 @@ */ package org.dromara.visor.module.terminal.controller; +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.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; @@ -29,10 +33,6 @@ import org.dromara.visor.module.terminal.entity.request.snippet.CommandSnippetCr import org.dromara.visor.module.terminal.entity.request.snippet.CommandSnippetUpdateRequest; import org.dromara.visor.module.terminal.entity.vo.CommandSnippetWrapperVO; import org.dromara.visor.module.terminal.service.CommandSnippetService; -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.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/CommandSnippetDAO.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/CommandSnippetDAO.java index 07ed71ba..75d5162f 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/CommandSnippetDAO.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/CommandSnippetDAO.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.dao; -import org.dromara.visor.framework.mybatis.core.mapper.IMapper; -import org.dromara.visor.module.terminal.entity.domain.CommandSnippetDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.terminal.entity.domain.CommandSnippetDO; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/PathBookmarkDAO.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/PathBookmarkDAO.java index 1acacd0d..502ec3b3 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/PathBookmarkDAO.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/dao/PathBookmarkDAO.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.dao; -import org.dromara.visor.framework.mybatis.core.mapper.IMapper; -import org.dromara.visor.module.terminal.entity.domain.PathBookmarkDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.terminal.entity.domain.PathBookmarkDO; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/CommandSnippetCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/CommandSnippetCacheKeyDefine.java index b680e72f..e3d3f7c7 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/CommandSnippetCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/CommandSnippetCacheKeyDefine.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.terminal.define.cache; -import org.dromara.visor.module.terminal.entity.dto.CommandSnippetCacheDTO; 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.module.terminal.entity.dto.CommandSnippetCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/PathBookmarkCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/PathBookmarkCacheKeyDefine.java index adb645ac..0d1257cc 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/PathBookmarkCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/cache/PathBookmarkCacheKeyDefine.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.terminal.define.cache; -import org.dromara.visor.module.terminal.entity.dto.PathBookmarkCacheDTO; 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.module.terminal.entity.dto.PathBookmarkCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/message/UploadMessageDefine.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/message/UploadMessageDefine.java index bbfb5742..75977f90 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/message/UploadMessageDefine.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/define/message/UploadMessageDefine.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.terminal.define.message; +import lombok.Getter; import org.dromara.visor.module.infra.define.SystemMessageDefine; import org.dromara.visor.module.infra.enums.MessageClassifyEnum; -import lombok.Getter; /** * 上传任务 系统消息定义 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/CommandSnippetDO.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/CommandSnippetDO.java index ce36ee68..fe75a6f8 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/CommandSnippetDO.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/CommandSnippetDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.terminal.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 命令片段 实体对象 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/PathBookmarkDO.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/PathBookmarkDO.java index 4a7a0f1f..81a7fc5b 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/PathBookmarkDO.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/PathBookmarkDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.terminal.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 路径标签 实体对象 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/TerminalConnectLogDO.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/TerminalConnectLogDO.java index 10c9a2f5..ff0c4424 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/TerminalConnectLogDO.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/domain/TerminalConnectLogDO.java @@ -22,7 +22,6 @@ */ package org.dromara.visor.module.terminal.entity.domain; -import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,6 +30,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/path/PathBookmarkGroupDeleteRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/path/PathBookmarkGroupDeleteRequest.java index 048ca6ca..f863edec 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/path/PathBookmarkGroupDeleteRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/path/PathBookmarkGroupDeleteRequest.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.entity.request.path; -import org.dromara.visor.common.validator.group.Id; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +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-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/snippet/CommandSnippetGroupDeleteRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/snippet/CommandSnippetGroupDeleteRequest.java index a5c3b194..cb39fc28 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/snippet/CommandSnippetGroupDeleteRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/snippet/CommandSnippetGroupDeleteRequest.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.entity.request.snippet; -import org.dromara.visor.common.validator.group.Id; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +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-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogClearRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogClearRequest.java index 5e0fe1b4..974bed48 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogClearRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.terminal.entity.request.terminal; -import org.dromara.visor.common.entity.DataClearRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +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-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogQueryRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogQueryRequest.java index 675d4034..f254be07 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalConnectLogQueryRequest.java @@ -22,11 +22,11 @@ */ package org.dromara.visor.module.terminal.entity.request.terminal; -import org.dromara.visor.common.entity.BaseQueryRequest; -import org.dromara.visor.common.validator.group.Id; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.common.entity.BaseQueryRequest; +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-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalSftpLogQueryRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalSftpLogQueryRequest.java index 999f2272..c48a2deb 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalSftpLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/request/terminal/TerminalSftpLogQueryRequest.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.terminal.entity.request.terminal; -import org.dromara.visor.common.entity.BaseQueryRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalConnectLogVO.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalConnectLogVO.java index 53bbc489..24313a49 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalConnectLogVO.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalConnectLogVO.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.entity.vo; -import org.dromara.visor.module.terminal.entity.dto.TerminalConnectLogExtraDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.terminal.entity.dto.TerminalConnectLogExtraDTO; import java.io.Serializable; import java.util.Date; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/GuacdInstructionHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/GuacdInstructionHandler.java index a46472f9..854bc582 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/GuacdInstructionHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/GuacdInstructionHandler.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.handler; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps; import org.dromara.visor.module.terminal.handler.terminal.model.request.GuacdInstructionRequest; import org.dromara.visor.module.terminal.handler.terminal.sender.IGuacdTerminalSender; import org.dromara.visor.module.terminal.handler.terminal.session.IRdpSession; import org.dromara.visor.module.terminal.handler.terminal.session.ITerminalSession; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; /** diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/SftpDownloadFlatDirectoryHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/SftpDownloadFlatDirectoryHandler.java index a0890570..eaa03ac8 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/SftpDownloadFlatDirectoryHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/SftpDownloadFlatDirectoryHandler.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.terminal.handler.terminal.handler; +import cn.orionsec.kit.lang.utils.collect.Lists; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps; import org.dromara.visor.module.terminal.handler.terminal.model.request.SftpDownloadFlatDirectoryRequest; import org.dromara.visor.module.terminal.handler.terminal.model.response.SftpFileVO; import org.dromara.visor.module.terminal.handler.terminal.sender.ISftpTerminalSender; import org.dromara.visor.module.terminal.handler.terminal.session.ISftpSession; -import cn.orionsec.kit.lang.utils.collect.Lists; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.Arrays; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalCloseHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalCloseHandler.java index 7427ee2e..180f82f2 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalCloseHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalCloseHandler.java @@ -22,11 +22,11 @@ */ package org.dromara.visor.module.terminal.handler.terminal.handler; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps; import org.dromara.visor.module.terminal.handler.terminal.sender.ITerminalSender; import org.dromara.visor.module.terminal.handler.terminal.session.ITerminalSession; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; /** diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalPingHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalPingHandler.java index 1d5ba295..156e3cb3 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalPingHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalPingHandler.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.handler; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.terminal.handler.terminal.enums.SessionTypeEnum; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps; import org.dromara.visor.module.terminal.handler.terminal.sender.ITerminalSender; import org.dromara.visor.module.terminal.handler.terminal.session.ITerminalSession; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; /** diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelProps.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelProps.java index 8675fd96..0d9405c0 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelProps.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/TerminalChannelProps.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model; -import org.dromara.visor.common.entity.RequestIdentity; import cn.orionsec.kit.lang.define.collect.MutableMap; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.common.entity.RequestIdentity; /** * 终端连接属性 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionSftpConfig.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionSftpConfig.java index f82c0dc7..47be7755 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionSftpConfig.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/config/TerminalSessionSftpConfig.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.config; -import org.dromara.visor.common.session.config.SshConnectConfig; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.common.session.config.SshConnectConfig; /** * 终端会话配置 SFTP diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/GuacdInstructionRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/GuacdInstructionRequest.java index 223d4afc..b15caf72 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/GuacdInstructionRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/GuacdInstructionRequest.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.request; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * guacd 指令请求 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SftpBaseRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SftpBaseRequest.java index aea2519a..5312c828 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SftpBaseRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SftpBaseRequest.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.request; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * sftp 基础请求 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SshInputRequest.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SshInputRequest.java index 291b7200..3d3d1b02 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SshInputRequest.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/request/SshInputRequest.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.request; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * ssh 输入请求 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SftpBaseResponse.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SftpBaseResponse.java index a83d0239..05f86fe5 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SftpBaseResponse.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SftpBaseResponse.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.response; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * sftp 基础响应 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshOutputResponse.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshOutputResponse.java index fb46e00e..71cbef8d 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshOutputResponse.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshOutputResponse.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.response; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * ssh 输出响应 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshResizeResponse.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshResizeResponse.java index bddd6378..80efa818 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshResizeResponse.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/SshResizeResponse.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.response; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * ssh 重置大小响应 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalClosedResponse.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalClosedResponse.java index acc9569e..350b3523 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalClosedResponse.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalClosedResponse.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.response; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * 终端连接已关闭响应 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalSetIdResponse.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalSetIdResponse.java index ee8cc475..d5446143 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalSetIdResponse.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/model/response/TerminalSetIdResponse.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.terminal.model.response; -import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; /** * 终端设置 id 响应 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketGuacdTerminalSender.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketGuacdTerminalSender.java index 147c721f..c61f213e 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketGuacdTerminalSender.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketGuacdTerminalSender.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.terminal.handler.terminal.sender; +import org.apache.guacamole.protocol.GuacamoleInstruction; import org.dromara.visor.module.terminal.handler.terminal.enums.OutputProtocolEnum; import org.dromara.visor.module.terminal.handler.terminal.model.response.GuacdInstructionResponse; -import org.apache.guacamole.protocol.GuacamoleInstruction; import org.springframework.web.socket.WebSocketSession; /** diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java index 1139b24a..3935f2ef 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java @@ -22,11 +22,10 @@ */ package org.dromara.visor.module.terminal.handler.terminal.sender; +import com.alibaba.fastjson.JSON; import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.terminal.handler.terminal.enums.OutputProtocolEnum; import org.dromara.visor.module.terminal.handler.terminal.model.response.*; -import com.alibaba.fastjson.JSON; -import org.dromara.visor.module.terminal.handler.terminal.model.response.*; import org.springframework.web.socket.WebSocketSession; import java.util.List; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/AbstractGuacdSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/AbstractGuacdSession.java index 0f914558..9efc29a9 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/AbstractGuacdSession.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/AbstractGuacdSession.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.terminal.handler.terminal.session; +import cn.orionsec.kit.lang.utils.Exceptions; import org.dromara.visor.module.terminal.define.TerminalThreadPools; import org.dromara.visor.module.terminal.handler.guacd.IGuacdTunnel; import org.dromara.visor.module.terminal.handler.terminal.constant.TerminalMessage; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps; import org.dromara.visor.module.terminal.handler.terminal.model.config.ITerminalSessionConfig; import org.dromara.visor.module.terminal.handler.terminal.sender.IGuacdTerminalSender; -import cn.orionsec.kit.lang.utils.Exceptions; /** * guacd 会话基类 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/ITerminalSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/ITerminalSession.java index 820ea1f5..37ab190d 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/ITerminalSession.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/ITerminalSession.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.module.terminal.handler.terminal.session; -import org.dromara.visor.module.terminal.handler.terminal.model.config.ITerminalSessionConfig; import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.terminal.handler.terminal.model.config.ITerminalSessionConfig; /** * 终端会话定义 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/handler/ITransferHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/handler/ITransferHandler.java index e5fc8d1b..06aa2b83 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/handler/ITransferHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/handler/ITransferHandler.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.terminal.handler.transfer.handler; +import cn.orionsec.kit.lang.able.SafeCloseable; import org.dromara.visor.module.terminal.handler.transfer.model.TransferOperatorRequest; import org.dromara.visor.module.terminal.handler.transfer.session.ITransferSession; -import cn.orionsec.kit.lang.able.SafeCloseable; /** * 传输处理器定义 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/model/TerminalConnection.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/model/TerminalConnection.java index 1792f9cf..2d338e8d 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/model/TerminalConnection.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/model/TerminalConnection.java @@ -22,12 +22,12 @@ */ package org.dromara.visor.module.terminal.handler.transfer.model; -import org.dromara.visor.common.session.config.SshConnectConfig; import cn.orionsec.kit.net.host.SessionStore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.common.session.config.SshConnectConfig; /** * 终端连接信息 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/DownloadSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/DownloadSession.java index 2abebf17..6e57bc80 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/DownloadSession.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/DownloadSession.java @@ -22,6 +22,13 @@ */ package org.dromara.visor.module.terminal.handler.transfer.session; +import cn.orionsec.kit.lang.define.wrapper.Ref; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.Valid; +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.common.constant.Const; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.session.config.SshConnectConfig; @@ -30,13 +37,6 @@ import org.dromara.visor.module.terminal.define.operator.TerminalOperatorType; import org.dromara.visor.module.terminal.handler.transfer.enums.TransferReceiver; import org.dromara.visor.module.terminal.handler.transfer.model.TransferOperatorRequest; import org.dromara.visor.module.terminal.handler.transfer.utils.TransferUtils; -import cn.orionsec.kit.lang.define.wrapper.Ref; -import cn.orionsec.kit.lang.utils.Threads; -import cn.orionsec.kit.lang.utils.Valid; -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.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/ITransferSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/ITransferSession.java index 37d9e3fe..cc785e44 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/ITransferSession.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/ITransferSession.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.module.terminal.handler.transfer.session; -import org.dromara.visor.module.terminal.handler.transfer.model.TransferOperatorRequest; import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.terminal.handler.transfer.model.TransferOperatorRequest; /** * 主机传输会话定义 diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/TransferSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/TransferSession.java index 2ce2dcc6..a65240fb 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/TransferSession.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/TransferSession.java @@ -22,6 +22,14 @@ */ package org.dromara.visor.module.terminal.handler.transfer.session; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import lombok.Getter; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.common.session.config.SshConnectConfig; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; @@ -33,14 +41,6 @@ import org.dromara.visor.module.terminal.handler.terminal.utils.TerminalUtils; import org.dromara.visor.module.terminal.handler.transfer.enums.TransferReceiver; import org.dromara.visor.module.terminal.handler.transfer.model.TransferOperatorRequest; import org.dromara.visor.module.terminal.handler.transfer.utils.TransferUtils; -import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; -import cn.orionsec.kit.lang.utils.collect.Maps; -import cn.orionsec.kit.lang.utils.io.Streams; -import cn.orionsec.kit.net.host.SessionStore; -import cn.orionsec.kit.net.host.sftp.SftpExecutor; -import lombok.Getter; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; import java.util.Map; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/UploadSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/UploadSession.java index f1a5998d..30955a2b 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/UploadSession.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/session/UploadSession.java @@ -22,15 +22,15 @@ */ package org.dromara.visor.module.terminal.handler.transfer.session; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.session.config.SshConnectConfig; import org.dromara.visor.module.common.utils.SftpUtils; import org.dromara.visor.module.terminal.define.operator.TerminalOperatorType; import org.dromara.visor.module.terminal.handler.transfer.enums.TransferReceiver; import org.dromara.visor.module.terminal.handler.transfer.model.TransferOperatorRequest; import org.dromara.visor.module.terminal.handler.transfer.utils.TransferUtils; -import cn.orionsec.kit.lang.utils.io.Streams; -import cn.orionsec.kit.net.host.SessionStore; -import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; import java.io.IOException; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java index 5736cb25..19e8f7d7 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java @@ -22,13 +22,13 @@ */ package org.dromara.visor.module.terminal.handler.transfer.utils; +import cn.orionsec.kit.lang.utils.Strings; +import com.alibaba.fastjson.JSON; +import org.apache.catalina.connector.ClientAbortException; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.dromara.visor.module.terminal.handler.transfer.enums.TransferReceiver; import org.dromara.visor.module.terminal.handler.transfer.model.TransferOperatorResponse; -import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; -import org.apache.catalina.connector.ClientAbortException; import org.springframework.web.socket.WebSocketSession; import java.util.function.Consumer; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalTransferInterceptor.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalTransferInterceptor.java index 57376ade..9e0b5498 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalTransferInterceptor.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalTransferInterceptor.java @@ -22,6 +22,9 @@ */ package org.dromara.visor.module.terminal.interceptor; +import cn.orionsec.kit.lang.define.collect.MutableHashMap; +import cn.orionsec.kit.lang.utils.Urls; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.common.trace.TraceIdHolder; import org.dromara.visor.common.utils.Requests; @@ -31,9 +34,6 @@ import org.dromara.visor.module.terminal.handler.terminal.enums.SessionTypeEnum; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelExtra; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalChannelProps; import org.dromara.visor.module.terminal.service.TerminalService; -import cn.orionsec.kit.lang.define.collect.MutableHashMap; -import cn.orionsec.kit.lang.utils.Urls; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java index 44f2c5c2..84394f0c 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java @@ -22,6 +22,9 @@ */ package org.dromara.visor.module.terminal.service.impl; +import cn.orionsec.kit.lang.utils.Booleans; +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; @@ -41,9 +44,6 @@ import org.dromara.visor.module.terminal.entity.request.snippet.CommandSnippetGr import org.dromara.visor.module.terminal.entity.vo.CommandSnippetGroupVO; import org.dromara.visor.module.terminal.service.CommandSnippetGroupService; import org.dromara.visor.module.terminal.service.CommandSnippetService; -import cn.orionsec.kit.lang.utils.Booleans; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java index f44dee2d..8629443c 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java @@ -22,6 +22,11 @@ */ package org.dromara.visor.module.terminal.service.impl; +import com.alibaba.fastjson.JSON; +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.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.redis.core.utils.RedisMaps; @@ -39,11 +44,6 @@ import org.dromara.visor.module.terminal.entity.vo.CommandSnippetVO; import org.dromara.visor.module.terminal.entity.vo.CommandSnippetWrapperVO; import org.dromara.visor.module.terminal.service.CommandSnippetGroupService; import org.dromara.visor.module.terminal.service.CommandSnippetService; -import com.alibaba.fastjson.JSON; -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.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java index 478af069..f964471e 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java @@ -22,6 +22,9 @@ */ package org.dromara.visor.module.terminal.service.impl; +import cn.orionsec.kit.lang.utils.Booleans; +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; @@ -41,9 +44,6 @@ import org.dromara.visor.module.terminal.entity.request.path.PathBookmarkGroupUp import org.dromara.visor.module.terminal.entity.vo.PathBookmarkGroupVO; import org.dromara.visor.module.terminal.service.PathBookmarkGroupService; import org.dromara.visor.module.terminal.service.PathBookmarkService; -import cn.orionsec.kit.lang.utils.Booleans; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/CommandSnippetGroupAutoClearTask.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/CommandSnippetGroupAutoClearTask.java index abd1d686..a0d77072 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/CommandSnippetGroupAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/CommandSnippetGroupAutoClearTask.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.terminal.task; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.terminal.service.CommandSnippetGroupService; -import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/PathBookmarkGroupAutoClearTask.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/PathBookmarkGroupAutoClearTask.java index dd2f0f0e..f1af9525 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/PathBookmarkGroupAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/PathBookmarkGroupAutoClearTask.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.module.terminal.task; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.terminal.service.PathBookmarkGroupService; -import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/TerminalConnectLogAutoClearTask.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/TerminalConnectLogAutoClearTask.java index 6810a7f3..806f7820 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/TerminalConnectLogAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/TerminalConnectLogAutoClearTask.java @@ -22,15 +22,15 @@ */ package org.dromara.visor.module.terminal.task; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.time.Dates; +import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.utils.LockerUtils; import org.dromara.visor.module.common.config.AppAutoClearConfig; import org.dromara.visor.module.terminal.entity.request.terminal.TerminalConnectLogClearRequest; import org.dromara.visor.module.terminal.enums.TerminalConnectStatusEnum; import org.dromara.visor.module.terminal.service.TerminalConnectLogService; -import cn.orionsec.kit.lang.utils.Booleans; -import cn.orionsec.kit.lang.utils.time.Dates; -import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java index 1ce4b547..27eb64e5 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java @@ -22,10 +22,10 @@ */ package org.dromara.visor.module.terminal.utils; -import org.dromara.visor.module.terminal.handler.terminal.model.response.SftpFileVO; import cn.orionsec.kit.lang.utils.io.FileType; import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.kit.net.host.sftp.SftpFile; +import org.dromara.visor.module.terminal.handler.terminal.model.response.SftpFileVO; import java.util.Optional;