From 2bd7dfd5b8bc79e184f052c6b8cc0392dd8e53eb Mon Sep 17 00:00:00 2001 From: lijiahang Date: Fri, 7 Jun 2024 16:05:26 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E8=A7=84=E8=8C=83=E5=8C=96=E6=B3=A8?= =?UTF-8?q?=E9=87=8A.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../host/config/model/HostSshConfigModel.java | 54 ++-- .../host/exec/command/ExecTaskExecutors.java | 2 +- .../exec/command/handler/ExecTaskHandler.java | 2 +- .../exec/command/model/ExecCommandDTO.java | 34 ++- .../command/model/ExecCommandHostDTO.java | 46 +++- .../host/extra/model/HostLabelExtraModel.java | 10 +- .../host/extra/model/HostSshExtraModel.java | 18 +- .../terminal/model/TerminalBasePayload.java | 10 +- .../host/terminal/model/TerminalConfig.java | 40 ++- .../model/request/SftpBaseRequest.java | 6 +- .../model/request/SftpChangeModRequest.java | 6 +- .../SftpDownloadFlatDirectoryRequest.java | 6 +- .../model/request/SftpListRequest.java | 6 +- .../model/request/SftpMoveRequest.java | 6 +- .../model/request/SftpSetContentRequest.java | 6 +- .../model/request/SshInputRequest.java | 6 +- .../model/request/SshResizeRequest.java | 10 +- .../model/request/TerminalCheckRequest.java | 10 +- .../model/request/TerminalConnectRequest.java | 14 +- .../model/response/SftpBaseResponse.java | 10 +- .../SftpDownloadFlatDirectoryResponse.java | 10 +- .../terminal/model/response/SftpFileVO.java | 42 +++- .../response/SftpGetContentResponse.java | 10 +- .../model/response/SftpListResponse.java | 10 +- .../model/response/SshOutputResponse.java | 6 +- .../model/response/TerminalCheckResponse.java | 10 +- .../model/response/TerminalCloseResponse.java | 10 +- .../response/TerminalConnectResponse.java | 10 +- .../transfer/model/SftpFileBackupParams.java | 10 +- .../model/TransferOperatorRequest.java | 14 +- .../model/TransferOperatorResponse.java | 30 ++- .../upload/model/FileUploadFileItemDTO.java | 22 +- .../host/upload/task/FileUploadTask.java | 2 +- .../model/SystemPreferenceModel.java | 37 ++- .../model/TerminalPreferenceModel.java | 233 +++++++++++++----- .../upload/model/FileUploadRequest.java | 10 +- .../upload/model/FileUploadResponse.java | 14 +- 37 files changed, 534 insertions(+), 248 deletions(-) diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java index 7a22ce4a..3fd8ca3c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java @@ -2,7 +2,6 @@ package com.orion.visor.module.asset.handler.host.config.model; import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import com.orion.visor.framework.common.security.UpdatePasswordAction; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,61 +23,86 @@ import javax.validation.constraints.Size; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostSshConfigModel", description = "主机 SSH 配置") public class HostSshConfigModel implements GenericsDataModel, UpdatePasswordAction { + /** + * ssh 端口 + */ @NotNull @Range(min = 1, max = 65535) - @Schema(description = "ssh 端口") private Integer port; + /** + * 用户名 + */ @Size(max = 128) - @Schema(description = "用户名") private String username; + /** + * 认证方式 + */ @NotBlank @Size(max = 12) - @Schema(description = "认证方式") private String authType; + /** + * 系统类型 + */ @NotBlank @Size(max = 12) - @Schema(description = "系统类型") private String osType; - @Schema(description = "密码") + /** + * 密码 + */ private String password; - @Schema(description = "身份id") + /** + * 身份id + */ private Long identityId; - @Schema(description = "密钥id") + /** + * 密钥id + */ private Long keyId; + /** + * 连接超时时间 + */ @NotNull @Range(min = 0, max = 100000) - @Schema(description = "连接超时时间") private Integer connectTimeout; + /** + * SSH输出编码 + */ @NotBlank @Size(max = 12) - @Schema(description = "SSH输出编码") private String charset; + /** + * 文件名称编码 + */ @NotBlank @Size(max = 12) - @Schema(description = "文件名称编码") private String fileNameCharset; + /** + * 文件内容编码 + */ @NotBlank @Size(max = 12) - @Schema(description = "文件内容编码") private String fileContentCharset; - @Schema(description = "是否使用新密码 仅参数") + /** + * 是否使用新密码 仅参数 + */ private Boolean useNewPassword; - @Schema(description = "是否已设置密码 仅返回") + /** + * 是否已设置密码 仅返回 + */ private Boolean hasPassword; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java index ce68cbda..a819b8cc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java @@ -1,8 +1,8 @@ package com.orion.visor.module.asset.handler.host.exec.command; import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; import com.orion.visor.module.asset.handler.host.exec.command.handler.ExecTaskHandler; +import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; /** * 批量执行命令执行器 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java index 42149022..c467571d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java @@ -18,9 +18,9 @@ import com.orion.visor.module.asset.define.message.ExecMessageDefine; import com.orion.visor.module.asset.entity.domain.ExecLogDO; import com.orion.visor.module.asset.enums.ExecHostStatusEnum; import com.orion.visor.module.asset.enums.ExecStatusEnum; +import com.orion.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; -import com.orion.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; import com.orion.visor.module.infra.api.SystemMessageApi; import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java index 307cf4af..a6376084 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.exec.command.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,31 +18,46 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecCommandDTO", description = "批量执行启动对象") public class ExecCommandDTO { - @Schema(description = "logId") + /** + * logId + */ private Long logId; - @Schema(description = "用户id") + /** + * 用户id + */ private Long userId; - @Schema(description = "用户名") + /** + * 用户名 + */ private String username; - @Schema(description = "执行描述") + /** + * 执行描述 + */ private String description; - @Schema(description = "执行序列") + /** + * 执行序列 + */ private Integer execSeq; - @Schema(description = "超时时间") + /** + * 超时时间 + */ private Integer timeout; - @Schema(description = "是否使用脚本执行") + /** + * 是否使用脚本执行 + */ private Boolean scriptExec; - @Schema(description = "执行主机") + /** + * 执行主机 + */ private List hosts; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java index 449c8c86..defbdb60 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.exec.command.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,40 +16,61 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecCommandHostDTO", description = "批量执行启动主机对象") public class ExecCommandHostDTO { - @Schema(description = "hostLogId") + /** + * hostLogId + */ private Long hostLogId; - @Schema(description = "hostId") + /** + * hostId + */ private Long hostId; - @Schema(description = "主机名称") + /** + * 主机名称 + */ private String hostName; - @Schema(description = "主机地址") + /** + * 主机地址 + */ private String hostAddress; - @Schema(description = "日志文件路径") + /** + * 日志文件路径 + */ private String logPath; - @Schema(description = "脚本路径") + /** + * 脚本路径 + */ private String scriptPath; - @Schema(description = "执行命令") + /** + * 执行命令 + */ private String command; - @Schema(description = "主机用户") + /** + * 主机用户 + */ private String username; - @Schema(description = "命令编码") + /** + * 命令编码 + */ private String charset; - @Schema(description = "文件名称编码") + /** + * 文件名称编码 + */ private String fileNameCharset; - @Schema(description = "文件内容编码") + /** + * 文件内容编码 + */ private String fileContentCharset; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java index 431202a3..a9fd70a0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.extra.model; import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,13 +17,16 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostLabelExtraModel", description = "主机拓展信息 - 标签模型") public class HostLabelExtraModel implements GenericsDataModel { - @Schema(description = "别名") + /** + * 别名 + */ private String alias; - @Schema(description = "颜色") + /** + * 颜色 + */ private String color; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java index 36fc0d40..6344ff40 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.extra.model; import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,19 +17,26 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostExtraSshModel", description = "主机拓展信息 - ssh 模型") public class HostSshExtraModel implements GenericsDataModel { - @Schema(description = "认证方式") + /** + * 认证方式 + */ private String authType; - @Schema(description = "认证方式") + /** + * 认证方式 + */ private String username; - @Schema(description = "主机密钥") + /** + * 主机密钥 + */ private Long keyId; - @Schema(description = "主机身份") + /** + * 主机身份 + */ private Long identityId; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java index e8160c90..2a217901 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,13 +16,16 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "TerminalBasePayload", description = "终端基础 payload") public class TerminalBasePayload { - @Schema(description = "会话id") + /** + * 会话id + */ private String sessionId; - @Schema(description = "消息类型") + /** + * 消息类型 + */ private String type; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalConfig.java index 4225a63c..d6559ec0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalConfig.java @@ -1,7 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,35 +16,51 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@DesensitizeObject -@Schema(name = "TerminalConfig", description = "主机终端连接参数") public class TerminalConfig { - @Schema(description = "logId") + /** + * logId + */ private Long logId; - @Schema(description = "主机id") + /** + * 主机id + */ private Long hostId; - @Schema(description = "主机名称") + /** + * 主机名称 + */ private String hostName; - @Schema(description = "主机地址") + /** + * 主机地址 + */ private String address; - @Schema(description = "cols") + /** + * cols + */ private Integer cols; - @Schema(description = "rows") + /** + * rows + */ private Integer rows; - @Schema(description = "SSH输出编码") + /** + * SSH输出编码 + */ private String charset; - @Schema(description = "文件名称编码") + /** + * 文件名称编码 + */ private String fileNameCharset; - @Schema(description = "文件内容编码") + /** + * 文件内容编码 + */ private String fileContentCharset; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java index a6b15649..8eaeab04 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,10 +19,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpBaseRequest", description = "sftp 基础请求 实体对象") public class SftpBaseRequest extends TerminalBasePayload { - @Schema(description = "path") + /** + * path + */ private String path; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpChangeModRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpChangeModRequest.java index 04d5b706..2c7199db 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpChangeModRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpChangeModRequest.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,10 +20,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpChangeModRequest", description = "sftp 修改文件权限 实体对象") public class SftpChangeModRequest extends SftpBaseRequest { - @Schema(description = "10进制的8进制 权限") + /** + * 10进制的8进制 权限 + */ private Integer mod; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java index f6c07778..b5991824 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,10 +20,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpDownloadDirectoryFlatRequest", description = "sftp 下载文件夹展开文件 实体对象") public class SftpDownloadFlatDirectoryRequest extends SftpBaseRequest { - @Schema(description = "当前路径") + /** + * 当前路径 + */ private String currentPath; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java index ddebb5f9..c96f101c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,10 +20,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpListRequest", description = "sftp 列表请求 实体对象") public class SftpListRequest extends SftpBaseRequest { - @Schema(description = "是否显示隐藏文件") + /** + * 是否显示隐藏文件 + */ private Integer showHiddenFile; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java index a8db89e9..687f97f7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,10 +20,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpMoveRequest", description = "sftp 移动文件 实体对象") public class SftpMoveRequest extends SftpBaseRequest { - @Schema(description = "target") + /** + * target + */ private String target; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpSetContentRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpSetContentRequest.java index 825967a5..fe714966 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpSetContentRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpSetContentRequest.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,10 +20,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpSetContentRequest", description = "sftp 设置文件内容 实体对象") public class SftpSetContentRequest extends SftpBaseRequest { - @Schema(description = "content") + /** + * content + */ private String content; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java index 2606826c..89ea4cb9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,10 +21,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SshInputRequest", description = "ssh 输入请求 实体对象") public class SshInputRequest extends TerminalBasePayload { - @Schema(description = "command") + /** + * command + */ private String command; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java index 47eb676c..660178b7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,13 +21,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SshResizeRequest", description = "ssh 修改大小请求 实体对象") public class SshResizeRequest extends TerminalBasePayload { - @Schema(description = "列数") + /** + * 列数 + */ private Integer cols; - @Schema(description = "行数") + /** + * 行数 + */ private Integer rows; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java index bd80c779..7ae548d2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,13 +21,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "TerminalConnectRequest", description = "主机连接检查请求 实体对象") public class TerminalCheckRequest extends TerminalBasePayload { - @Schema(description = "主机id") + /** + * 主机id + */ private Long hostId; - @Schema(description = "连接类型") + /** + * 连接类型 + */ private String connectType; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java index 9b6fb428..4c42208a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.request; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,16 +21,21 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "TerminalConnectRequest", description = "终端连接请求 实体对象") public class TerminalConnectRequest extends TerminalBasePayload { - @Schema(description = "伪终端类型") + /** + * 伪终端类型 + */ private String terminalType; - @Schema(description = "列数") + /** + * 列数 + */ private Integer cols; - @Schema(description = "行数") + /** + * 行数 + */ private Integer rows; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java index a2240024..bbe46a75 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,13 +19,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpBaseResponse", description = "sftp 基础响应 实体对象") public class SftpBaseResponse extends TerminalBasePayload { - @Schema(description = "结果") + /** + * 结果 + */ private Integer result; - @Schema(description = "消息") + /** + * 消息 + */ private String msg; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java index 98c28c24..83b694fd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,13 +18,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpDownloadFlatDirectoryResponse", description = "sftp 下载文件夹展开文件 实体对象") public class SftpDownloadFlatDirectoryResponse extends SftpBaseResponse { - @Schema(description = "currentPath") + /** + * currentPath + */ private String currentPath; - @Schema(description = "body") + /** + * body + */ private String body; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java index 8964cf8d..75fa1bcf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,37 +18,56 @@ import java.util.Date; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "SftpFileResponse", description = "sftp 文件响应 实体对象") public class SftpFileVO { - @Schema(description = "名称") + /** + * 名称 + */ private String name; - @Schema(description = "绝对路径") + /** + * 绝对路径 + */ private String path; - @Schema(description = "文件后缀") + /** + * 文件后缀 + */ private String suffix; - @Schema(description = "文件大小(byte)") + /** + * 文件大小(byte) + */ private Long size; - @Schema(description = "属性") + /** + * 属性 + */ private String attr; - @Schema(description = "是否为目录") + /** + * 是否为目录 + */ private Boolean isDir; - @Schema(description = "10进制表现的8进制权限") + /** + * 10进制表现的8进制权限 + */ private Integer permission; - @Schema(description = "用户id") + /** + * 用户id + */ private Integer uid; - @Schema(description = "组id") + /** + * 组id + */ private Integer gid; - @Schema(description = "更新时间") + /** + * 更新时间 + */ private Date modifyTime; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java index a9ab3feb..7dbedac0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,13 +18,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpGetContentResponse", description = "sftp 获取内容响应 实体对象") public class SftpGetContentResponse extends SftpBaseResponse { - @Schema(description = "path") + /** + * path + */ private String path; - @Schema(description = "content") + /** + * content + */ private String content; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java index b7a5410b..76e0e1c9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,13 +18,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SftpListResponse", description = "sftp 列表响应 实体对象") public class SftpListResponse extends SftpBaseResponse { - @Schema(description = "path") + /** + * path + */ private String path; - @Schema(description = "body") + /** + * body + */ private String body; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java index a8325b45..b36efd6a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,10 +19,11 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "SshOutputResponse", description = "ssh 输出响应 实体对象") public class SshOutputResponse extends TerminalBasePayload { - @Schema(description = "body") + /** + * body + */ private String body; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java index 35608666..47d412f6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,13 +19,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "TerminalCheckResponse", description = "主机连接检查响应 实体对象") public class TerminalCheckResponse extends TerminalBasePayload { - @Schema(description = "检查结果") + /** + * 检查结果 + */ private Integer result; - @Schema(description = "错误信息") + /** + * 错误信息 + */ private String msg; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java index 90a226d7..6ebff9d9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,13 +19,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "TerminalCloseResponse", description = "主机连接关闭响应 实体对象") public class TerminalCloseResponse extends TerminalBasePayload { - @Schema(description = "是否为强制关闭") + /** + * 是否为强制关闭 + */ private Integer forceClose; - @Schema(description = "关闭信息") + /** + * 关闭信息 + */ private String msg; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java index f3398b16..1a883ef4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java @@ -1,7 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.model.response; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,13 +19,16 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "TerminalConnectResponse", description = "终端连接响应 实体对象") public class TerminalConnectResponse extends TerminalBasePayload { - @Schema(description = "检查结果") + /** + * 检查结果 + */ private Integer result; - @Schema(description = "错误信息") + /** + * 错误信息 + */ private String msg; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java index 1869265f..6809a0c8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.transfer.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,13 +16,16 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "SftpFileBackupParams", description = "sftp 文件备份参数") public class SftpFileBackupParams { - @Schema(description = "文件名称") + /** + * 文件名称 + */ private String fileName; - @Schema(description = "时间戳") + /** + * 时间戳 + */ private Long timestamp; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java index 5be60471..34589242 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.transfer.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,16 +16,21 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "FileOperatorRequest", description = "文件操作请求 实体对象") public class TransferOperatorRequest { - @Schema(description = "文件路径") + /** + * 文件路径 + */ private String path; - @Schema(description = "type") + /** + * type + */ private String type; - @Schema(description = "主机id") + /** + * 主机id + */ private Long hostId; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java index 5fa5c4a2..5022e12a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.transfer.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,28 +16,41 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "FileOperatorResponse", description = "文件操作响应 实体对象") public class TransferOperatorResponse { - @Schema(description = "channelId") + /** + * channelId + */ private String channelId; - @Schema(description = "type") + /** + * type + */ private String type; - @Schema(description = "主机id") + /** + * 主机id + */ private Long hostId; - @Schema(description = "是否成功") + /** + * 是否成功 + */ private Boolean success; - @Schema(description = "传输的大小") + /** + * 传输的大小 + */ private Integer currentSize; - @Schema(description = "transferToken") + /** + * transferToken + */ private String transferToken; - @Schema(description = "消息") + /** + * 消息 + */ private String msg; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java index 1b17111c..b67e77ed 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java @@ -1,6 +1,5 @@ package com.orion.visor.module.asset.handler.host.upload.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,22 +16,31 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "FileUploadFileItemDTO", description = "文件上传文件对象") public class FileUploadFileItemDTO { - @Schema(description = "id") + /** + * id + */ private Long id; - @Schema(description = "fileId") + /** + * fileId + */ private String fileId; - @Schema(description = "远程路径") + /** + * 远程路径 + */ private String remotePath; - @Schema(description = "当前大小") + /** + * 当前大小 + */ private Long current; - @Schema(description = "状态") + /** + * 状态 + */ private String status; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java index 9c9198dc..f1ffd443 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java @@ -15,8 +15,8 @@ import com.orion.visor.module.asset.entity.domain.UploadTaskDO; import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; import com.orion.visor.module.asset.enums.UploadTaskFileStatusEnum; import com.orion.visor.module.asset.enums.UploadTaskStatusEnum; -import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; import com.orion.visor.module.asset.handler.host.upload.manager.FileUploadTaskManager; +import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; import com.orion.visor.module.asset.handler.host.upload.uploader.FileUploader; import com.orion.visor.module.asset.handler.host.upload.uploader.IFileUploader; import com.orion.visor.module.asset.service.UploadTaskService; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/SystemPreferenceModel.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/SystemPreferenceModel.java index ae82a426..731ac309 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/SystemPreferenceModel.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/SystemPreferenceModel.java @@ -1,6 +1,5 @@ package com.orion.visor.module.infra.handler.preference.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,31 +18,49 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class SystemPreferenceModel implements PreferenceModel { - @Schema(description = "是否使用侧边菜单") + /** + * 是否使用侧边菜单 + */ private Boolean menu; - @Schema(description = "是否使用顶部菜单") + /** + * 是否使用顶部菜单 + */ private Boolean topMenu; - @Schema(description = "是否显示导航栏") + /** + * 是否显示导航栏 + */ private Boolean navbar; - @Schema(description = "是否显示页脚") + /** + * 是否显示页脚 + */ private Boolean footer; - @Schema(description = "是否开启多页签") + /** + * 是否开启多页签 + */ private Boolean tabBar; - @Schema(description = "是否开启色弱模式") + /** + * 是否开启色弱模式 + */ private Boolean colorWeak; - @Schema(description = "菜单宽度") + /** + * 菜单宽度 + */ private Integer menuWidth; - @Schema(description = "表格默认页数") + /** + * 表格默认页数 + */ private Integer defaultTablePageSize; - @Schema(description = "卡片默认页数") + /** + * 卡片默认页数 + */ private Integer defaultCardPageSize; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java index ceb0ed52..9dd05b41 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java @@ -2,7 +2,6 @@ package com.orion.visor.module.infra.handler.preference.model; import com.alibaba.fastjson.JSONObject; import com.orion.lang.able.IJsonObject; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -23,31 +22,49 @@ import java.util.List; @AllArgsConstructor public class TerminalPreferenceModel implements PreferenceModel { - @Schema(description = "新建连接类型") + /** + * 新建连接类型 + */ private String newConnectionType; - @Schema(description = "终端主题") + /** + * 终端主题 + */ private JSONObject theme; - @Schema(description = "显示设置") + /** + * 显示设置 + */ private JSONObject displaySetting; - @Schema(description = "操作栏设置") + /** + * 操作栏设置 + */ private JSONObject actionBarSetting; - @Schema(description = "右键菜单设置") + /** + * 右键菜单设置 + */ private List rightMenuSetting; - @Schema(description = "交互设置") + /** + * 交互设置 + */ private JSONObject interactSetting; - @Schema(description = "插件设置") + /** + * 插件设置 + */ private JSONObject pluginsSetting; - @Schema(description = "会话设置") + /** + * 会话设置 + */ private JSONObject sessionSetting; - @Schema(description = "快捷键设置") + /** + * 快捷键设置 + */ private JSONObject shortcutSetting; @Data @@ -56,28 +73,44 @@ public class TerminalPreferenceModel implements PreferenceModel { @AllArgsConstructor public static class DisplaySettingModel implements IJsonObject { - @Schema(description = "字体样式") + /** + * 字体样式 + */ private String fontFamily; - @Schema(description = "字体大小") + /** + * 字体大小 + */ private Integer fontSize; - @Schema(description = "行高") + /** + * 行高 + */ private Double lineHeight; - @Schema(description = "字间距") + /** + * 字间距 + */ private Integer letterSpacing; - @Schema(description = "文本字重") + /** + * 文本字重 + */ private String fontWeight; - @Schema(description = "加粗字重") + /** + * 加粗字重 + */ private String fontWeightBold; - @Schema(description = "光标样式") + /** + * 光标样式 + */ private String cursorStyle; - @Schema(description = "光标闪烁") + /** + * 光标闪烁 + */ private Boolean cursorBlink; } @@ -88,34 +121,54 @@ public class TerminalPreferenceModel implements PreferenceModel { @AllArgsConstructor public static class InteractSettingModel implements IJsonObject { - @Schema(description = "快速滚动") + /** + * 快速滚动 + */ private Boolean fastScrollModifier; - @Schema(description = "点击移动光标") + /** + * 点击移动光标 + */ private Boolean altClickMovesCursor; - @Schema(description = "右键选中词条") + /** + * 右键选中词条 + */ private Boolean rightClickSelectsWord; - @Schema(description = "选中自动复制") + /** + * 选中自动复制 + */ private Boolean selectionChangeCopy; - @Schema(description = "复制去除空格") + /** + * 复制去除空格 + */ private Boolean copyAutoTrim; - @Schema(description = "粘贴去除空格") + /** + * 粘贴去除空格 + */ private Boolean pasteAutoTrim; - @Schema(description = "右键粘贴") + /** + * 右键粘贴 + */ private Boolean rightClickPaste; - @Schema(description = "启用右键菜单") + /** + * 启用右键菜单 + */ private Boolean enableRightClickMenu; - @Schema(description = "启用响铃") + /** + * 启用响铃 + */ private Boolean enableBell; - @Schema(description = "单词分隔符") + /** + * 单词分隔符 + */ private String wordSeparator; } @@ -126,16 +179,24 @@ public class TerminalPreferenceModel implements PreferenceModel { @AllArgsConstructor public static class PluginsSettingModel implements IJsonObject { - @Schema(description = "超链接插件") + /** + * 超链接插件 + */ private Boolean enableWeblinkPlugin; - @Schema(description = "WebGL 渲染插件") + /** + * WebGL 渲染插件 + */ private Boolean enableWebglPlugin; - @Schema(description = "unicode11 插件") + /** + * unicode11 插件 + */ private Boolean enableUnicodePlugin; - @Schema(description = "图片渲染插件") + /** + * 图片渲染插件 + */ private Boolean enableImagePlugin; } @@ -146,10 +207,14 @@ public class TerminalPreferenceModel implements PreferenceModel { @AllArgsConstructor public static class SessionSettingModel implements IJsonObject { - @Schema(description = "伪终端类型") + /** + * 伪终端类型 + */ private String terminalEmulationType; - @Schema(description = "保存在缓冲区的行数") + /** + * 保存在缓冲区的行数 + */ private Integer scrollBackLine; } @@ -160,10 +225,14 @@ public class TerminalPreferenceModel implements PreferenceModel { @AllArgsConstructor public static class ShortcutSettingModel implements IJsonObject { - @Schema(description = "是否启用") + /** + * 是否启用 + */ private Boolean enabled; - @Schema(description = "快捷键定义") + /** + * 快捷键定义 + */ private List keys; } @@ -174,55 +243,89 @@ public class TerminalPreferenceModel implements PreferenceModel { @AllArgsConstructor public static class ActionBarSettingModel implements IJsonObject { - @Schema(description = "命令输入框") + /** + * 命令输入框 + */ private Boolean commandInput; - @Schema(description = "连接状态") + /** + * 连接状态 + */ private Boolean connectStatus; - @Schema(description = "去顶部") + /** + * 去顶部 + */ private Boolean toTop; - @Schema(description = "去底部") + /** + * 去底部 + */ private Boolean toBottom; - @Schema(description = "全选") + /** + * 全选 + */ private Boolean selectAll; - @Schema(description = "搜索") + /** + * 搜索 + */ private Boolean search; - @Schema(description = "复制") + /** + * 复制 + */ private Boolean copy; - @Schema(description = "粘贴") + /** + * 粘贴 + */ private Boolean paste; - @Schema(description = "中断") + /** + * 中断 + */ private Boolean interrupt; - @Schema(description = "回车") + /** + * 回车 + */ private Boolean enter; - @Schema(description = "增大字号") + /** + * 增大字号 + */ private Boolean fontSizePlus; - @Schema(description = "减小字号") + /** + * 减小字号 + */ private Boolean fontSizeSubtract; - @Schema(description = "命令编辑器") + /** + * 命令编辑器 + */ private Boolean commandEditor; - @Schema(description = "打开 SFTP") + /** + * 打开 SFTP + */ private Boolean openSftp; - @Schema(description = "清空") + /** + * 清空 + */ private Boolean clear; - @Schema(description = "断开连接") + /** + * 断开连接 + */ private Boolean disconnect; - @Schema(description = "关闭终端") + /** + * 关闭终端 + */ private Boolean closeTab; } @@ -233,22 +336,34 @@ public class TerminalPreferenceModel implements PreferenceModel { @AllArgsConstructor public static class ShortcutKeysModel implements IJsonObject { - @Schema(description = "快捷键操作") + /** + * 快捷键操作 + */ private String item; - @Schema(description = "ctrl 按键") + /** + * ctrl 按键 + */ private Boolean ctrlKey; - @Schema(description = "shift 按键") + /** + * shift 按键 + */ private Boolean shiftKey; - @Schema(description = "alt 按键") + /** + * alt 按键 + */ private Boolean altKey; - @Schema(description = "实际按键") + /** + * 实际按键 + */ private String code; - @Schema(description = "是否启用") + /** + * 是否启用 + */ private Boolean enabled; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadRequest.java index e876fdfd..bc20abbe 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadRequest.java @@ -1,6 +1,5 @@ package com.orion.visor.module.infra.handler.upload.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,13 +16,16 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "FileUploadRequest", description = "文件上传请求 实体对象") public class FileUploadRequest { - @Schema(description = "type") + /** + * type + */ private String type; - @Schema(description = "fileId") + /** + * fileId + */ private String fileId; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadResponse.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadResponse.java index f6239ed3..75cbf60c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadResponse.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadResponse.java @@ -1,6 +1,5 @@ package com.orion.visor.module.infra.handler.upload.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,16 +16,21 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "FileUploadResponse", description = "文件上传响应 实体对象") public class FileUploadResponse { - @Schema(description = "type") + /** + * type + */ private String type; - @Schema(description = "fileId") + /** + * fileId + */ private String fileId; - @Schema(description = "路径") + /** + * 路径 + */ private String path; }