diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 0612fc7d..09e4b46d 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - test: + testing: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -19,4 +19,4 @@ jobs: run: | sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose sudo chmod u+x /usr/local/bin/docker-compose - docker compose up --build testing --exit-code-from testing --remove-orphans -f docker-compose-testing.yml + docker compose -f docker-compose-testing.yml up --build testing --exit-code-from testing --remove-orphans diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index 606e9846..349be792 100644 --- a/docker-compose-testing.yml +++ b/docker-compose-testing.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.10 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - orion-visor-mysql - orion-visor-redis orion-visor-mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.10 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s orion-visor-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.10 privileged: true ports: - 6380:6379 diff --git a/docker-compose.yml b/docker-compose.yml index 6a7d8f39..779231a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.10 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - orion-visor-mysql - orion-visor-redis orion-visor-mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.10 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s orion-visor-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.10 privileged: true ports: - 6380:6379 diff --git a/docker/e2e/Dockerfile b/docker/e2e/Dockerfile index 886f4f12..ed5f8110 100644 --- a/docker/e2e/Dockerfile +++ b/docker/e2e/Dockerfile @@ -2,5 +2,6 @@ FROM ghcr.io/linuxsuren/api-testing:v0.0.17 WORKDIR /workspace COPY . . +RUN chmod 777 * CMD [ "/workspace/entrypoint.sh" ] diff --git a/docker/e2e/testsuite.yaml b/docker/e2e/testsuite.yaml index 0cef6acc..8554d5e6 100644 --- a/docker/e2e/testsuite.yaml +++ b/docker/e2e/testsuite.yaml @@ -36,22 +36,14 @@ items: - name: haveUnRead request: api: /orion-visor/api/infra/system-message/has-unread - header: - Authorization: Bearer {{.login.data.token}} - name: queryOperatorLog request: api: /orion-visor/api/infra/mine/query-operator-log method: POST - header: - Authorization: Bearer {{.login.data.token}} - name: hostList request: api: /orion-visor/api/infra/tag/list?type=HOST - header: - Authorization: Bearer {{.login.data.token}} - name: queryHost request: api: /orion-visor/api/asset/host/query method: POST - header: - Authorization: Bearer {{.login.data.token}} diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 09c84caa..43cc515a 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.9 +version=2.0.10 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql diff --git a/docker/redis/build.sh b/docker/redis/build.sh index 2971d7a3..b6539d5d 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.9 +version=2.0.10 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} diff --git a/docker/service/build.sh b/docker/service/build.sh index dd440072..2f7da874 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.9 +version=2.0.10 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-ui/dist ./dist docker build -t orion-visor-service:${version} . diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index fae3a915..68975b9e 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.0.9 + 2.0.10 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java index 17956cbe..45e0e88e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java @@ -14,7 +14,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.0.9"; + String VERSION = "2.0.10"; /** * 同 ${spring.application.name} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java index c3baf40f..1d638d57 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java @@ -83,8 +83,12 @@ public interface ErrorMessage { String UNKNOWN_TYPE = "未知类型"; + String ERROR_TYPE = "错误的类型"; + String FILE_ABSENT = "文件不存在"; + String FILE_ABSENT_CLEAR = "文件不存在 (可能已被清理)"; + String LOG_ABSENT = "日志不存在"; String TASK_ABSENT = "任务不存在"; @@ -95,6 +99,8 @@ public interface ErrorMessage { String FILE_READ_ERROR = "文件读取失败"; + String FILE_READ_ERROR_CLEAR = "文件读取失败 (可能已被清理)"; + String PLEASE_CHECK_HOST_SSH = "请检查主机 {} 是否存在/权限/SSH配置"; String CLIENT_ABORT = "手动中断"; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/PathConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java similarity index 83% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/PathConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java index 0e7c2039..0f133894 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/PathConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java @@ -1,13 +1,13 @@ package com.orion.visor.framework.common.constant; /** - * 路径常量 + * 文件常量 * * @author Jiahang Li * @version 1.0.0 * @since 2024/4/17 10:35 */ -public interface PathConst { +public interface FileConst { String ERROR_LOG = "error.log"; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java new file mode 100644 index 00000000..d98f2e70 --- /dev/null +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java @@ -0,0 +1,25 @@ +package com.orion.visor.framework.common.entity; + +import lombok.Data; + +/** + * 自动清理配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/6/24 15:03 + */ +@Data +public class AutoClearConfig { + + /** + * 是否开启 + */ + private Boolean enabled; + + /** + * 保留周期 (天) + */ + private Integer keepPeriod; + +} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java index 1be17c53..e0025c08 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java @@ -20,6 +20,11 @@ public enum EndpointDefine { */ UPLOAD_SWAP("/upload/swap/{}"), + /** + * 批量执行日志 + */ + EXEC_LOG("/exec/{}/{}.log"), + ; /** diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 7b14cca3..e8e6d292 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -10,7 +10,7 @@ { "name": "orion.async.executor.core-pool-size", "type": "java.lang.Integer", - "description": "核心线程数量", + "description": "核心线程数量.", "defaultValue": "8" }, { diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java index a6373537..859c6d4d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java @@ -1,6 +1,7 @@ package com.orion.visor.framework.log.configuration.config; import com.orion.visor.framework.common.utils.ConfigUtils; +import com.orion.visor.framework.log.core.enums.LogPrinterMode; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -17,6 +18,11 @@ import java.util.List; @ConfigurationProperties("orion.logging.printer") public class LogPrinterConfig { + /** + * 类型 + */ + private LogPrinterMode mode; + /** * 字段配置 */ @@ -32,12 +38,31 @@ public class LogPrinterConfig { */ private String expression; - public void setField(LogPrinterFieldConfig field) { - this.field = field; - } - public void setHeaders(List headers) { this.headers = ConfigUtils.parseStringList(headers, String::toLowerCase); } + @Data + public static class LogPrinterFieldConfig { + + /** + * 忽略的字段 + */ + private List ignore; + + /** + * 脱敏的字段 + */ + private List desensitize; + + public void setIgnore(List ignore) { + this.ignore = ConfigUtils.parseStringList(ignore); + } + + public void setDesensitize(List desensitize) { + this.desensitize = ConfigUtils.parseStringList(desensitize); + } + + } + } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterFieldConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterFieldConfig.java deleted file mode 100644 index 7933a4ce..00000000 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterFieldConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.orion.visor.framework.log.configuration.config; - -import com.orion.visor.framework.common.utils.ConfigUtils; -import lombok.Data; - -import java.util.List; - -/** - * 日志打印字段配置 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/6/28 22:36 - */ -@Data -public class LogPrinterFieldConfig { - - /** - * 忽略的字段 - */ - private List ignore; - - /** - * 脱敏的字段 - */ - private List desensitize; - - public void setIgnore(List ignore) { - this.ignore = ConfigUtils.parseStringList(ignore); - } - - public void setDesensitize(List desensitize) { - this.desensitize = ConfigUtils.parseStringList(desensitize); - } - -} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java index 08d99cd8..4a416200 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java @@ -2,9 +2,9 @@ package com.orion.visor.framework.security.configuration; import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import com.orion.visor.framework.common.crypto.ValueCrypto; -import com.orion.visor.framework.security.configuration.config.CryptoConfig; +import com.orion.visor.framework.security.configuration.config.AesCryptoConfig; import com.orion.visor.framework.security.core.crypto.PrimaryValueCrypto; -import com.orion.visor.framework.security.core.crypto.aes.AesCryptoProcessor; +import com.orion.visor.framework.security.core.crypto.processor.AesCryptoProcessor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -12,8 +12,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; -import javax.annotation.Resource; - /** * 项目加密解密配置 * @@ -22,13 +20,10 @@ import javax.annotation.Resource; * @since 2023/7/7 23:59 */ @AutoConfiguration -@EnableConfigurationProperties(CryptoConfig.class) +@EnableConfigurationProperties({AesCryptoConfig.class}) @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_SECURITY_CRYPTO) public class OrionCryptoAutoConfiguration { - @Resource - private CryptoConfig config; - /** * @return 默认加密器 */ @@ -43,8 +38,8 @@ public class OrionCryptoAutoConfiguration { */ @Bean(initMethod = "init") @ConditionalOnProperty(value = "orion.crypto.aes.enabled", havingValue = "true") - public ValueCrypto aesValueCrypto() { - return new AesCryptoProcessor(config.getAes()); + public ValueCrypto aesValueCrypto(AesCryptoConfig config) { + return new AesCryptoProcessor(config); } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java similarity index 86% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java index d58383f5..a7086917 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java @@ -1,4 +1,4 @@ -package com.orion.visor.framework.security.core.crypto.aes; +package com.orion.visor.framework.security.configuration.config; import com.orion.lang.utils.crypto.CryptoConst; import com.orion.lang.utils.crypto.enums.PaddingMode; @@ -6,6 +6,7 @@ import com.orion.lang.utils.crypto.enums.WorkingMode; import com.orion.visor.framework.security.core.crypto.CryptoConfig; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.boot.context.properties.ConfigurationProperties; /** * aes 加密器配置 @@ -16,6 +17,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) +@ConfigurationProperties("orion.crypto.aes") public class AesCryptoConfig extends CryptoConfig { /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/CryptoConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/CryptoConfig.java deleted file mode 100644 index 077bd669..00000000 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/CryptoConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.orion.visor.framework.security.configuration.config; - -import com.orion.visor.framework.security.core.crypto.aes.AesCryptoConfig; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * 加密配置 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/7/8 0:01 - */ -@Data -@ConfigurationProperties("orion.crypto") -public class CryptoConfig { - - /** - * aes 加密器配置 - */ - private AesCryptoConfig aes; - -} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java index c9e46743..3f821dc4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/aes/AesCryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java @@ -1,4 +1,4 @@ -package com.orion.visor.framework.security.core.crypto.aes; +package com.orion.visor.framework.security.core.crypto.processor; import com.orion.lang.utils.Strings; import com.orion.lang.utils.crypto.Keys; @@ -6,6 +6,7 @@ import com.orion.lang.utils.crypto.enums.CipherAlgorithm; import com.orion.lang.utils.crypto.enums.WorkingMode; import com.orion.lang.utils.crypto.symmetric.SymmetricBuilder; import com.orion.lang.utils.crypto.symmetric.SymmetricCrypto; +import com.orion.visor.framework.security.configuration.config.AesCryptoConfig; import com.orion.visor.framework.security.core.crypto.CryptoProcessor; import javax.crypto.SecretKey; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 8919c7d4..84baae38 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -5,15 +5,10 @@ "type": "com.orion.visor.framework.security.configuration.config.SecurityConfig", "sourceType": "com.orion.visor.framework.security.configuration.config.SecurityConfig" }, - { - "name": "orion.crypto", - "type": "com.orion.visor.framework.security.configuration.config.CryptoConfig", - "sourceType": "com.orion.visor.framework.security.configuration.config.CryptoConfig" - }, { "name": "orion.crypto.aes", - "type": "com.orion.visor.framework.security.core.crypto.aes.AesCryptoConfig", - "sourceType": "com.orion.visor.framework.security.core.crypto.aes.AesCryptoConfig" + "type": "com.orion.visor.framework.security.configuration.config.AesCryptoConfig", + "sourceType": "com.orion.visor.framework.security.configuration.config.AesCryptoConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java index 68f70402..813f6d86 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java @@ -2,7 +2,8 @@ package com.orion.visor.framework.storage.configuration; import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.storage.configuration.config.StorageConfig; +import com.orion.visor.framework.storage.configuration.config.LocalStorageConfig; +import com.orion.visor.framework.storage.configuration.config.LogsStorageConfig; import com.orion.visor.framework.storage.core.client.PrimaryFileClient; import com.orion.visor.framework.storage.core.client.local.LocalFileClient; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -12,8 +13,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; -import javax.annotation.Resource; - /** * 存储配置类 * @@ -25,12 +24,9 @@ import javax.annotation.Resource; */ @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_STORAGE) -@EnableConfigurationProperties(StorageConfig.class) +@EnableConfigurationProperties({LocalStorageConfig.class, LogsStorageConfig.class}) public class OrionStorageAutoConfiguration { - @Resource - private StorageConfig config; - /** * @return 默认文件客户端 */ @@ -45,8 +41,8 @@ public class OrionStorageAutoConfiguration { */ @Bean @ConditionalOnProperty(value = "orion.storage.local.enabled", havingValue = "true") - public FileClient localFileClient() { - return new LocalFileClient(config.getLocal()); + public FileClient localFileClient(LocalStorageConfig config) { + return new LocalFileClient(config); } /** @@ -54,8 +50,8 @@ public class OrionStorageAutoConfiguration { */ @Bean @ConditionalOnProperty(value = "orion.storage.logs.enabled", havingValue = "true") - public FileClient logsFileClient() { - return new LocalFileClient(config.getLogs()); + public FileClient logsFileClient(LogsStorageConfig config) { + return new LocalFileClient(config); } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/StorageConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java similarity index 53% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/StorageConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java index 4359327f..80934dc2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/StorageConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java @@ -2,27 +2,19 @@ package com.orion.visor.framework.storage.configuration.config; import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * 存储配置 + * 本地存储配置 * * @author Jiahang Li * @version 1.0.0 * @since 2023/6/30 18:40 */ @Data -@ConfigurationProperties(prefix = "orion.storage") -public class StorageConfig { - - /** - * 本地文件客户端 配置 - */ - private LocalFileClientConfig local; - - /** - * 日志文件客户端 配置 - */ - private LocalFileClientConfig logs; +@EqualsAndHashCode(callSuper = true) +@ConfigurationProperties(prefix = "orion.storage.local") +public class LocalStorageConfig extends LocalFileClientConfig { } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java new file mode 100644 index 00000000..337c2ea4 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java @@ -0,0 +1,20 @@ +package com.orion.visor.framework.storage.configuration.config; + +import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 日志存储配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/6/30 18:40 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ConfigurationProperties(prefix = "orion.storage.logs") +public class LogsStorageConfig extends LocalFileClientConfig { + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 83% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 0c55fab6..46ac9a50 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,19 +1,14 @@ { "groups": [ - { - "name": "orion.storage", - "type": "com.orion.visor.framework.storage.configuration.config.StorageConfig", - "sourceType": "com.orion.visor.framework.storage.configuration.config.StorageConfig" - }, { "name": "orion.storage.local", - "type": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig", - "sourceType": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig" + "type": "com.orion.visor.framework.storage.configuration.config.LocalStorageConfig", + "sourceType": "com.orion.visor.framework.storage.configuration.config.LocalStorageConfig" }, { "name": "orion.storage.logs", - "type": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig", - "sourceType": "com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig" + "type": "com.orion.visor.framework.storage.configuration.config.LogsStorageConfig", + "sourceType": "com.orion.visor.framework.storage.configuration.config.LogsStorageConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 7a8a52bc..3796121a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -10,7 +10,7 @@ { "name": "orion.websocket.prefix", "type": "java.lang.String", - "description": "公共 websocket 前缀" + "description": "公共 websocket 前缀." }, { "name": "orion.websocket.binary-buffer-size", diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 855dfb64..3edfe856 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -189,10 +189,16 @@ app: exec-log: # 是否拼接 ansi 执行状态日志 append-ansi: true - # 自动清理执行文件 - auto-clear: true - # 保留周期 (天) - keep-period: 30 + # 自动清理配置 + auto-clear: + # 批量执行日志 + exec-log: + enabled: false + keep-period: 30 + # 主机连接日志 + host-connect-log: + enabled: false + keep-period: 30 # orion framework config orion: diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogAutoClearConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogAutoClearConfig.java new file mode 100644 index 00000000..da4a5d68 --- /dev/null +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogAutoClearConfig.java @@ -0,0 +1,22 @@ +package com.orion.visor.module.asset.define.config; + +import com.orion.visor.framework.common.entity.AutoClearConfig; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 批量执行日志自动清理配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/6/24 15:01 + */ +@Data +@Component +@EqualsAndHashCode(callSuper = true) +@ConfigurationProperties(prefix = "app.auto-clear.exec-log") +public class AppExecLogAutoClearConfig extends AutoClearConfig { + +} diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogConfig.java index aa6f4c0e..d2262949 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogConfig.java @@ -21,20 +21,8 @@ public class AppExecLogConfig { */ private Boolean appendAnsi; - /** - * 自动清理执行文件 - */ - private Boolean autoClear; - - /** - * 保留周期 (天) - */ - private Integer keepPeriod; - public AppExecLogConfig() { this.appendAnsi = true; - this.autoClear = true; - this.keepPeriod = 30; } } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppHostConnectLogAutoClearConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppHostConnectLogAutoClearConfig.java new file mode 100644 index 00000000..3c7a2906 --- /dev/null +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppHostConnectLogAutoClearConfig.java @@ -0,0 +1,22 @@ +package com.orion.visor.module.asset.define.config; + +import com.orion.visor.framework.common.entity.AutoClearConfig; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 主机连接日志自动清理配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/6/24 15:01 + */ +@Data +@Component +@EqualsAndHashCode(callSuper = true) +@ConfigurationProperties(prefix = "app.auto-clear.host-connect-log") +public class AppHostConnectLogAutoClearConfig extends AutoClearConfig { + +} diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java index f872735e..4e42d0d3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java @@ -7,6 +7,7 @@ import lombok.*; import javax.validation.constraints.Size; import java.util.Date; +import java.util.List; /** * 批量执行日志 查询请求对象 @@ -54,4 +55,11 @@ public class ExecLogQueryRequest extends PageRequest { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date[] startTimeRange; + @Schema(description = "创建时间 <=") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTimeLe; + + @Schema(description = "状态") + private List statusList; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostConnectLogQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostConnectLogQueryRequest.java index df786c32..5d33a3b6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostConnectLogQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostConnectLogQueryRequest.java @@ -56,4 +56,11 @@ public class HostConnectLogQueryRequest extends PageRequest { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date[] startTimeRange; + @Schema(description = "创建时间 <=") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTimeLe; + + @Schema(description = "状态") + private List statusList; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecStatusEnum.java index cbbf5451..a8516db2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecStatusEnum.java @@ -1,8 +1,11 @@ package com.orion.visor.module.asset.enums; +import com.orion.lang.utils.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.List; + /** * 批量执行状态 * @@ -36,6 +39,8 @@ public enum ExecStatusEnum { ; + public static final List FINISH_STATUS_LIST = Lists.of(COMPLETED.name(), FAILED.name()); + private final boolean closeable; public static ExecStatusEnum of(String status) { diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostConnectStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostConnectStatusEnum.java index c9a86f27..892eaffa 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostConnectStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostConnectStatusEnum.java @@ -1,5 +1,9 @@ package com.orion.visor.module.asset.enums; +import com.orion.lang.utils.collect.Lists; + +import java.util.List; + /** * 主机连接状态 * @@ -31,6 +35,8 @@ public enum HostConnectStatusEnum { ; + public static final List FINISH_STATUS_LIST = Lists.of(COMPLETE.name(), FAILED.name(), FORCE_OFFLINE.name()); + public static HostConnectStatusEnum of(String type) { if (type == null) { return null; 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 6966b0fe..45514cfa 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 @@ -31,7 +31,7 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler { // 拼接启动日志 AnsiAppender appender = AnsiAppender.create() .append(AnsiForeground.BRIGHT_GREEN, "> 准备执行命令 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine() .append(AnsiForeground.BRIGHT_BLUE, "执行记录: ") .append(execCommand.getLogId()) @@ -81,7 +81,7 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler { // 非脚本执行拼接开始执行日志 if (!Booleans.isTrue(execCommand.getScriptExec())) { appender.append(AnsiForeground.BRIGHT_GREEN, "> 开始执行命令 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine(); } this.appendLog(appender); @@ -94,7 +94,7 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler { AnsiAppender startAppender = AnsiAppender.create() .newLine() .append(AnsiForeground.BRIGHT_GREEN, "> 准备上传脚本 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine() .append(AnsiForeground.BRIGHT_BLUE, "文件路径: ") .append(execHostCommand.getScriptPath()) @@ -105,18 +105,18 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler { // 拼接完成日志 AnsiAppender finishAppender = AnsiAppender.create() .append(AnsiForeground.BRIGHT_GREEN, "< 脚本上传成功 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine() .newLine() .append(AnsiForeground.BRIGHT_GREEN, "> 开始执行脚本 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine(); this.appendLog(finishAppender); } catch (Exception e) { // 拼接失败日志 AnsiAppender errorAppender = AnsiAppender.create() .append(AnsiForeground.BRIGHT_RED, "< 脚本上传失败 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine(); this.appendLog(errorAppender); throw e; @@ -133,12 +133,12 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler { if (this.status == ExecHostStatusEnum.INTERRUPTED) { // 中断执行 appender.append(AnsiForeground.BRIGHT_YELLOW, "< 命令执行中断 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine(); } else if (this.status == ExecHostStatusEnum.FAILED) { // 执行失败 appender.append(AnsiForeground.BRIGHT_RED, "< 命令执行失败 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine() .append(AnsiForeground.BRIGHT_RED, "错误原因: ") .append(this.getErrorMessage(e)) @@ -146,14 +146,14 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler { } else if (this.status == ExecHostStatusEnum.TIMEOUT) { // 更新执行超时 appender.append(AnsiForeground.BRIGHT_YELLOW, "< 命令执行超时 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine(); } else { long ms = updateRecord.getFinishTime().getTime() - updateRecord.getStartTime().getTime(); Integer exitCode = updateRecord.getExitCode(); // 执行完成 appender.append(AnsiForeground.BRIGHT_GREEN, "< 命令执行完成 ") - .append(Dates.current()) + .append(this.getCurrentTime()) .newLine() .append(AnsiForeground.BRIGHT_BLUE, "exit: "); if (ExitCode.isSuccess(exitCode)) { @@ -173,4 +173,13 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler { this.appendLog(appender); } + /** + * 获取当前时间 + * + * @return 当前时间 + */ + private String getCurrentTime() { + return Const.SPACE + Dates.current(); + } + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java index a5583943..7e1f8426 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java @@ -13,6 +13,7 @@ import com.orion.visor.framework.common.enums.BooleanBit; import com.orion.visor.framework.websocket.core.utils.WebSockets; import com.orion.visor.module.asset.dao.HostDAO; import com.orion.visor.module.asset.define.operator.HostTerminalOperatorType; +import com.orion.visor.module.asset.entity.domain.HostConnectLogDO; import com.orion.visor.module.asset.entity.domain.HostDO; import com.orion.visor.module.asset.entity.dto.HostTerminalConnectDTO; import com.orion.visor.module.asset.entity.request.host.HostConnectLogCreateRequest; @@ -95,9 +96,9 @@ public class TerminalCheckHandler extends AbstractTerminalHandler idList, String source); + /** + * 批量删除批量执行日志 + * + * @param idList idList + * @return effect + */ + Integer deleteExecLogByIdList(List idList); + /** * 查询批量执行日志数量 * @@ -128,4 +136,11 @@ public interface ExecLogService { */ void downloadLogFile(Long id, String source, HttpServletResponse response); + /** + * 异步删除日志文件 + * + * @param idList idList + */ + void asyncDeleteLogFiles(List idList); + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostConnectLogService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostConnectLogService.java index 38bbb7b2..f138be3b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostConnectLogService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostConnectLogService.java @@ -1,6 +1,7 @@ package com.orion.visor.module.asset.service; import com.orion.lang.define.wrapper.DataGrid; +import com.orion.visor.module.asset.entity.domain.HostConnectLogDO; import com.orion.visor.module.asset.entity.request.host.HostConnectLogCreateRequest; import com.orion.visor.module.asset.entity.request.host.HostConnectLogQueryRequest; import com.orion.visor.module.asset.entity.vo.HostConnectLogVO; @@ -25,9 +26,9 @@ public interface HostConnectLogService { * * @param type type * @param request request - * @return id + * @return record */ - Long create(HostConnectTypeEnum type, HostConnectLogCreateRequest request); + HostConnectLogDO create(HostConnectTypeEnum type, HostConnectLogCreateRequest request); /** * 分页查询主机连接日志 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskService.java index ec0470a3..988563fa 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskService.java @@ -19,8 +19,6 @@ import java.util.List; */ public interface UploadTaskService { - String SWAP_ENDPOINT = "/upload/swap/{}"; - /** * 创建上传任务 * 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 5571042b..f46e0686 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 @@ -14,7 +14,8 @@ 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; +import com.orion.visor.framework.common.constant.FileConst; +import com.orion.visor.framework.common.enums.EndpointDefine; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.framework.common.security.LoginUser; import com.orion.visor.framework.common.utils.PathUtils; @@ -140,10 +141,10 @@ public class ExecCommandServiceImpl implements ExecCommandService { execLogDAO.insert(execLog); Long execId = execLog.getId(); // 获取内置参数 - Map builtinsParams = this.getBaseBuiltinsParams(execId, request); + Map builtinParams = this.getBaseBuiltinParams(execId, request); // 设置主机日志 List execHostLogs = hosts.stream() - .map(s -> this.convertExecHostLog(s, execLog, hostConfigMap.get(s.getId()), builtinsParams)) + .map(s -> this.convertExecHostLog(s, execLog, hostConfigMap.get(s.getId()), builtinParams)) .collect(Collectors.toList()); execHostLogDAO.insertBatch(execHostLogs); // 操作日志 @@ -228,16 +229,16 @@ public class ExecCommandServiceImpl implements ExecCommandService { /** * 转换为 execHostLog * - * @param host host - * @param execLog execLog - * @param config config - * @param builtinsParams builtinsParams + * @param host host + * @param execLog execLog + * @param config config + * @param builtinParams builtinParams * @return execHostLog */ private ExecHostLogDO convertExecHostLog(HostDO host, ExecLogDO execLog, HostSshConfigModel config, - Map builtinsParams) { + Map builtinParams) { Long execId = execLog.getId(); Long hostId = host.getId(); // 脚本路径 @@ -246,7 +247,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { scriptPath = this.buildScriptPath(config.getUsername(), config.getOsType(), execId, hostId); } // 获取参数 - String parameter = JSON.toJSONString(this.getHostParams(builtinsParams, host, config, scriptPath)); + String parameter = JSON.toJSONString(this.getHostParams(builtinParams, host, config, scriptPath)); return ExecHostLogDO.builder() .logId(execId) .hostId(hostId) @@ -267,7 +268,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { * @param request request * @return params */ - private Map getBaseBuiltinsParams(Long execId, ExecCommandExecDTO request) { + private Map getBaseBuiltinParams(Long execId, ExecCommandExecDTO request) { String uuid = UUIds.random(); Date date = new Date(); // 输入参数 @@ -353,8 +354,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { * @return logPath */ private String buildLogPath(Long logId, Long hostId) { - String logFile = "/" + PathConst.EXEC + "/" + logId + "/" + logId + "_" + hostId + ".log"; - return logsFileClient.getReturnPath(logFile); + return logsFileClient.getReturnPath(EndpointDefine.EXEC_LOG.format(logId, hostId)); } /** @@ -368,11 +368,11 @@ public class ExecCommandServiceImpl implements ExecCommandService { */ private String buildScriptPath(String username, String osType, Long logId, Long hostId) { HostSshOsTypeEnum os = HostSshOsTypeEnum.of(osType); - String name = PathConst.EXEC - + "_" + logId - + "_" + hostId + String name = FileConst.EXEC + + "/" + logId + + "/" + hostId + os.getScriptSuffix(); - return PathUtils.buildAppPath(HostSshOsTypeEnum.WINDOWS.equals(os), username, PathConst.SCRIPT, name); + return PathUtils.buildAppPath(HostSshOsTypeEnum.WINDOWS.equals(os), username, FileConst.SCRIPT, name); } } 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 9fd13b7e..36998bd0 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 @@ -11,11 +11,13 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; +import com.orion.spring.SpringHolder; 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; +import com.orion.visor.framework.common.constant.FileConst; +import com.orion.visor.framework.common.enums.EndpointDefine; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.framework.common.utils.Valid; import com.orion.visor.framework.redis.core.utils.RedisStrings; @@ -46,11 +48,13 @@ import com.orion.visor.module.asset.service.ExecLogService; import com.orion.visor.module.asset.service.HostConfigService; import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.InputStream; import java.util.*; import java.util.stream.Collectors; @@ -173,20 +177,7 @@ public class ExecLogServiceImpl implements ExecLogService { @Override @Transactional(rollbackFor = Exception.class) public Integer deleteExecLogById(Long id, String source) { - log.info("ExecLogService-deleteExecLogById id: {}", id); - // 检查数据是否存在 - ExecLogDO record = execLogDAO.selectByIdSource(id, source); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); - // 中断命令执行 - this.interruptTask(Lists.singleton(id)); - // 删除执行日志 - int effect = execLogDAO.deleteById(id); - // 删除主机日志 - execHostLogService.deleteExecHostLogByLogId(Lists.singleton(id)); - log.info("ExecLogService-deleteExecLogById id: {}, effect: {}", id, effect); - // 设置日志参数 - OperatorLogs.add(OperatorLogs.COUNT, effect); - return effect; + return this.deleteExecLogByIdList(Lists.singleton(id), source); } @Override @@ -201,15 +192,28 @@ public class ExecLogServiceImpl implements ExecLogService { .count() .intValue(); Valid.isTrue(idList.size() == count, ErrorMessage.DATA_MODIFIED); + // 删除 + return this.deleteExecLogByIdList(idList); + } + + @Override + public Integer deleteExecLogByIdList(List idList) { + log.info("ExecLogService-deleteExecLogByIdList start: {}", idList); + if (Lists.isEmpty(idList)) { + OperatorLogs.add(OperatorLogs.COUNT, Const.N_0); + return Const.N_0; + } // 中断命令执行 this.interruptTask(idList); // 删除执行日志 int effect = execLogDAO.deleteBatchIds(idList); // 删除主机日志 execHostLogService.deleteExecHostLogByLogId(idList); - log.info("ExecLogService-deleteExecLogByIdList effect: {}", effect); + log.info("ExecLogService-deleteExecLogByIdList end effect: {}", effect); // 设置日志参数 OperatorLogs.add(OperatorLogs.COUNT, effect); + // 异步删除文件 + SpringHolder.getBean(ExecLogService.class).asyncDeleteLogFiles(idList); return effect; } @@ -229,19 +233,8 @@ public class ExecLogServiceImpl implements ExecLogService { .stream() .map(ExecLogDO::getId) .collect(Collectors.toList()); - int effect = 0; - if (!idList.isEmpty()) { - // 中断命令执行 - this.interruptTask(idList); - // 删除执行日志 - effect = execLogDAO.delete(wrapper); - // 删除主机日志 - execHostLogService.deleteExecHostLogByLogId(idList); - } - log.info("ExecLogService.clearExecLog finish {}", effect); - // 设置日志参数 - OperatorLogs.add(OperatorLogs.COUNT, effect); - return effect; + // 删除 + return this.deleteExecLogByIdList(idList); } @Override @@ -428,19 +421,35 @@ public class ExecLogServiceImpl implements ExecLogService { } catch (Exception e) { log.error("ExecLogService.downloadLogFile error id: {}", id, e); Streams.close(in); - String errorMessage = ErrorMessage.FILE_READ_ERROR; + String errorMessage = ErrorMessage.FILE_READ_ERROR_CLEAR; if (e instanceof InvalidArgumentException) { errorMessage = e.getMessage(); } // 响应错误信息 try { - Servlets.transfer(response, Strings.bytes(errorMessage), PathConst.ERROR_LOG); + Servlets.transfer(response, Strings.bytes(errorMessage), FileConst.ERROR_LOG); } catch (Exception ex) { log.error("ExecLogService.downloadLogFile transfer-error id: {}", id, ex); } } } + @Override + @Async("asyncExecutor") + public void asyncDeleteLogFiles(List idList) { + if (Lists.isEmpty(idList)) { + return; + } + // 删除 + idList.stream() + .map(s -> EndpointDefine.EXEC_LOG.format(s, Const.EMPTY)) + .map(logsFileClient::getReturnPath) + .map(logsFileClient::getAbsolutePath) + .map(Files1::getParentPath) + .map(File::new) + .forEach(Files1::delete); + } + /** * 构建查询 wrapper * @@ -457,8 +466,10 @@ public class ExecLogServiceImpl implements ExecLogService { .like(ExecLogDO::getDescription, request.getDescription()) .like(ExecLogDO::getCommand, request.getCommand()) .eq(ExecLogDO::getStatus, request.getStatus()) + .in(ExecLogDO::getStatus, request.getStatusList()) .ge(ExecLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 0)) .le(ExecLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 1)) + .le(ExecLogDO::getCreateTime, request.getCreateTimeLe()) .orderByDesc(ExecLogDO::getId); } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConnectLogServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConnectLogServiceImpl.java index 38dae986..bac1b741 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConnectLogServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConnectLogServiceImpl.java @@ -2,13 +2,13 @@ package com.orion.visor.module.asset.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.constant.Const; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Valid; import com.orion.lang.utils.collect.Lists; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.ErrorMessage; +import com.orion.visor.framework.common.utils.Valid; import com.orion.visor.framework.security.core.utils.SecurityUtils; import com.orion.visor.module.asset.convert.HostConnectLogConvert; import com.orion.visor.module.asset.dao.HostConnectLogDAO; @@ -52,7 +52,7 @@ public class HostConnectLogServiceImpl implements HostConnectLogService { private HostTerminalManager hostTerminalManager; @Override - public Long create(HostConnectTypeEnum type, HostConnectLogCreateRequest request) { + public HostConnectLogDO create(HostConnectTypeEnum type, HostConnectLogCreateRequest request) { HostConnectLogDO record = HostConnectLogConvert.MAPPER.to(request); record.setType(type.name()); String status = request.getStatus(); @@ -64,7 +64,7 @@ public class HostConnectLogServiceImpl implements HostConnectLogService { record.setEndTime(new Date()); } hostConnectLogDAO.insert(record); - return record.getId(); + return record; } @Override @@ -169,6 +169,11 @@ public class HostConnectLogServiceImpl implements HostConnectLogService { @Override public Integer deleteHostConnectLog(List idList) { log.info("HostConnectLogService.deleteHostConnectLog start {}", JSON.toJSONString(idList)); + if (Lists.isEmpty(idList)) { + OperatorLogs.add(OperatorLogs.COUNT, Const.N_0); + return Const.N_0; + } + // 删除 int effect = hostConnectLogDAO.deleteBatchIds(idList); log.info("HostConnectLogService.deleteHostConnectLog finish {}", effect); // 设置日志参数 @@ -184,13 +189,21 @@ public class HostConnectLogServiceImpl implements HostConnectLogService { @Override public Integer clearHostConnectLog(HostConnectLogQueryRequest request) { log.info("HostConnectLogService.clearHostConnectLog start {}", JSON.toJSONString(request)); + // 查询 + LambdaQueryWrapper wrapper = this.buildQueryWrapper(request) + .select(HostConnectLogDO::getId); + List list = hostConnectLogDAO.selectList(wrapper); + if (list.isEmpty()) { + log.info("HostConnectLogService.clearHostConnectLog empty"); + // 设置日志参数 + OperatorLogs.add(OperatorLogs.COUNT, Const.N_0); + return Const.N_0; + } // 删除 - LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); - int effect = hostConnectLogDAO.delete(wrapper); - log.info("HostConnectLogService.clearHostConnectLog finish {}", effect); - // 设置日志参数 - OperatorLogs.add(OperatorLogs.COUNT, effect); - return effect; + List idList = list.stream() + .map(HostConnectLogDO::getId) + .collect(Collectors.toList()); + return this.deleteHostConnectLog(idList); } @Override @@ -229,8 +242,10 @@ public class HostConnectLogServiceImpl implements HostConnectLogService { .eq(HostConnectLogDO::getType, request.getType()) .like(HostConnectLogDO::getToken, request.getToken()) .eq(HostConnectLogDO::getStatus, request.getStatus()) + .in(HostConnectLogDO::getStatus, request.getStatusList()) .ge(HostConnectLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 0)) .le(HostConnectLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 1)) + .le(HostConnectLogDO::getCreateTime, request.getCreateTimeLe()) .orderByDesc(HostConnectLogDO::getId); } 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 f19caeaf..27c80624 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 @@ -14,6 +14,7 @@ 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.enums.EndpointDefine; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.framework.common.security.LoginUser; @@ -140,7 +141,7 @@ public class UploadTaskServiceImpl implements UploadTaskService { } uploadTaskFileDAO.insertBatch(uploadFiles); // 设置 uploadToken - String token = fileUploadApi.createUploadToken(user.getId(), Strings.format(SWAP_ENDPOINT, id)); + String token = fileUploadApi.createUploadToken(user.getId(), EndpointDefine.UPLOAD_SWAP.format(id)); log.info("UploadTaskService-createUploadTask id: {}, effect: {}", id, effect); // 添加日志参数 OperatorLogs.add(OperatorLogs.NAME, record.getDescription()); @@ -296,7 +297,7 @@ public class UploadTaskServiceImpl implements UploadTaskService { } // 查询记录 List paths = idList.stream() - .map(s -> Strings.format(SWAP_ENDPOINT, s)) + .map(EndpointDefine.UPLOAD_SWAP::format) .map(localFileClient::getReturnPath) .map(localFileClient::getAbsolutePath) .collect(Collectors.toList()); @@ -348,7 +349,7 @@ public class UploadTaskServiceImpl implements UploadTaskService { .collect(Collectors.groupingBy(UploadTaskFileDO::getFileId)); fileIdGroups.forEach((k, v) -> { // 获取文件实际路径 - String path = localFileClient.getReturnPath(Strings.format(SWAP_ENDPOINT, id) + Const.SLASH + k); + String path = localFileClient.getReturnPath(EndpointDefine.UPLOAD_SWAP.format(id) + Const.SLASH + k); File file = new File(localFileClient.getAbsolutePath(path)); // 文件不存在/大小不正确 if (!Files1.isFile(file) || file.length() != v.get(0).getFileSize()) { 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 b5aa18cb..ebe1cccb 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 @@ -1,22 +1,18 @@ 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; -import com.orion.visor.module.asset.define.config.AppExecLogConfig; -import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; +import com.orion.visor.module.asset.define.config.AppExecLogAutoClearConfig; +import com.orion.visor.module.asset.entity.request.exec.ExecLogQueryRequest; +import com.orion.visor.module.asset.enums.ExecStatusEnum; +import com.orion.visor.module.asset.service.ExecLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.io.File; -import java.util.List; +import java.util.Date; /** * 执行日志文件自动清理 @@ -27,23 +23,19 @@ import java.util.List; */ @Slf4j @Component -@ConditionalOnProperty(value = "app.exec-log.auto-clear", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(value = "app.auto-clear.exec-log.enabled", havingValue = "true") public class ExecLogFileAutoClearTask { /** * 分布式锁名称 */ - private static final String LOCK_KEY = "clear:elf:lock"; + private static final String LOCK_KEY = "clear:exl:lock"; @Resource - private AppExecLogConfig appExecLogConfig; - - @Keep - @Resource - private FileClient logsFileClient; + private AppExecLogAutoClearConfig appExecLogAutoClearConfig; @Resource - private ExecHostLogDAO execHostLogDAO; + private ExecLogService execLogService; /** * 清理 @@ -52,45 +44,23 @@ public class ExecLogFileAutoClearTask { public void clear() { log.info("ExecLogFileAutoClearTask.clear start"); // 获取锁并执行 - LockerUtils.tryLock(LOCK_KEY, this::doClearFile); + LockerUtils.tryLock(LOCK_KEY, this::doClear); log.info("ExecLogFileAutoClearTask.clear finish"); } /** - * 执行清理文件 + * 执行清理 */ - private void doClearFile() { + private void doClear() { // 删除的时间区间 - String maxPeriod = Dates.stream() - .subDay(appExecLogConfig.getKeepPeriod()) - .format(); - // 获取需要删除的最大id - ExecHostLogDO hostLog = execHostLogDAO.of() - .createWrapper() - .select(ExecHostLogDO::getLogId, ExecHostLogDO::getLogPath) - .lt(ExecHostLogDO::getCreateTime, maxPeriod) - .orderByDesc(ExecHostLogDO::getId) - .then() - .getOne(); - if (hostLog == null) { - return; - } - // 获取执行日志根目录 - String hostLogPath = logsFileClient.getAbsolutePath(hostLog.getLogPath()); - String execLogPath = Files1.getParentPath(hostLogPath); - String parentPath = Files1.getParentPath(execLogPath); - // 获取需要删除的文件 - List files = Files1.listFilesFilter(parentPath, s -> { - if (!Strings.isInteger(s.getName())) { - return false; - } - return Long.parseLong(s.getName()) <= hostLog.getLogId(); - }, false, true); - if (files.isEmpty()) { - return; - } - // 删除日志文件 - files.forEach(Files1::delete); + Date createLessEq = Dates.stream() + .subDay(appExecLogAutoClearConfig.getKeepPeriod()) + .date(); + // 清理 + ExecLogQueryRequest request = new ExecLogQueryRequest(); + request.setCreateTimeLe(createLessEq); + request.setStatusList(ExecStatusEnum.FINISH_STATUS_LIST); + execLogService.clearExecLog(request); } } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/HostConnectLogAutoClearTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/HostConnectLogAutoClearTask.java new file mode 100644 index 00000000..3edd504c --- /dev/null +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/HostConnectLogAutoClearTask.java @@ -0,0 +1,66 @@ +package com.orion.visor.module.asset.task; + +import com.orion.lang.utils.time.Dates; +import com.orion.visor.framework.common.utils.LockerUtils; +import com.orion.visor.module.asset.define.config.AppHostConnectLogAutoClearConfig; +import com.orion.visor.module.asset.entity.request.host.HostConnectLogQueryRequest; +import com.orion.visor.module.asset.enums.HostConnectStatusEnum; +import com.orion.visor.module.asset.service.HostConnectLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Date; + +/** + * 主机连接日志自动清理 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/4/24 23:50 + */ +@Slf4j +@Component +@ConditionalOnProperty(value = "app.auto-clear.host-connect-log.enabled", havingValue = "true") +public class HostConnectLogAutoClearTask { + + /** + * 分布式锁名称 + */ + private static final String LOCK_KEY = "clear:hcl:lock"; + + @Resource + private AppHostConnectLogAutoClearConfig appHostConnectLogAutoClearConfig; + + @Resource + private HostConnectLogService hostConnectLogService; + + /** + * 清理 + */ + @Scheduled(cron = "0 10 3 * * ?") + public void clear() { + log.info("HostConnectLogAutoClearTask.clear start"); + // 获取锁并执行 + LockerUtils.tryLock(LOCK_KEY, this::doClear); + log.info("HostConnectLogAutoClearTask.clear finish"); + } + + /** + * 执行清理 + */ + private void doClear() { + // 删除的时间区间 + Date createLessEq = Dates.stream() + .subDay(appHostConnectLogAutoClearConfig.getKeepPeriod()) + .date(); + // 清理 + HostConnectLogQueryRequest request = new HostConnectLogQueryRequest(); + request.setCreateTimeLe(createLessEq); + request.setStatusList(HostConnectStatusEnum.FINISH_STATUS_LIST); + hostConnectLogService.clearHostConnectLog(request); + } + +} diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 57% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json index dd8ff59f..211c787c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -14,25 +14,35 @@ "name": "app.exec-log", "type": "com.orion.visor.module.asset.define.config.AppExecLogConfig", "sourceType": "com.orion.visor.module.asset.define.config.AppExecLogConfig" + }, + { + "name": "app.auto-clear.exec-log", + "type": "com.orion.visor.module.asset.define.config.AppExecLogAutoClearConfig", + "sourceType": "com.orion.visor.module.asset.define.config.AppExecLogAutoClearConfig" + }, + { + "name": "app.auto-clear.host-connect-log", + "type": "com.orion.visor.module.asset.define.config.AppHostConnectLogAutoClearConfig", + "sourceType": "com.orion.visor.module.asset.define.config.AppHostConnectLogAutoClearConfig" } ], "properties": [ { "name": "app.tracker.offset", "type": "java.lang.Integer", - "description": "加载偏移量 (行)", + "description": "加载偏移量 (行).", "defaultValue": "300" }, { "name": "app.tracker.delay", "type": "java.lang.Integer", - "description": "延迟时间 (ms)", + "description": "延迟时间 (ms).", "defaultValue": "100" }, { "name": "app.tracker.wait-times", "type": "java.lang.Integer", - "description": "文件未找到等待次数", + "description": "文件未找到等待次数.", "defaultValue": "100" }, { @@ -54,16 +64,24 @@ "defaultValue": "true" }, { - "name": "app.exec-log.auto-clear", + "name": "app.auto-clear.exec-log.enabled", "type": "java.lang.Boolean", - "description": "自动清理执行文件.", - "defaultValue": "true" + "description": "开启 批量执行日志自动清理." }, { - "name": "app.exec-log.keep-period", + "name": "app.auto-clear.exec-log.keep-period", "type": "java.lang.Integer", - "description": "保留周期 (天)", - "defaultValue": "30" + "description": "批量执行日志自动清理 保留周期 (天)." + }, + { + "name": "app.auto-clear.host-connect-log.enabled", + "type": "java.lang.Boolean", + "description": "开启 主机连接日志自动清理." + }, + { + "name": "app.auto-clear.host-connect-log.keep-period", + "type": "java.lang.Integer", + "description": "主机连接日志自动清理 保留周期 (天)." } ] } \ No newline at end of file diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java index 0931c276..e288bb6a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java @@ -27,7 +27,7 @@ import java.util.Map; public class PreferenceUpdatePartialRequest implements Serializable { @NotBlank - @Size(max = 12) + @Size(max = 16) @Schema(description = "类型") private String type; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java index 05df303f..9e736bea 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java @@ -25,7 +25,7 @@ import java.io.Serializable; public class PreferenceUpdateRequest implements Serializable { @NotBlank - @Size(max = 12) + @Size(max = 16) @Schema(description = "类型") private String type; 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 deb3b821..631173a5 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 @@ -29,7 +29,7 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy schema = dictKeyService.getDictSchema(key); // 转换 return values.stream() + .sorted(Comparator.comparing(DictValueDO::getSort)) .map(s -> { // 设置值 JSONObject item = new JSONObject(); diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/spring-configuration-metadata.json rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index 9e64dd71..ccaa9456 100644 --- a/orion-visor-ui/.env.development +++ b/orion-visor-ui/.env.development @@ -1,6 +1,6 @@ VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api' VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive' -VITE_APP_VERSION= '2.0.9' +VITE_APP_VERSION= '2.0.10' VITE_APP_RELEASE= 'community' VITE_SFTP_PREVIEW_MB= 2 VITE_DEMO_MODE= false diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index 8f9f26d4..9b06081c 100644 --- a/orion-visor-ui/.env.production +++ b/orion-visor-ui/.env.production @@ -1,6 +1,6 @@ VITE_API_BASE_URL= '/orion-visor/api' VITE_WS_BASE_URL= '/orion-visor/keep-alive' -VITE_APP_VERSION= '2.0.9' +VITE_APP_VERSION= '2.0.10' VITE_APP_RELEASE= 'community' VITE_SFTP_PREVIEW_MB= 2 VITE_DEMO_MODE= false diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 876c6a20..fb8d5f70 100644 --- a/orion-visor-ui/package.json +++ b/orion-visor-ui/package.json @@ -1,7 +1,7 @@ { "name": "orion-visor-ui", "description": "Orion Visor UI", - "version": "2.0.9", + "version": "2.0.10", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/orion-visor-ui/src/api/user/preference.ts b/orion-visor-ui/src/api/user/preference.ts index 446a987e..7ebdc0a6 100644 --- a/orion-visor-ui/src/api/user/preference.ts +++ b/orion-visor-ui/src/api/user/preference.ts @@ -1,7 +1,7 @@ import axios from 'axios'; import qs from 'query-string'; -type PreferenceType = 'SYSTEM' | 'TERMINAL' +export type PreferenceType = 'SYSTEM' | 'TERMINAL' /** * 用户偏好更新请求-单个 diff --git a/orion-visor-ui/src/store/modules/cache/index.ts b/orion-visor-ui/src/store/modules/cache/index.ts index fce9e372..7787e6ef 100644 --- a/orion-visor-ui/src/store/modules/cache/index.ts +++ b/orion-visor-ui/src/store/modules/cache/index.ts @@ -2,6 +2,8 @@ import type { CacheState } from './types'; import type { AxiosResponse } from 'axios'; import type { TagType } from '@/api/meta/tag'; import { getTagList } from '@/api/meta/tag'; +import type { PreferenceType } from '@/api/user/preference'; +import { getPreference } from '@/api/user/preference'; import { defineStore } from 'pinia'; import { getUserList } from '@/api/user/user'; import { getRoleList } from '@/api/user/role'; @@ -131,5 +133,15 @@ export default defineStore('cache', { return await this.load('execJob', getExecJobList, force); }, + // 加载偏好 + async loadPreference(type: PreferenceType, force = false) { + return await this.load(`preference_${type}`, () => getPreference(type), force); + }, + + // 加载偏好项 + async loadPreferenceItem(type: PreferenceType, item: string, force = false) { + return await this.load(`preference_${type}_${item}`, () => getPreference(type, [item]), force); + }, + } }); diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts index b239509c..185909ff 100644 --- a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts +++ b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts @@ -3,6 +3,13 @@ import { dateFormat } from '@/utils'; const columns = [ { + title: 'id', + dataIndex: 'id', + slotName: 'id', + width: 100, + align: 'left', + fixed: 'left', + }, { title: '连接用户', dataIndex: 'username', slotName: 'username', diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts index 90b5f741..d9c5fead 100644 --- a/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts +++ b/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts @@ -3,6 +3,13 @@ import { dateFormat } from '@/utils'; const columns = [ { + title: 'id', + dataIndex: 'id', + slotName: 'id', + width: 100, + align: 'left', + fixed: 'left', + }, { title: '操作用户', dataIndex: 'username', slotName: 'username', diff --git a/pom.xml b/pom.xml index 2a2f43fa..3b5fda6a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.0.9 + 2.0.10 8 8 3.0.0-M5 diff --git a/sql/init-2-schema-tables.sql b/sql/init-2-schema-tables.sql index db1157eb..04c28295 100644 --- a/sql/init-2-schema-tables.sql +++ b/sql/init-2-schema-tables.sql @@ -597,7 +597,7 @@ CREATE TABLE `preference` ( `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id', `user_id` bigint(0) NULL DEFAULT NULL COMMENT '用户id', - `type` char(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '偏好类型', + `type` char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '偏好类型', `item` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项', `value` json NULL COMMENT '配置值', `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',