🎨 格式化代码.

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
      *

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);
 
-
 }

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

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

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

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;
 

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;
 

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;
 
 /**
  * 计划任务 实体对象

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;
 

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;
 
 /**
  * 执行模板 实体对象

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;
 
 /**
  * 执行模板主机 实体对象

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;
 

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;
 

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;
 

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;
 

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;
 
 /**
  * 命令执行器定义

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;
 

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;

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;

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;

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;
 

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;
 

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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

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;
 

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;
 

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;
 

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;
 

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;
 
 /**
  * 上传任务 系统消息定义

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;
 
 /**
  * 命令片段 实体对象

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;
 
 /**
  * 路径标签 实体对象

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;
 

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;

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;

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;

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;

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;

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;

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

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;

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

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

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;
 
 /**
  * 终端连接属性

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

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 指令请求

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 基础请求

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 输入请求

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 基础响应

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 输出响应

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 重置大小响应

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;
 
 /**
  * 终端连接已关闭响应

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 响应

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

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;

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 会话基类

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;
 
 /**
  * 终端会话定义

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;
 
 /**
  * 传输处理器定义

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;
 
 /**
  * 终端连接信息

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;
 

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;
 
 /**
  * 主机传输会话定义

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;

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;

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;

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;

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;