From 833ced57482fb50cb7223d0a116ad3b11ee41086 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 27 Mar 2024 16:33:42 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=A7=84=E8=8C=83=E5=8C=96=20framework?= =?UTF-8?q?=20=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrionCommonAutoConfiguration.java | 3 ++- .../config/AsyncExecutorConfig.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 ++-- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionBannerAutoConfiguration.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionOperatorLogAutoConfiguration.java | 4 ++-- .../config/OperatorLogConfig.java | 2 +- .../log/core/aspect/OperatorLogAspect.java | 2 +- .../operator/log/core/utils/OperatorLogFiller.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 ++-- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionDataSourceAutoConfiguration.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionDesensitizeAutoConfiguration.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionQuartzAutoConfiguration.java | 2 +- .../OrionSchedulerAutoConfiguration.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 4 ++-- .../OrionLogPrinterConfiguration.java | 4 ++-- .../config/LogPrinterConfig.java | 2 +- .../config/LogPrinterFieldConfig.java | 2 +- .../interceptor/AbstractLogPrinterInterceptor.java | 2 +- .../interceptor/PrettyLogPrinterInterceptor.java | 2 +- .../core/interceptor/RowLogPrinterInterceptor.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 ++-- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionAdminAutoConfiguration.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionMybatisAutoConfiguration.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionCacheAutoConfiguration.java | 4 ++-- .../OrionRedisAutoConfiguration.java | 4 ++-- .../config/RedissonConfig.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 ++-- ...rk.boot.autoconfigure.AutoConfiguration.imports | 4 ++-- .../OrionCryptoAutoConfiguration.java | 3 ++- .../OrionSecurityAutoConfiguration.java | 3 ++- .../{ => configuration}/config/CryptoConfig.java | 2 +- .../{ => configuration}/config/SecurityConfig.java | 8 ++++++-- .../ConfigAuthorizeRequestsCustomizer.java | 2 +- .../META-INF/spring-configuration-metadata.json | 8 ++++---- ...rk.boot.autoconfigure.AutoConfiguration.imports | 4 ++-- .../OrionStorageAutoConfiguration.java | 3 ++- .../{ => configuration}/config/StorageConfig.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 ++-- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionSwaggerAutoConfiguration.java | 3 ++- .../{ => configuration}/config/SwaggerConfig.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 ++-- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionH2SqlInitializationTestConfiguration.java | 2 +- .../OrionMockBeanTestConfiguration.java | 2 +- .../OrionMockRedisTestConfiguration.java | 2 +- .../ops/framework/test/core/base/BaseUnitTest.java | 14 +++++++------- .../OrionWebAutoConfiguration.java | 2 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../OrionWebSocketAutoConfiguration.java | 3 ++- .../config/WebSocketConfig.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 ++-- ...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../AssetWebSocketConfiguration.java | 2 +- 62 files changed, 96 insertions(+), 86 deletions(-) rename orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/{config => configuration}/OrionCommonAutoConfiguration.java (94%) rename orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/{ => configuration}/config/AsyncExecutorConfig.java (92%) rename orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/{config => configuration}/OrionBannerAutoConfiguration.java (93%) rename orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/{config => configuration}/OrionOperatorLogAutoConfiguration.java (95%) rename orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/{core => configuration}/config/OperatorLogConfig.java (93%) rename orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/java/com/orion/ops/framework/datasource/{config => configuration}/OrionDataSourceAutoConfiguration.java (97%) rename orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/java/com/orion/ops/framework/desensitize/{config => configuration}/OrionDesensitizeAutoConfiguration.java (96%) rename orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/{config => configuration}/OrionQuartzAutoConfiguration.java (96%) rename orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/{config => configuration}/OrionSchedulerAutoConfiguration.java (95%) rename orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/{config => configuration}/OrionLogPrinterConfiguration.java (95%) rename orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/{core => configuration}/config/LogPrinterConfig.java (93%) rename orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/{core => configuration}/config/LogPrinterFieldConfig.java (91%) rename orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/java/com/orion/ops/framework/monitor/{config => configuration}/OrionAdminAutoConfiguration.java (96%) rename orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/{config => configuration}/OrionMybatisAutoConfiguration.java (97%) rename orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/{config => configuration}/OrionCacheAutoConfiguration.java (97%) rename orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/{config => configuration}/OrionRedisAutoConfiguration.java (94%) rename orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/{core => configuration}/config/RedissonConfig.java (87%) rename orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/{config => configuration}/OrionCryptoAutoConfiguration.java (91%) rename orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/{config => configuration}/OrionSecurityAutoConfiguration.java (98%) rename orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/{ => configuration}/config/CryptoConfig.java (86%) rename orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/{ => configuration}/config/SecurityConfig.java (76%) rename orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/{config => configuration}/OrionStorageAutoConfiguration.java (93%) rename orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/{ => configuration}/config/StorageConfig.java (89%) rename orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/{config => configuration}/OrionSwaggerAutoConfiguration.java (98%) rename orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/{ => configuration}/config/SwaggerConfig.java (94%) rename orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/{config => configuration}/OrionH2SqlInitializationTestConfiguration.java (97%) rename orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/{config => configuration}/OrionMockBeanTestConfiguration.java (98%) rename orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/{config => configuration}/OrionMockRedisTestConfiguration.java (95%) rename orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/{config => configuration}/OrionWebAutoConfiguration.java (99%) rename orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/{config => configuration}/OrionWebSocketAutoConfiguration.java (90%) rename orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/{ => configuration}/config/WebSocketConfig.java (92%) rename orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/{config => configuration}/AssetWebSocketConfiguration.java (97%) diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/config/OrionCommonAutoConfiguration.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/configuration/OrionCommonAutoConfiguration.java similarity index 94% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/config/OrionCommonAutoConfiguration.java rename to orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/configuration/OrionCommonAutoConfiguration.java index de3dddfd..0eeb7467 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/config/OrionCommonAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/configuration/OrionCommonAutoConfiguration.java @@ -1,5 +1,6 @@ -package com.orion.ops.framework.common.config; +package com.orion.ops.framework.common.configuration; +import com.orion.ops.framework.common.configuration.config.AsyncExecutorConfig; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import com.orion.ops.framework.common.thread.ThreadPoolMdcTaskExecutor; import com.orion.spring.SpringHolder; diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/config/AsyncExecutorConfig.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/configuration/config/AsyncExecutorConfig.java similarity index 92% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/config/AsyncExecutorConfig.java rename to orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/configuration/config/AsyncExecutorConfig.java index 58f968f3..4250d973 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/config/AsyncExecutorConfig.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/configuration/config/AsyncExecutorConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.common.config; +package com.orion.ops.framework.common.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring-configuration-metadata.json index 71a54c1c..fbc61d4c 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.async.executor", - "type": "com.orion.ops.framework.common.config.AsyncExecutorConfig", - "sourceType": "com.orion.ops.framework.common.config.AsyncExecutorConfig" + "type": "com.orion.ops.framework.common.configuration.config.AsyncExecutorConfig", + "sourceType": "com.orion.ops.framework.common.configuration.config.AsyncExecutorConfig" } ], "properties": [ diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 54ac83bc..44e27e70 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.common.config.OrionCommonAutoConfiguration \ No newline at end of file +com.orion.ops.framework.common.configuration.OrionCommonAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/config/OrionBannerAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/configuration/OrionBannerAutoConfiguration.java similarity index 93% rename from orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/config/OrionBannerAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/configuration/OrionBannerAutoConfiguration.java index 827adddd..16aa8fb0 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/config/OrionBannerAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/configuration/OrionBannerAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.banner.config; +package com.orion.ops.framework.banner.configuration; import com.orion.ops.framework.banner.core.BannerApplicationRunner; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index aeac5dbc..1ea46fdc 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.banner.config.OrionBannerAutoConfiguration \ No newline at end of file +com.orion.ops.framework.banner.configuration.OrionBannerAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/config/OrionOperatorLogAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java similarity index 95% rename from orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/config/OrionOperatorLogAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java index f85558d4..dfdc8b95 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/config/OrionOperatorLogAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java @@ -1,9 +1,9 @@ -package com.orion.ops.framework.biz.operator.log.config; +package com.orion.ops.framework.biz.operator.log.configuration; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; import com.orion.ops.framework.biz.operator.log.core.aspect.OperatorLogAspect; -import com.orion.ops.framework.biz.operator.log.core.config.OperatorLogConfig; +import com.orion.ops.framework.biz.operator.log.configuration.config.OperatorLogConfig; import com.orion.ops.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import com.orion.ops.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate; import com.orion.ops.framework.biz.operator.log.core.utils.OperatorLogFiller; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/config/OperatorLogConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/configuration/config/OperatorLogConfig.java similarity index 93% rename from orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/config/OperatorLogConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/configuration/config/OperatorLogConfig.java index c12303ca..5292b63b 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/config/OperatorLogConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/configuration/config/OperatorLogConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.biz.operator.log.core.config; +package com.orion.ops.framework.biz.operator.log.configuration.config; import com.orion.ops.framework.common.utils.ConfigUtils; import lombok.Data; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java index 6d2330d0..6d2dc6e5 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java @@ -6,7 +6,7 @@ import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Strings; import com.orion.ops.framework.biz.operator.log.core.annotation.IgnoreParameter; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.ops.framework.biz.operator.log.core.config.OperatorLogConfig; +import com.orion.ops.framework.biz.operator.log.configuration.config.OperatorLogConfig; import com.orion.ops.framework.biz.operator.log.core.factory.OperatorTypeHolder; import com.orion.ops.framework.biz.operator.log.core.model.OperatorLogModel; import com.orion.ops.framework.biz.operator.log.core.model.OperatorType; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/utils/OperatorLogFiller.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/utils/OperatorLogFiller.java index b08fa99c..962f495c 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/utils/OperatorLogFiller.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/utils/OperatorLogFiller.java @@ -7,7 +7,7 @@ import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Refs; import com.orion.lang.utils.Strings; import com.orion.lang.utils.json.matcher.ReplacementFormatters; -import com.orion.ops.framework.biz.operator.log.core.config.OperatorLogConfig; +import com.orion.ops.framework.biz.operator.log.configuration.config.OperatorLogConfig; import com.orion.ops.framework.biz.operator.log.core.enums.ReturnType; import com.orion.ops.framework.biz.operator.log.core.factory.OperatorTypeHolder; import com.orion.ops.framework.biz.operator.log.core.model.OperatorLogModel; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring-configuration-metadata.json index d001860f..5f66fec1 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.operator-log", - "type": "com.orion.ops.framework.biz.operator.log.core.config.OperatorLogConfig", - "sourceType": "com.orion.ops.framework.biz.operator.log.core.config.OperatorLogConfig" + "type": "com.orion.ops.framework.biz.operator.log.configuration.config.OperatorLogConfig", + "sourceType": "com.orion.ops.framework.biz.operator.log.configuration.config.OperatorLogConfig" } ], "properties": [ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b61a517c..b6b8f03a 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.biz.operator.log.config.OrionOperatorLogAutoConfiguration \ No newline at end of file +com.orion.ops.framework.biz.operator.log.configuration.OrionOperatorLogAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/java/com/orion/ops/framework/datasource/config/OrionDataSourceAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/java/com/orion/ops/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java similarity index 97% rename from orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/java/com/orion/ops/framework/datasource/config/OrionDataSourceAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/java/com/orion/ops/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java index d0468a72..e73aa23a 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/java/com/orion/ops/framework/datasource/config/OrionDataSourceAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/java/com/orion/ops/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.datasource.config; +package com.orion.ops.framework.datasource.configuration; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 85d18ef4..9179e36d 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.datasource.config.OrionDataSourceAutoConfiguration \ No newline at end of file +com.orion.ops.framework.datasource.configuration.OrionDataSourceAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/java/com/orion/ops/framework/desensitize/config/OrionDesensitizeAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/java/com/orion/ops/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java similarity index 96% rename from orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/java/com/orion/ops/framework/desensitize/config/OrionDesensitizeAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/java/com/orion/ops/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java index 36501ca6..21c92220 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/java/com/orion/ops/framework/desensitize/config/OrionDesensitizeAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/java/com/orion/ops/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.desensitize.config; +package com.orion.ops.framework.desensitize.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import com.orion.ops.framework.desensitize.core.filter.DesensitizeValueFilter; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1a3ddfe9..5066413b 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.desensitize.config.OrionDesensitizeAutoConfiguration \ No newline at end of file +com.orion.ops.framework.desensitize.configuration.OrionDesensitizeAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionQuartzAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/configuration/OrionQuartzAutoConfiguration.java similarity index 96% rename from orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionQuartzAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/configuration/OrionQuartzAutoConfiguration.java index ae14d60d..396c9ac8 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionQuartzAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/configuration/OrionQuartzAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.job.config; +package com.orion.ops.framework.job.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import org.quartz.Scheduler; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionSchedulerAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/configuration/OrionSchedulerAutoConfiguration.java similarity index 95% rename from orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionSchedulerAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/configuration/OrionSchedulerAutoConfiguration.java index 037cc0e2..d98e7974 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionSchedulerAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/configuration/OrionSchedulerAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.job.config; +package com.orion.ops.framework.job.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e4d17a55..15faa764 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.orion.ops.framework.job.config.OrionSchedulerAutoConfiguration -com.orion.ops.framework.job.config.OrionQuartzAutoConfiguration \ No newline at end of file +com.orion.ops.framework.job.configuration.OrionSchedulerAutoConfiguration +com.orion.ops.framework.job.configuration.OrionQuartzAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/config/OrionLogPrinterConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/OrionLogPrinterConfiguration.java similarity index 95% rename from orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/config/OrionLogPrinterConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/OrionLogPrinterConfiguration.java index c4512150..0cb0bf4b 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/config/OrionLogPrinterConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/OrionLogPrinterConfiguration.java @@ -1,8 +1,8 @@ -package com.orion.ops.framework.log.config; +package com.orion.ops.framework.log.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import com.orion.ops.framework.common.constant.InterceptorOrderConst; -import com.orion.ops.framework.log.core.config.LogPrinterConfig; +import com.orion.ops.framework.log.configuration.config.LogPrinterConfig; import com.orion.ops.framework.log.core.interceptor.LogPrinterInterceptor; import com.orion.ops.framework.log.core.interceptor.PrettyLogPrinterInterceptor; import com.orion.ops.framework.log.core.interceptor.RowLogPrinterInterceptor; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/config/LogPrinterConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/config/LogPrinterConfig.java similarity index 93% rename from orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/config/LogPrinterConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/config/LogPrinterConfig.java index f8480dfe..b31f8196 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/config/LogPrinterConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/config/LogPrinterConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.log.core.config; +package com.orion.ops.framework.log.configuration.config; import com.orion.ops.framework.common.utils.ConfigUtils; import lombok.Data; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/config/LogPrinterFieldConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/config/LogPrinterFieldConfig.java similarity index 91% rename from orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/config/LogPrinterFieldConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/config/LogPrinterFieldConfig.java index 4eb6b6b3..c1629899 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/config/LogPrinterFieldConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/configuration/config/LogPrinterFieldConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.log.core.config; +package com.orion.ops.framework.log.configuration.config; import com.orion.ops.framework.common.utils.ConfigUtils; import lombok.Data; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java index f88202cb..0880343a 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java @@ -11,7 +11,7 @@ import com.orion.ops.framework.common.json.filter.FieldIgnoreFilter; import com.orion.ops.framework.common.meta.TraceIdHolder; import com.orion.ops.framework.common.security.SecurityHolder; import com.orion.ops.framework.log.core.annotation.IgnoreLog; -import com.orion.ops.framework.log.core.config.LogPrinterConfig; +import com.orion.ops.framework.log.configuration.config.LogPrinterConfig; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; import org.aopalliance.intercept.MethodInvocation; import org.springframework.validation.BindingResult; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java index 8c4a9d0f..c2235d09 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java @@ -4,7 +4,7 @@ import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.time.Dates; import com.orion.ops.framework.common.utils.SwaggerUtils; -import com.orion.ops.framework.log.core.config.LogPrinterConfig; +import com.orion.ops.framework.log.configuration.config.LogPrinterConfig; import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInvocation; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/RowLogPrinterInterceptor.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/RowLogPrinterInterceptor.java index a48fe7e2..d5259e3e 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/RowLogPrinterInterceptor.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/RowLogPrinterInterceptor.java @@ -5,7 +5,7 @@ import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.time.Dates; import com.orion.ops.framework.common.utils.SwaggerUtils; -import com.orion.ops.framework.log.core.config.LogPrinterConfig; +import com.orion.ops.framework.log.configuration.config.LogPrinterConfig; import com.orion.ops.framework.log.core.enums.LogFieldConst; import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring-configuration-metadata.json index 528adcd4..f37ccaeb 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.logging.printer", - "type": "com.orion.ops.framework.log.core.config.LogPrinterConfig", - "sourceType": "com.orion.ops.framework.log.core.config.LogPrinterConfig" + "type": "com.orion.ops.framework.log.configuration.config.LogPrinterConfig", + "sourceType": "com.orion.ops.framework.log.configuration.config.LogPrinterConfig" } ], "properties": [ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6f777d4e..37fb27e1 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.log.config.OrionLogPrinterConfiguration \ No newline at end of file +com.orion.ops.framework.log.configuration.OrionLogPrinterConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/java/com/orion/ops/framework/monitor/config/OrionAdminAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/java/com/orion/ops/framework/monitor/configuration/OrionAdminAutoConfiguration.java similarity index 96% rename from orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/java/com/orion/ops/framework/monitor/config/OrionAdminAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/java/com/orion/ops/framework/monitor/configuration/OrionAdminAutoConfiguration.java index b79fd132..a910a855 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/java/com/orion/ops/framework/monitor/config/OrionAdminAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/java/com/orion/ops/framework/monitor/configuration/OrionAdminAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.monitor.config; +package com.orion.ops.framework.monitor.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 25250af2..2f2946fe 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.monitor.config.OrionAdminAutoConfiguration \ No newline at end of file +com.orion.ops.framework.monitor.configuration.OrionAdminAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java similarity index 97% rename from orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java index cfd1f6f3..0b51e0ee 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.mybatis.config; +package com.orion.ops.framework.mybatis.configuration; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 06e74745..72ede5c3 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.mybatis.config.OrionMybatisAutoConfiguration \ No newline at end of file +com.orion.ops.framework.mybatis.configuration.OrionMybatisAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionCacheAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionCacheAutoConfiguration.java similarity index 97% rename from orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionCacheAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionCacheAutoConfiguration.java index 13918cf1..376e878f 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionCacheAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionCacheAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.redis.config; +package com.orion.ops.framework.redis.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -19,9 +19,9 @@ import org.springframework.data.redis.serializer.RedisSerializer; * @version 1.0.0 * @since 2023/8/23 18:13 */ +@EnableCaching @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_REDIS_CACHE) -@EnableCaching @EnableConfigurationProperties({CacheProperties.class}) public class OrionCacheAutoConfiguration { diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionRedisAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionRedisAutoConfiguration.java similarity index 94% rename from orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionRedisAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionRedisAutoConfiguration.java index be769da5..09f8803c 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionRedisAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionRedisAutoConfiguration.java @@ -1,7 +1,7 @@ -package com.orion.ops.framework.redis.config; +package com.orion.ops.framework.redis.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; -import com.orion.ops.framework.redis.core.config.RedissonConfig; +import com.orion.ops.framework.redis.configuration.config.RedissonConfig; import com.orion.ops.framework.redis.core.utils.RedisUtils; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/config/RedissonConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/config/RedissonConfig.java similarity index 87% rename from orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/config/RedissonConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/config/RedissonConfig.java index 8bedc04f..61105697 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/config/RedissonConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/config/RedissonConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.redis.core.config; +package com.orion.ops.framework.redis.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json index 7865b9f7..38677604 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "spring.redisson", - "type": "com.orion.ops.framework.redis.core.config.RedissonConfig", - "sourceType": "com.orion.ops.framework.redis.core.config.RedissonConfig" + "type": "com.orion.ops.framework.redis.configuration.config.RedissonConfig", + "sourceType": "com.orion.ops.framework.redis.configuration.config.RedissonConfig" } ], "properties": [ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 40174c6f..5ab93c57 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.orion.ops.framework.redis.config.OrionRedisAutoConfiguration -com.orion.ops.framework.redis.config.OrionCacheAutoConfiguration \ No newline at end of file +com.orion.ops.framework.redis.configuration.OrionRedisAutoConfiguration +com.orion.ops.framework.redis.configuration.OrionCacheAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionCryptoAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/OrionCryptoAutoConfiguration.java similarity index 91% rename from orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionCryptoAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/OrionCryptoAutoConfiguration.java index b393623d..9802fa56 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionCryptoAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/OrionCryptoAutoConfiguration.java @@ -1,7 +1,8 @@ -package com.orion.ops.framework.security.config; +package com.orion.ops.framework.security.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import com.orion.ops.framework.common.crypto.ValueCrypto; +import com.orion.ops.framework.security.configuration.config.CryptoConfig; import com.orion.ops.framework.security.core.crypto.PrimaryValueCrypto; import com.orion.ops.framework.security.core.crypto.aes.AesCryptoProcessor; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionSecurityAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/OrionSecurityAutoConfiguration.java similarity index 98% rename from orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionSecurityAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/OrionSecurityAutoConfiguration.java index 92ef84c9..bb473dd0 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionSecurityAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/OrionSecurityAutoConfiguration.java @@ -1,6 +1,7 @@ -package com.orion.ops.framework.security.config; +package com.orion.ops.framework.security.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; +import com.orion.ops.framework.security.configuration.config.SecurityConfig; import com.orion.ops.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy; import com.orion.ops.framework.security.core.filter.TokenAuthenticationFilter; import com.orion.ops.framework.security.core.handler.AuthenticationEntryPointHandler; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/CryptoConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/config/CryptoConfig.java similarity index 86% rename from orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/CryptoConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/config/CryptoConfig.java index 08e49663..2fecce2f 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/CryptoConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/config/CryptoConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.security.config; +package com.orion.ops.framework.security.configuration.config; import com.orion.ops.framework.security.core.crypto.aes.AesCryptoConfig; import lombok.Data; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/SecurityConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/config/SecurityConfig.java similarity index 76% rename from orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/SecurityConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/config/SecurityConfig.java index 7cc2e307..fb7f0a2e 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/SecurityConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/configuration/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.security.config; +package com.orion.ops.framework.security.configuration.config; import com.orion.ops.framework.common.utils.ConfigUtils; import lombok.Data; @@ -20,13 +20,17 @@ public class SecurityConfig { /** * 加密复杂度 */ - private Integer passwordEncoderLength = 4; + private Integer passwordEncoderLength; /** * 匿名接口 */ private List permitUrl; + public SecurityConfig() { + this.passwordEncoderLength = 4; + } + public void setPermitUrl(List permitUrl) { this.permitUrl = ConfigUtils.parseStringList(permitUrl); } diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java index 4a97ce75..e1b71e17 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java @@ -1,6 +1,6 @@ package com.orion.ops.framework.security.core.strategy; -import com.orion.ops.framework.security.config.SecurityConfig; +import com.orion.ops.framework.security.configuration.config.SecurityConfig; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json index cf3b6851..8dfb8c67 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,13 +2,13 @@ "groups": [ { "name": "orion.security", - "type": "com.orion.ops.framework.security.config.SecurityConfig", - "sourceType": "com.orion.ops.framework.security.config.SecurityConfig" + "type": "com.orion.ops.framework.security.configuration.config.SecurityConfig", + "sourceType": "com.orion.ops.framework.security.configuration.config.SecurityConfig" }, { "name": "orion.crypto", - "type": "com.orion.ops.framework.security.config.CryptoConfig", - "sourceType": "com.orion.ops.framework.security.config.CryptoConfig" + "type": "com.orion.ops.framework.security.configuration.config.CryptoConfig", + "sourceType": "com.orion.ops.framework.security.configuration.config.CryptoConfig" }, { "name": "orion.crypto.aes", diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 9fc64f7b..c9555627 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.orion.ops.framework.security.config.OrionSecurityAutoConfiguration -com.orion.ops.framework.security.config.OrionCryptoAutoConfiguration \ No newline at end of file +com.orion.ops.framework.security.configuration.OrionSecurityAutoConfiguration +com.orion.ops.framework.security.configuration.OrionCryptoAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/config/OrionStorageAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/configuration/OrionStorageAutoConfiguration.java similarity index 93% rename from orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/config/OrionStorageAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/configuration/OrionStorageAutoConfiguration.java index 84f2daad..f6f73978 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/config/OrionStorageAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/configuration/OrionStorageAutoConfiguration.java @@ -1,7 +1,8 @@ -package com.orion.ops.framework.storage.config; +package com.orion.ops.framework.storage.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; import com.orion.ops.framework.common.file.FileClient; +import com.orion.ops.framework.storage.configuration.config.StorageConfig; import com.orion.ops.framework.storage.core.client.PrimaryFileClient; import com.orion.ops.framework.storage.core.client.local.LocalFileClient; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/config/StorageConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/configuration/config/StorageConfig.java similarity index 89% rename from orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/config/StorageConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/configuration/config/StorageConfig.java index 9195c6df..cf6ca9aa 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/config/StorageConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/java/com/orion/ops/framework/storage/configuration/config/StorageConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.storage.config; +package com.orion.ops.framework.storage.configuration.config; import com.orion.ops.framework.storage.core.client.local.LocalFileClientConfig; import lombok.Data; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring-configuration-metadata.json index 061a05ee..030fc94d 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.storage", - "type": "com.orion.ops.framework.storage.config.StorageConfig", - "sourceType": "com.orion.ops.framework.storage.config.StorageConfig" + "type": "com.orion.ops.framework.storage.configuration.config.StorageConfig", + "sourceType": "com.orion.ops.framework.storage.configuration.config.StorageConfig" }, { "name": "orion.storage.local", diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f75d8775..f6489c50 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.storage.config.OrionStorageAutoConfiguration \ No newline at end of file +com.orion.ops.framework.storage.configuration.OrionStorageAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java similarity index 98% rename from orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java index 5068f180..93563ec1 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java @@ -1,6 +1,7 @@ -package com.orion.ops.framework.swagger.config; +package com.orion.ops.framework.swagger.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; +import com.orion.ops.framework.swagger.configuration.config.SwaggerConfig; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/configuration/config/SwaggerConfig.java similarity index 94% rename from orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/configuration/config/SwaggerConfig.java index 6bed89a7..70ac28d7 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/configuration/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.swagger.config; +package com.orion.ops.framework.swagger.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json index 176656d4..0255a9ef 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.swagger", - "type": "com.orion.ops.framework.swagger.config.SwaggerConfig", - "sourceType": "com.orion.ops.framework.swagger.config.SwaggerConfig" + "type": "com.orion.ops.framework.swagger.configuration.config.SwaggerConfig", + "sourceType": "com.orion.ops.framework.swagger.configuration.config.SwaggerConfig" } ], "properties": [ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 0c9c980a..43e5c8d9 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.swagger.config.OrionSwaggerAutoConfiguration \ No newline at end of file +com.orion.ops.framework.swagger.configuration.OrionSwaggerAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionH2SqlInitializationTestConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java similarity index 97% rename from orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionH2SqlInitializationTestConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java index aa6578ea..79fb3905 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionH2SqlInitializationTestConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.test.config; +package com.orion.ops.framework.test.configuration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionMockBeanTestConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionMockBeanTestConfiguration.java similarity index 98% rename from orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionMockBeanTestConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionMockBeanTestConfiguration.java index 3621127b..455d0a19 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionMockBeanTestConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionMockBeanTestConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.test.config; +package com.orion.ops.framework.test.configuration; import com.orion.lang.utils.collect.Sets; import com.orion.ops.framework.common.security.LoginUser; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionMockRedisTestConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionMockRedisTestConfiguration.java similarity index 95% rename from orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionMockRedisTestConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionMockRedisTestConfiguration.java index cf0d2a63..e7c43350 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/config/OrionMockRedisTestConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/configuration/OrionMockRedisTestConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.test.config; +package com.orion.ops.framework.test.configuration; import com.github.fppt.jedismock.RedisServer; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/core/base/BaseUnitTest.java b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/core/base/BaseUnitTest.java index 62d55710..380f7944 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/core/base/BaseUnitTest.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-test/src/main/java/com/orion/ops/framework/test/core/base/BaseUnitTest.java @@ -2,13 +2,13 @@ package com.orion.ops.framework.test.core.base; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; -import com.orion.ops.framework.common.config.OrionCommonAutoConfiguration; -import com.orion.ops.framework.datasource.config.OrionDataSourceAutoConfiguration; -import com.orion.ops.framework.mybatis.config.OrionMybatisAutoConfiguration; -import com.orion.ops.framework.redis.config.OrionRedisAutoConfiguration; -import com.orion.ops.framework.test.config.OrionH2SqlInitializationTestConfiguration; -import com.orion.ops.framework.test.config.OrionMockBeanTestConfiguration; -import com.orion.ops.framework.test.config.OrionMockRedisTestConfiguration; +import com.orion.ops.framework.common.configuration.OrionCommonAutoConfiguration; +import com.orion.ops.framework.datasource.configuration.OrionDataSourceAutoConfiguration; +import com.orion.ops.framework.mybatis.configuration.OrionMybatisAutoConfiguration; +import com.orion.ops.framework.redis.configuration.OrionRedisAutoConfiguration; +import com.orion.ops.framework.test.configuration.OrionH2SqlInitializationTestConfiguration; +import com.orion.ops.framework.test.configuration.OrionMockBeanTestConfiguration; +import com.orion.ops.framework.test.configuration.OrionMockRedisTestConfiguration; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.TestMethodOrder; import org.redisson.spring.starter.RedissonAutoConfiguration; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/config/OrionWebAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/configuration/OrionWebAutoConfiguration.java similarity index 99% rename from orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/config/OrionWebAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/configuration/OrionWebAutoConfiguration.java index fa01db8c..ffd1a918 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/config/OrionWebAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/configuration/OrionWebAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.web.config; +package com.orion.ops.framework.web.configuration; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a3f9ff6d..271a7b40 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.web.config.OrionWebAutoConfiguration \ No newline at end of file +com.orion.ops.framework.web.configuration.OrionWebAutoConfiguration \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/OrionWebSocketAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java similarity index 90% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/OrionWebSocketAutoConfiguration.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java index 7d5aa428..523e94af 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/OrionWebSocketAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java @@ -1,6 +1,7 @@ -package com.orion.ops.framework.websocket.config; +package com.orion.ops.framework.websocket.configuration; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; +import com.orion.ops.framework.websocket.configuration.config.WebSocketConfig; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/WebSocketConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/configuration/config/WebSocketConfig.java similarity index 92% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/WebSocketConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/configuration/config/WebSocketConfig.java index a34dfedc..4e8d47d0 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/WebSocketConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/configuration/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.websocket.config; +package com.orion.ops.framework.websocket.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring-configuration-metadata.json index 8a2df355..1aefa0b5 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.websocket", - "type": "com.orion.ops.framework.websocket.config.WebSocketConfig", - "sourceType": "com.orion.ops.framework.websocket.config.WebSocketConfig" + "type": "com.orion.ops.framework.websocket.configuration.config.WebSocketConfig", + "sourceType": "com.orion.ops.framework.websocket.configuration.config.WebSocketConfig" } ], "properties": [ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a8e13663..6d31b620 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.ops.framework.websocket.config.OrionWebSocketAutoConfiguration \ No newline at end of file +com.orion.ops.framework.websocket.configuration.OrionWebSocketAutoConfiguration \ No newline at end of file diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/config/AssetWebSocketConfiguration.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/configuration/AssetWebSocketConfiguration.java similarity index 97% rename from orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/config/AssetWebSocketConfiguration.java rename to orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/configuration/AssetWebSocketConfiguration.java index 3f6a4ec1..3dadcd61 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/config/AssetWebSocketConfiguration.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/configuration/AssetWebSocketConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.asset.config; +package com.orion.ops.module.asset.configuration; import com.orion.ops.module.asset.handler.host.exec.log.ExecLogTailHandler; import com.orion.ops.module.asset.handler.host.terminal.TerminalMessageDispatcher;