diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/annotation/Keep.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/annotation/Keep.java new file mode 100644 index 00000000..ec2f218b --- /dev/null +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/annotation/Keep.java @@ -0,0 +1,17 @@ +package com.orion.visor.framework.common.annotation; + +import java.lang.annotation.*; + +/** + * 保留 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/6/6 15:26 + */ +@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Keep { + +} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java index c1a70f8d..2d736829 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java @@ -14,13 +14,19 @@ import lombok.Getter; @AllArgsConstructor public enum MovePosition { - // 拖拽到目标元素上 + /** + * 拖拽到目标元素上 + */ TOP(-1), - // 拖拽到目标元素中 + /** + * 拖拽到目标元素中 + */ IN(0), - // 拖拽到目标元素下 + /** + * 拖拽到目标元素下 + */ BOTTOM(1), ; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java index ff716685..8f0bac68 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java @@ -36,24 +36,47 @@ public class BannerApplicationRunner implements ApplicationRunner { @Value("${management.endpoints.web.base-path:''}") private String managementEndpoints; + @Value("${springdoc.api-docs.enabled}") + private Boolean apiDocsEnabled; + + @Value("${spring.datasource.druid.stat-view-servlet.enabled}") + private Boolean druidConsoleEnabled; + + @Value("#{'${management.endpoints.web.exposure.include}' != 'shutdown'}") + private Boolean springBootActuatorEnabled; + + @Value("${spring.boot.admin.client.enabled}") + private Boolean springBootAdminClientEnabled; + @Override public void run(ApplicationArguments args) { - String line = AnsiAppender.create() - .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor-launch v" + version + " 服务已启动(" + env + ") ::\n") - .append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档 ") - .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/doc.html\n") - .append(AnsiForeground.BRIGHT_GREEN, ":: druid console ") - .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/druid/index.html\n") - .append(AnsiForeground.BRIGHT_GREEN, ":: actuator endpoint ") - .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + managementEndpoints + "\n") - .append(AnsiForeground.BRIGHT_GREEN, ":: admin console ") - .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + adminSeverContextPath + "\n") - .append(AnsiForeground.BRIGHT_GREEN, ":: server 健康检测 ") - .append(AnsiForeground.BRIGHT_BLUE, "curl -X GET --location \"http://127.0.0.1:" + port + apiPrefix + "/server/bootstrap/health\"") - .toString(); + AnsiAppender appender = AnsiAppender.create() + .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor-launch v" + version + " 服务已启动(" + env + ") ::\n"); + // swagger 地址 + if (apiDocsEnabled) { + appender.append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档 ") + .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/doc.html\n"); + } + // druid 控制台 + if (druidConsoleEnabled) { + appender.append(AnsiForeground.BRIGHT_GREEN, ":: druid console ") + .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/druid/index.html\n"); + } + // admin actuator 端点 + if (springBootActuatorEnabled) { + appender.append(AnsiForeground.BRIGHT_GREEN, ":: actuator endpoint ") + .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + managementEndpoints + "\n"); + } + // admin server 控制台 + if (springBootAdminClientEnabled) { + appender.append(AnsiForeground.BRIGHT_GREEN, ":: admin console ") + .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + adminSeverContextPath + "\n"); + } + appender.append(AnsiForeground.BRIGHT_GREEN, ":: server 健康检测 ") + .append(AnsiForeground.BRIGHT_BLUE, "curl -X GET --location \"http://127.0.0.1:" + port + apiPrefix + "/server/bootstrap/health\""); Threads.start(() -> { Threads.sleep(1000L); - System.out.println(line); + System.out.println(appender); }); } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/banner.txt b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/banner.txt index 415c802a..c46f2189 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/banner.txt +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/banner.txt @@ -8,4 +8,5 @@ ${AnsiColor.BRIGHT_GREEN}:: Application Name ${AnsiColor.BLUE}${spring.appli ${AnsiColor.BRIGHT_GREEN}:: Application Version ${AnsiColor.BLUE}${orion.version} ${AnsiColor.BRIGHT_GREEN}:: SpringBoot Version ${AnsiColor.BLUE}${spring-boot.version} ${AnsiColor.BRIGHT_GREEN}:: Active Profile ${AnsiColor.BLUE}${spring.profiles.active} +${AnsiColor.BRIGHT_GREEN}:: Demo Mode ${AnsiColor.BLUE}${orion.demo} ${AnsiColor.DEFAULT} \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java index ebbc28ec..ed05e8b6 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java @@ -72,9 +72,9 @@ public class PrettyLogPrinterInterceptor extends AbstractLogPrinterInterceptor { } Method method = invocation.getMethod(); // 方法签名 - requestLog.append("\tmethodSign: ").append(method.getDeclaringClass().getName()).append('#') - .append(method.getName()).append("\n"); - // 参数 + // requestLog.append("\tmethodSign: ").append(method.getDeclaringClass().getName()).append('#') + // .append(method.getName()).append("\n"); + // 方法参数 requestLog.append("\tparameter: ").append(this.requestToString(method, invocation.getArguments())); log.info(requestLog.toString()); } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java index 8896275d..d05e2d64 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java @@ -73,8 +73,8 @@ public class RowLogPrinterInterceptor extends AbstractLogPrinterInterceptor impl } Method method = invocation.getMethod(); // 方法签名 - fields.put(METHOD_SIGN, method.getDeclaringClass().getName() + "#" + method.getName()); - // 参数 + // fields.put(METHOD_SIGN, method.getDeclaringClass().getName() + "#" + method.getName()); + // 方法参数 fields.put(PARAMETER, this.requestToString(method, invocation.getArguments())); log.info("api请求-开始 {}", JSON.toJSONString(fields)); fields.clear(); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java index b725d6f1..5852cbc2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java @@ -15,6 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.Primary; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; @@ -36,6 +37,7 @@ public class OrionRedisAutoConfiguration { * @param redisConnectionFactory factory * @return RedisTemplate */ + @Primary @Bean public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { RedisTemplate redisTemplate = new RedisTemplate<>(); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java index 7881a95f..655d0e84 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java @@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Profile; import org.springframework.http.HttpHeaders; import java.util.HashMap; @@ -38,10 +37,9 @@ import java.util.Optional; * @version 1.0.0 * @since 2022/6/21 11:22 */ -@Profile({"dev"}) @ConditionalOnClass({OpenAPI.class}) @EnableConfigurationProperties(SwaggerConfig.class) -@ConditionalOnProperty(prefix = "springdoc.api-docs", name = "enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true") @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_SWAGGER) public class OrionSwaggerAutoConfiguration { diff --git a/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java b/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java index 1c0edc71..52e09f51 100644 --- a/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java +++ b/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java @@ -1,5 +1,8 @@ package com.orion.visor.launch; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -14,7 +17,19 @@ import org.springframework.boot.builder.SpringApplicationBuilder; public class LaunchApplication { public static void main(String[] args) { - new SpringApplicationBuilder(LaunchApplication.class).run(args); + new SpringApplicationBuilder(LaunchApplication.class) + .beanNameGenerator(new CustomBeanNameGenerator()) + .run(args); + } + + /** + * 自定义 bean 名称生成器 + */ + public static class CustomBeanNameGenerator implements BeanNameGenerator { + @Override + public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) { + return definition.getBeanClassName(); + } } } diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index f0ffdc11..e50c9c13 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -7,6 +7,8 @@ spring: initial-size: 0 min-idle: 1 max-active: 5 + stat-view-servlet: + enabled: false redis: host: 127.0.0.1 port: 6379 @@ -15,6 +17,19 @@ spring: threads: 2 netty-threads: 2 minimum-idle-size: 2 + boot: + admin: + client: + enabled: false + server: + enabled: false + +management: + endpoints: + enabled-by-default: false + web: + exposure: + include: shutdown mybatis-plus: configuration: diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index c85e6402..284b6f82 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -10,10 +10,13 @@ spring: min-idle: 5 # 最大连接池数量 max-active: 20 - web-stat-filter: - enabled: true + # 控制台 stat-view-servlet: enabled: true + login-username: ${DRUID_USERNAME:admin} + login-password: ${DRUID_PASSWORD:admin} + web-stat-filter: + enabled: true filter: stat: enabled: true @@ -31,6 +34,16 @@ spring: quartz: threadPool: threadCount: 10 + boot: + admin: + client: + enabled: true + server: + enabled: true + +management: + endpoints: + enabled-by-default: true springdoc: api-docs: @@ -40,6 +53,7 @@ springdoc: knife4j: enable: false + production: true orion: # 是否为演示模式 diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 52f229d1..d72dc6d1 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -40,13 +40,14 @@ spring: # 最大生存的时间 max-evictable-idle-time-millis: 900000 validation-query: SELECT 1 - web-stat-filter: - enabled: true + # 控制台 stat-view-servlet: enabled: true url-pattern: /druid/* login-username: login-password: + web-stat-filter: + enabled: true filter: stat: enabled: true @@ -88,7 +89,7 @@ spring: misfireThreshold: 60000 clusterCheckinInterval: 5000 isClustered: true - #连接池 + # 连接池 threadPool: class: org.quartz.simpl.SimpleThreadPool threadCount: 5 @@ -98,12 +99,16 @@ spring: admin: context-path: /admin client: + enabled: true url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} instance: service-host-type: IP + server: + enabled: true management: endpoints: + enabled-by-default: true web: base-path: /actuator exposure: 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 fa7b2c9e..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 = "HostSftpConfig", 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 4c3f228f..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.dto.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/dto/ExecCommandHostDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java deleted file mode 100644 index 679222b2..00000000 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.orion.visor.module.asset.handler.host.exec.command.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 批量执行启动主机对象 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2024/3/11 15:46 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "ExecCommandHostDTO", description = "批量执行启动主机对象") -public class ExecCommandHostDTO { - - @Schema(description = "hostLogId") - private Long hostLogId; - - @Schema(description = "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/exec/command/handler/BaseExecCommandHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java index d45e3467..d607a010 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java @@ -20,8 +20,8 @@ import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.module.asset.dao.ExecHostLogDAO; import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; import com.orion.visor.module.asset.enums.ExecHostStatusEnum; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO; +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.log.manager.ExecLogManager; import com.orion.visor.module.asset.service.HostTerminalService; 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/handler/ExecCommandAnsiHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java index 30b0bfa2..6966b0fe 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java @@ -9,8 +9,8 @@ import com.orion.lang.utils.time.Dates; import com.orion.net.host.ssh.ExitCode; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.module.asset.enums.ExecHostStatusEnum; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO; +import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; +import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; /** * 命令执行器 ansi 日志输出 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/ExecCommandOriginHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java index 638f9759..76cc1a6a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java @@ -2,8 +2,8 @@ package com.orion.visor.module.asset.handler.host.exec.command.handler; import com.orion.lang.support.timeout.TimeoutChecker; import com.orion.lang.support.timeout.TimeoutEndpoint; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO; +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 lombok.extern.slf4j.Slf4j; /** 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 c7d90343..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.dto.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO; 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.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/dto/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 similarity index 52% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/dto/ExecCommandDTO.java rename to 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 76c05cad..a6376084 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/dto/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.dto; +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 new file mode 100644 index 00000000..defbdb60 --- /dev/null +++ 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 @@ -0,0 +1,76 @@ +package com.orion.visor.module.asset.handler.host.exec.command.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 批量执行启动主机对象 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/3/11 15:46 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ExecCommandHostDTO { + + /** + * hostLogId + */ + private Long hostLogId; + + /** + * hostId + */ + private Long hostId; + + /** + * 主机名称 + */ + private String hostName; + + /** + * 主机地址 + */ + private String hostAddress; + + /** + * 日志文件路径 + */ + private String logPath; + + /** + * 脚本路径 + */ + private String scriptPath; + + /** + * 执行命令 + */ + private String command; + + /** + * 主机用户 + */ + private String username; + + /** + * 命令编码 + */ + private String charset; + + /** + * 文件名称编码 + */ + private String fileNameCharset; + + /** + * 文件内容编码 + */ + 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/exec/log/ExecLogTailHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java index ed538797..ea4a89b9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java @@ -1,5 +1,6 @@ package com.orion.visor.module.asset.handler.host.exec.log; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.constant.ExtraFieldConst; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.framework.websocket.core.utils.WebSockets; @@ -29,6 +30,7 @@ import javax.annotation.Resource; @Component public class ExecLogTailHandler extends AbstractWebSocketHandler { + @Keep @Resource private FileClient logsFileClient; 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/dto/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 similarity index 53% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/dto/FileUploadFileItemDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java index cace009c..b67e77ed 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/dto/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.dto; +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 0aa9be38..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.dto.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-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java index b4fb6ea8..31a5a78e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java @@ -16,7 +16,7 @@ import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; import com.orion.visor.module.asset.entity.dto.HostTerminalConnectDTO; import com.orion.visor.module.asset.enums.HostSshOsTypeEnum; import com.orion.visor.module.asset.enums.UploadTaskFileStatusEnum; -import com.orion.visor.module.asset.handler.host.upload.dto.FileUploadFileItemDTO; +import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; import com.orion.visor.module.asset.service.HostTerminalService; import com.orion.visor.module.asset.service.UploadTaskService; import com.orion.visor.module.asset.utils.SftpUtils; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/IFileUploader.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/IFileUploader.java index 73966683..3009bf96 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/IFileUploader.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/IFileUploader.java @@ -1,7 +1,7 @@ package com.orion.visor.module.asset.handler.host.upload.uploader; import com.orion.lang.able.SafeCloseable; -import com.orion.visor.module.asset.handler.host.upload.dto.FileUploadFileItemDTO; +import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java index cc717d1b..5571042b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java @@ -11,6 +11,7 @@ import com.orion.lang.utils.json.matcher.ReplacementFormatter; import com.orion.lang.utils.json.matcher.ReplacementFormatters; import com.orion.lang.utils.time.Dates; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.constant.PathConst; @@ -36,8 +37,8 @@ import com.orion.visor.module.asset.entity.vo.ExecLogVO; import com.orion.visor.module.asset.enums.*; import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel; import com.orion.visor.module.asset.handler.host.exec.command.ExecTaskExecutors; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO; +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.service.AssetAuthorizedDataService; import com.orion.visor.module.asset.service.ExecCommandService; import com.orion.visor.module.asset.service.HostConfigService; @@ -67,6 +68,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { private static final int DESC_OMIT = 60; + @Keep @Resource private FileClient logsFileClient; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java index cee471ea..9fd13b7e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java @@ -12,6 +12,7 @@ import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.constant.PathConst; @@ -80,6 +81,7 @@ public class ExecLogServiceImpl implements ExecLogService { @Resource private HostConfigService hostConfigService; + @Keep @Resource private FileClient logsFileClient; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java index ee42cf5b..f19caeaf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java @@ -12,6 +12,7 @@ import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.time.Dates; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.file.FileClient; @@ -37,7 +38,7 @@ import com.orion.visor.module.asset.enums.HostConfigTypeEnum; 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.FileUploadTasks; -import com.orion.visor.module.asset.handler.host.upload.dto.FileUploadFileItemDTO; +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.task.IFileUploadTask; import com.orion.visor.module.asset.handler.host.upload.uploader.IFileUploader; @@ -86,6 +87,7 @@ public class UploadTaskServiceImpl implements UploadTaskService { @Resource private FileUploadTaskManager fileUploadTaskManager; + @Keep @Resource private FileClient localFileClient; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java index 633ac34f..ffad79aa 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java @@ -3,6 +3,7 @@ package com.orion.visor.module.asset.task; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.time.Dates; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.framework.common.utils.LockerUtils; import com.orion.visor.module.asset.dao.ExecHostLogDAO; @@ -37,6 +38,7 @@ public class ExecLogFileAutoClearTask { @Resource private AppExecLogConfig appExecLogConfig; + @Keep @Resource private FileClient logsFileClient; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMessageDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMessageDAO.java index f653eefd..7a4d5dd2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMessageDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMessageDAO.java @@ -2,7 +2,7 @@ package com.orion.visor.module.infra.dao; import com.orion.visor.framework.mybatis.core.mapper.IMapper; import com.orion.visor.module.infra.entity.domain.SystemMessageDO; -import com.orion.visor.module.infra.entity.dto.SystemMessageCountDTO; +import com.orion.visor.module.infra.entity.po.SystemMessageCountPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,7 +25,7 @@ public interface SystemMessageDAO extends IMapper { * @param status status * @return count */ - List selectSystemMessageCount(@Param("receiverId") Long receiverId, - @Param("status") Integer status); + List selectSystemMessageCount(@Param("receiverId") Long receiverId, + @Param("status") Integer status); } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/SystemMessageCountDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/po/SystemMessageCountPO.java similarity index 73% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/SystemMessageCountDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/po/SystemMessageCountPO.java index 16cfe062..770eb6de 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/SystemMessageCountDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/po/SystemMessageCountPO.java @@ -1,4 +1,4 @@ -package com.orion.visor.module.infra.entity.dto; +package com.orion.visor.module.infra.entity.po; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -19,8 +19,8 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "SystemMessageCountDTO", description = "系统消息数量对象") -public class SystemMessageCountDTO implements Serializable { +@Schema(name = "SystemMessageCountPO", description = "系统消息数量对象") +public class SystemMessageCountPO implements Serializable { private static final long serialVersionUID = 1L; 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/preference/strategy/SystemPreferenceStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java index e626a655..5fc83f25 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; * @version 1.0.0 * @since 2023/10/8 13:48 */ -@Component +@Component("systemPreferenceStrategy") public class SystemPreferenceStrategy implements IPreferenceStrategy { @Override diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index 25f8f366..21d58166 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * @version 1.0.0 * @since 2023/12/8 14:46 */ -@Component +@Component("terminalPreferenceStrategy") public class TerminalPreferenceStrategy implements IPreferenceStrategy { @Override diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java index a7d7b618..3168e904 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java @@ -2,6 +2,7 @@ package com.orion.visor.module.infra.handler.upload; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.io.Streams; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.constant.ExtraFieldConst; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.framework.websocket.core.utils.WebSockets; @@ -34,6 +35,7 @@ public class FileUploadMessageDispatcher extends AbstractWebSocketHandler { private final ConcurrentHashMap handlers = new ConcurrentHashMap<>(); + @Keep @Resource private FileClient localFileClient; 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; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/AuthenticationServiceImpl.java index 03ee4977..34760beb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/AuthenticationServiceImpl.java @@ -6,6 +6,7 @@ import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.crypto.Signatures; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.security.LoginUser; @@ -65,6 +66,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { @Resource private PermissionService permissionService; + @Keep @Resource private RedisTemplate redisTemplate; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FavoriteServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FavoriteServiceImpl.java index 3c668e1f..0d6ebfbf 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FavoriteServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FavoriteServiceImpl.java @@ -2,6 +2,7 @@ package com.orion.visor.module.infra.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.collect.Lists; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.common.utils.Valid; import com.orion.visor.framework.redis.core.utils.RedisLists; import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; @@ -37,6 +38,7 @@ public class FavoriteServiceImpl implements FavoriteService { @Resource private FavoriteDAO favoriteDAO; + @Keep @Resource private RedisTemplate redisTemplate; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMessageServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMessageServiceImpl.java index 86f90d43..c4529ba1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMessageServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMessageServiceImpl.java @@ -11,7 +11,7 @@ import com.orion.visor.module.infra.dao.SystemMessageDAO; import com.orion.visor.module.infra.dao.SystemUserDAO; import com.orion.visor.module.infra.entity.domain.SystemMessageDO; import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.SystemMessageCountDTO; +import com.orion.visor.module.infra.entity.po.SystemMessageCountPO; import com.orion.visor.module.infra.entity.request.message.SystemMessageCreateRequest; import com.orion.visor.module.infra.entity.request.message.SystemMessageQueryRequest; import com.orion.visor.module.infra.entity.vo.SystemMessageVO; @@ -85,11 +85,11 @@ public class SystemMessageServiceImpl implements SystemMessageService { Long userId = SecurityUtils.getLoginUserId(); Integer status = queryUnread ? MessageStatusEnum.UNREAD.getStatus() : null; // 查询数量 - List countList = systemMessageDAO.selectSystemMessageCount(userId, status); + List countList = systemMessageDAO.selectSystemMessageCount(userId, status); // 返回 return countList.stream() - .collect(Collectors.toMap(SystemMessageCountDTO::getClassify, - SystemMessageCountDTO::getCount, + .collect(Collectors.toMap(SystemMessageCountPO::getClassify, + SystemMessageCountPO::getCount, Functions.right())); } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java index 39ad3791..6812baa9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; +import com.orion.visor.framework.common.annotation.Keep; import com.orion.visor.framework.redis.core.utils.RedisStrings; import com.orion.visor.module.infra.convert.TagRelConvert; import com.orion.visor.module.infra.dao.TagDAO; @@ -38,6 +39,7 @@ public class TagRelServiceImpl implements TagRelService { @Resource private TagRelDAO tagRelDAO; + @Keep @Resource private RedisTemplate redisTemplate; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml index 9c79ba29..feb15e45 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml @@ -18,7 +18,7 @@ - +