🎨 规范化 framework 配置.

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;

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;

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": [

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
+com.orion.ops.framework.common.configuration.OrionCommonAutoConfiguration

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;

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
+com.orion.ops.framework.banner.configuration.OrionBannerAutoConfiguration

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;

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;

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;

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;

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": [

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
+com.orion.ops.framework.biz.operator.log.configuration.OrionOperatorLogAutoConfiguration

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;

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
+com.orion.ops.framework.datasource.configuration.OrionDataSourceAutoConfiguration

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;

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
+com.orion.ops.framework.desensitize.configuration.OrionDesensitizeAutoConfiguration

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;

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;

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
+com.orion.ops.framework.job.configuration.OrionSchedulerAutoConfiguration
+com.orion.ops.framework.job.configuration.OrionQuartzAutoConfiguration

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;

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;

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;

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;

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;

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;

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": [

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
+com.orion.ops.framework.log.configuration.OrionLogPrinterConfiguration

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;

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
+com.orion.ops.framework.monitor.configuration.OrionAdminAutoConfiguration

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;

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
+com.orion.ops.framework.mybatis.configuration.OrionMybatisAutoConfiguration

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 {
 

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;

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;

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": [

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
+com.orion.ops.framework.redis.configuration.OrionRedisAutoConfiguration
+com.orion.ops.framework.redis.configuration.OrionCacheAutoConfiguration

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;

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;

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;

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<String> permitUrl;
 
+    public SecurityConfig() {
+        this.passwordEncoderLength = 4;
+    }
+
     public void setPermitUrl(List<String> permitUrl) {
         this.permitUrl = ConfigUtils.parseStringList(permitUrl);
     }

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;
 

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",

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
+com.orion.ops.framework.security.configuration.OrionSecurityAutoConfiguration
+com.orion.ops.framework.security.configuration.OrionCryptoAutoConfiguration

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;

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;

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",

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
+com.orion.ops.framework.storage.configuration.OrionStorageAutoConfiguration

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;

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;

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": [

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
+com.orion.ops.framework.swagger.configuration.OrionSwaggerAutoConfiguration

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;

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;

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;

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;

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;

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
+com.orion.ops.framework.web.configuration.OrionWebAutoConfiguration

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;

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;

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": [

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
+com.orion.ops.framework.websocket.configuration.OrionWebSocketAutoConfiguration

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;