From c39049e5f52e4ee34c9edfd00b2bc8d7ed052a5d Mon Sep 17 00:00:00 2001 From: lijiahang Date: Fri, 7 Jun 2024 15:41:52 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E8=A7=84=E8=8C=83=E5=8C=96=E5=8C=85?= =?UTF-8?q?=E7=BB=93=E6=9E=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visor/framework/common/annotation/Keep.java | 17 +++++++++++++++++ .../framework/common/enums/MovePosition.java | 12 +++++++++--- .../PrettyLogPrinterInterceptor.java | 6 +++--- .../interceptor/RowLogPrinterInterceptor.java | 4 ++-- .../OrionRedisAutoConfiguration.java | 2 ++ .../orion/visor/launch/LaunchApplication.java | 17 ++++++++++++++++- .../host/config/model/HostSshConfigModel.java | 2 +- .../host/exec/command/ExecTaskExecutors.java | 2 +- .../command/handler/BaseExecCommandHandler.java | 4 ++-- .../command/handler/ExecCommandAnsiHandler.java | 4 ++-- .../handler/ExecCommandOriginHandler.java | 4 ++-- .../exec/command/handler/ExecTaskHandler.java | 4 ++-- .../command/{dto => model}/ExecCommandDTO.java | 2 +- .../{dto => model}/ExecCommandHostDTO.java | 2 +- .../host/exec/log/ExecLogTailHandler.java | 2 ++ .../{dto => model}/FileUploadFileItemDTO.java | 2 +- .../host/upload/task/FileUploadTask.java | 2 +- .../host/upload/uploader/FileUploader.java | 2 +- .../host/upload/uploader/IFileUploader.java | 2 +- .../service/impl/ExecCommandServiceImpl.java | 6 ++++-- .../asset/service/impl/ExecLogServiceImpl.java | 2 ++ .../service/impl/UploadTaskServiceImpl.java | 4 +++- .../asset/task/ExecLogFileAutoClearTask.java | 2 ++ .../module/infra/dao/SystemMessageDAO.java | 6 +++--- .../SystemMessageCountPO.java} | 6 +++--- .../strategy/SystemPreferenceStrategy.java | 2 +- .../strategy/TerminalPreferenceStrategy.java | 2 +- .../upload/FileUploadMessageDispatcher.java | 2 ++ .../service/impl/AuthenticationServiceImpl.java | 2 ++ .../infra/service/impl/FavoriteServiceImpl.java | 2 ++ .../service/impl/SystemMessageServiceImpl.java | 8 ++++---- .../infra/service/impl/TagRelServiceImpl.java | 2 ++ .../resources/mapper/SystemMessageMapper.xml | 2 +- 33 files changed, 99 insertions(+), 41 deletions(-) create mode 100644 orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/annotation/Keep.java rename orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/{dto => model}/ExecCommandDTO.java (93%) rename orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/{dto => model}/ExecCommandHostDTO.java (94%) rename orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/{dto => model}/FileUploadFileItemDTO.java (92%) rename orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/{dto/SystemMessageCountDTO.java => po/SystemMessageCountPO.java} (73%) 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-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-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-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..7a22ce4a 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 @@ -24,7 +24,7 @@ import javax.validation.constraints.Size; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "HostSftpConfig", description = "主机 SSH 配置") +@Schema(name = "HostSshConfigModel", description = "主机 SSH 配置") public class HostSshConfigModel implements GenericsDataModel, UpdatePasswordAction { @NotNull 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..ce68cbda 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,7 +1,7 @@ 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.model.ExecCommandDTO; import com.orion.visor.module.asset.handler.host.exec.command.handler.ExecTaskHandler; /** 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..42149022 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,8 +18,8 @@ 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.model.ExecCommandDTO; +import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; import com.orion.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; import com.orion.visor.module.infra.api.SystemMessageApi; import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; 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 93% 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..307cf4af 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,4 +1,4 @@ -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; 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/model/ExecCommandHostDTO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.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/ExecCommandHostDTO.java index 679222b2..449c8c86 100644 --- 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/model/ExecCommandHostDTO.java @@ -1,4 +1,4 @@ -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; 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/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 92% 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..1b17111c 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,4 +1,4 @@ -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; 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..9c9198dc 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,7 +15,7 @@ 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.model.FileUploadFileItemDTO; import com.orion.visor.module.asset.handler.host.upload.manager.FileUploadTaskManager; import com.orion.visor.module.asset.handler.host.upload.uploader.FileUploader; import com.orion.visor.module.asset.handler.host.upload.uploader.IFileUploader; 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/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/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 @@ - +