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/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/LocalStorageConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java new file mode 100644 index 00000000..8b028ebe --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java @@ -0,0 +1,16 @@ +package com.orion.visor.framework.storage.configuration.config; + +import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 本地存储配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/6/30 18:40 + */ +@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..b6214417 --- /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,16 @@ +package com.orion.visor.framework.storage.configuration.config; + +import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 日志存储配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/6/30 18:40 + */ +@ConfigurationProperties(prefix = "orion.storage.logs") +public class LogsStorageConfig extends LocalFileClientConfig { + +} 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/StorageConfig.java deleted file mode 100644 index 4359327f..00000000 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/StorageConfig.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.orion.visor.framework.storage.configuration.config; - -import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig; -import lombok.Data; -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; - -} 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-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 72% 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..aba7302d 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,30 @@ "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" } ], "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 +59,14 @@ "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": "批量执行日志文件自动清理 保留周期 (天)." } ] } \ 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/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/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',