chore: 优化属性前缀命名

continew-org · Jun 28, 2024 · 6b90880 · 6b90880
1 parent 0ad7b18
commit 6b90880
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 40 deletions.
diff --git a/...src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java b/...src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java
@@ -19,15 +19,14 @@
 import io.swagger.v3.oas.models.Components;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import top.continew.starter.core.constant.PropertiesConstants;
 
 /**
  * API 文档扩展配置属性
  *
  * @author Charles7c
  * @since 1.0.1
  */
-@ConfigurationProperties(prefix = PropertiesConstants.SPRINGDOC)
+@ConfigurationProperties("springdoc")
 public class SpringDocExtensionProperties {
 
     /**

diff --git a/...main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java b/...main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java
@@ -26,7 +26,7 @@
  * @author Charles7c
  * @since 1.0.0
  */
-@ConfigurationProperties(prefix = "sa-token.extension")
+@ConfigurationProperties("sa-token.extension")
 public class SaTokenExtensionProperties {
 
     /**

diff --git a/...core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectProperties.java b/...core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectProperties.java
@@ -24,7 +24,7 @@
  * @author Charles7c
  * @since 1.0.0
  */
-@ConfigurationProperties(prefix = "project")
+@ConfigurationProperties("project")
 public class ProjectProperties {
 
     /**

diff --git a/...ava/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolExtensionProperties.java b/...ava/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolExtensionProperties.java
@@ -24,7 +24,7 @@
  * @author Charles7c
  * @since 1.0.0
  */
-@ConfigurationProperties(prefix = "spring.task")
+@ConfigurationProperties("spring.task")
 public class ThreadPoolExtensionProperties {
 
     /**

diff --git a/...ew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java b/...ew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java
@@ -34,16 +34,6 @@ public class PropertiesConstants {
      */
     public static final String ENABLED = "enabled";
 
-    /**
-     * Spring Doc 配置
-     */
-    public static final String SPRINGDOC = "springdoc";
-
-    /**
-     * Spring Doc Swagger UI 配置
-     */
-    public static final String SPRINGDOC_SWAGGER_UI = SPRINGDOC + StringConstants.DOT + "swagger-ui";
-
     /**
      * 安全配置
      */
@@ -52,12 +42,17 @@ public class PropertiesConstants {
     /**
      * 密码编解码配置
      */
-    public static final String PASSWORD = SECURITY + StringConstants.DOT + "password";
+    public static final String SECURITY_PASSWORD = SECURITY + StringConstants.DOT + "password";
 
     /**
      * 加/解密配置
      */
-    public static final String CRYPTO = SECURITY + StringConstants.DOT + "crypto";
+    public static final String SECURITY_CRYPTO = SECURITY + StringConstants.DOT + "crypto";
+
+    /**
+     * 限流器配置
+     */
+    public static final String SECURITY_LIMITER = SECURITY + StringConstants.DOT + "limiter";
 
     /**
      * Web 配置
@@ -67,17 +62,22 @@ public class PropertiesConstants {
     /**
      * 跨域配置
      */
-    public static final String CORS = WEB + StringConstants.DOT + "cors";
+    public static final String WEB_CORS = WEB + StringConstants.DOT + "cors";
 
     /**
      * 链路配置
      */
-    public static final String TRACE = WEB + StringConstants.DOT + "trace";
+    public static final String WEB_TRACE = WEB + StringConstants.DOT + "trace";
 
     /**
      * XSS 配置
      */
-    public static final String XSS = WEB + StringConstants.DOT + "xss";
+    public static final String WEB_XSS = WEB + StringConstants.DOT + "xss";
+
+    /**
+     * 国际化配置
+     */
+    public static final String WEB_I18N = WEB + StringConstants.DOT + "i18n";
 
     /**
      * 日志配置
@@ -119,11 +119,6 @@ public class PropertiesConstants {
      */
     public static final String MESSAGING_WEBSOCKET = MESSAGING + StringConstants.DOT + "websocket";
 
-    /**
-     * 国际化配置
-     */
-    public static final String I18N = WEB + StringConstants.DOT + "i18n";
-
     private PropertiesConstants() {
     }
 }
diff --git a/.../top/continew/starter/data/mybatis/flex/autoconfigure/MyBatisFlexExtensionProperties.java b/.../top/continew/starter/data/mybatis/flex/autoconfigure/MyBatisFlexExtensionProperties.java
@@ -25,7 +25,7 @@
  * @author Charles7c
  * @since 1.0.0
  */
-@ConfigurationProperties(prefix = "mybatis-flex.extension")
+@ConfigurationProperties("mybatis-flex.extension")
 public class MyBatisFlexExtensionProperties {
 
     /**

diff --git a/.../top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java b/.../top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java
@@ -27,7 +27,7 @@
  * @author Charles7c
  * @since 1.0.0
  */
-@ConfigurationProperties(prefix = "mybatis-plus.extension")
+@ConfigurationProperties("mybatis-plus.extension")
 public class MyBatisPlusExtensionProperties {
 
     /**

diff --git a/...main/java/top/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java b/...main/java/top/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java
@@ -36,7 +36,7 @@
  */
 @AutoConfiguration
 @EnableConfigurationProperties(CryptoProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.CRYPTO, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_CRYPTO, name = PropertiesConstants.ENABLED, matchIfMissing = true)
 public class CryptoAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(CryptoAutoConfiguration.class);

diff --git a/...to/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoProperties.java b/...to/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoProperties.java
@@ -25,7 +25,7 @@
  * @author Charles7c
  * @since 1.4.0
  */
-@ConfigurationProperties(PropertiesConstants.CRYPTO)
+@ConfigurationProperties(PropertiesConstants.SECURITY_CRYPTO)
 public class CryptoProperties {
 
     /**

diff --git a/...o/src/main/java/top/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java b/...o/src/main/java/top/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java
@@ -65,7 +65,7 @@ public Map<String, FieldEncrypt> getEncryptParams(String mappedStatementId) {
      */
     public Map<String, FieldEncrypt> getEncryptParams(String mappedStatementId, Integer parameterIndex) {
         return ENCRYPT_PARAM_CACHE
-            .computeIfAbsent(mappedStatementId, m -> getEncryptParamsNoCached(mappedStatementId, parameterIndex));
+            .computeIfAbsent(mappedStatementId, key -> getEncryptParamsNoCached(mappedStatementId, parameterIndex));
     }
 
     /**

diff --git a/...op/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java b/...op/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java
@@ -53,7 +53,7 @@
  */
 @AutoConfiguration
 @EnableConfigurationProperties(PasswordEncoderProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.PASSWORD, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_PASSWORD, name = PropertiesConstants.ENABLED, matchIfMissing = true)
 public class PasswordEncoderAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(PasswordEncoderAutoConfiguration.class);

diff --git a/.../java/top/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java b/.../java/top/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java
@@ -25,7 +25,7 @@
  * @author Jasmine
  * @since 1.3.0
  */
-@ConfigurationProperties(PropertiesConstants.PASSWORD)
+@ConfigurationProperties(PropertiesConstants.SECURITY_PASSWORD)
 public class PasswordEncoderProperties {
 
     /**

diff --git a/...-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java b/...-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java
@@ -40,7 +40,7 @@
 @Lazy
 @AutoConfiguration
 @ConditionalOnWebApplication
-@ConditionalOnProperty(prefix = PropertiesConstants.CORS, name = PropertiesConstants.ENABLED, havingValue = "true")
+@ConditionalOnProperty(prefix = PropertiesConstants.WEB_CORS, name = PropertiesConstants.ENABLED, havingValue = "true")
 @EnableConfigurationProperties(CorsProperties.class)
 public class CorsAutoConfiguration {
     private static final Logger log = LoggerFactory.getLogger(CorsAutoConfiguration.class);

diff --git a/...starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java b/...starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java
@@ -30,7 +30,7 @@
  * @author Charles7c
  * @since 1.0.0
  */
-@ConfigurationProperties(PropertiesConstants.CORS)
+@ConfigurationProperties(PropertiesConstants.WEB_CORS)
 public class CorsProperties {
 
     private static final List<String> ALL = Collections.singletonList(StringConstants.ASTERISK);

diff --git a/...starter-web/src/main/java/top/continew/starter/web/autoconfigure/i18n/I18nProperties.java b/...starter-web/src/main/java/top/continew/starter/web/autoconfigure/i18n/I18nProperties.java
@@ -20,12 +20,12 @@
 import top.continew.starter.core.constant.PropertiesConstants;
 
 /**
- * 国际化 配置属性
+ * 国际化配置属性
  *
  * @author Jasmine
  * @since 2.2.0
  */
-@ConfigurationProperties(prefix = PropertiesConstants.I18N)
+@ConfigurationProperties(PropertiesConstants.WEB_I18N)
 public class I18nProperties {
 
     /**

diff --git a/...eb/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java b/...eb/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java
@@ -43,7 +43,7 @@
 @AutoConfiguration
 @ConditionalOnWebApplication
 @EnableConfigurationProperties(TraceProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.TRACE, name = PropertiesConstants.ENABLED, havingValue = "true")
+@ConditionalOnProperty(prefix = PropertiesConstants.WEB_TRACE, name = PropertiesConstants.ENABLED, havingValue = "true")
 public class TraceAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(TraceAutoConfiguration.class);

diff --git a/...arter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceProperties.java b/...arter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceProperties.java
@@ -26,7 +26,7 @@
  * @author Charles7c
  * @since 1.3.0
  */
-@ConfigurationProperties(PropertiesConstants.TRACE)
+@ConfigurationProperties(PropertiesConstants.WEB_TRACE)
 public class TraceProperties {
 
     /**

diff --git a/...er-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java b/...er-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java
@@ -33,7 +33,7 @@
 @AutoConfiguration
 @ConditionalOnWebApplication
 @EnableConfigurationProperties(XssProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.XSS, name = PropertiesConstants.ENABLED, havingValue = "true")
+@ConditionalOnProperty(prefix = PropertiesConstants.WEB_XSS, name = PropertiesConstants.ENABLED, havingValue = "true")
 public class XssAutoConfiguration {
 
     /**

diff --git a/...w-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssProperties.java b/...w-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssProperties.java
@@ -29,7 +29,7 @@
  * @author whhya
  * @since 2.0.0
  */
-@ConfigurationProperties(PropertiesConstants.XSS)
+@ConfigurationProperties(PropertiesConstants.WEB_XSS)
 public class XssProperties {
 
     /**