From c9f1774fc7406eb20d7c4a178ee65ccdea9b72e8 Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 17 Apr 2020 21:09:31 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20enable=E9=85=8D=E7=BD=AE=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BAenabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/core/boot/config/MybatisPlusConfiguration.java | 2 +- .../main/java/org/springblade/core/oss/props/OssProperties.java | 2 +- .../org/springblade/core/secure/config/SecureConfiguration.java | 2 +- .../org/springblade/core/secure/registry/SecureRegistry.java | 2 +- .../java/org/springblade/core/tool/config/XssConfiguration.java | 2 +- .../org/springblade/core/tool/support/xss/XssProperties.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java b/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java index 784d414..336336b 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java @@ -44,7 +44,7 @@ public class MybatisPlusConfiguration { * @return SqlLogInterceptor */ @Bean - @ConditionalOnProperty(value = "blade.mybatis-plus.sql-log.enable", matchIfMissing = true) + @ConditionalOnProperty(value = "blade.mybatis-plus.sql-log", matchIfMissing = true) public SqlLogInterceptor sqlLogInterceptor() { return new SqlLogInterceptor(); } diff --git a/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java b/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java index 7b29384..41a64f8 100644 --- a/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java +++ b/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java @@ -31,7 +31,7 @@ public class OssProperties { /** * 是否启用 */ - private Boolean enable; + private Boolean enabled; /** * 对象存储名称 diff --git a/blade-core-secure/src/main/java/org/springblade/core/secure/config/SecureConfiguration.java b/blade-core-secure/src/main/java/org/springblade/core/secure/config/SecureConfiguration.java index 9f6df94..f9e4ab6 100644 --- a/blade-core-secure/src/main/java/org/springblade/core/secure/config/SecureConfiguration.java +++ b/blade-core-secure/src/main/java/org/springblade/core/secure/config/SecureConfiguration.java @@ -57,7 +57,7 @@ public class SecureConfiguration implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { clientProperties.getClient().forEach(cs -> registry.addInterceptor(new ClientInterceptor(cs.getClientId())).addPathPatterns(cs.getPathPatterns())); - if (secureRegistry.isEnable()) { + if (secureRegistry.isEnabled()) { registry.addInterceptor(new SecureInterceptor()) .excludePathPatterns(secureRegistry.getExcludePatterns()) .excludePathPatterns(secureRegistry.getDefaultExcludePatterns()) diff --git a/blade-core-secure/src/main/java/org/springblade/core/secure/registry/SecureRegistry.java b/blade-core-secure/src/main/java/org/springblade/core/secure/registry/SecureRegistry.java index f1f2851..80d06c0 100644 --- a/blade-core-secure/src/main/java/org/springblade/core/secure/registry/SecureRegistry.java +++ b/blade-core-secure/src/main/java/org/springblade/core/secure/registry/SecureRegistry.java @@ -29,7 +29,7 @@ import java.util.List; @Data public class SecureRegistry { - private boolean enable = false; + private boolean enabled = false; private final List defaultExcludePatterns = new ArrayList<>(); diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/config/XssConfiguration.java b/blade-core-tool/src/main/java/org/springblade/core/tool/config/XssConfiguration.java index d14adac..84c6eca 100644 --- a/blade-core-tool/src/main/java/org/springblade/core/tool/config/XssConfiguration.java +++ b/blade-core-tool/src/main/java/org/springblade/core/tool/config/XssConfiguration.java @@ -35,7 +35,7 @@ import javax.servlet.DispatcherType; */ @Configuration @AllArgsConstructor -@ConditionalOnProperty(value = "blade.xss.enable", havingValue = "true") +@ConditionalOnProperty(value = "blade.xss.enabled", havingValue = "true") @EnableConfigurationProperties({XssProperties.class, XssUrlProperties.class}) public class XssConfiguration { diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/support/xss/XssProperties.java b/blade-core-tool/src/main/java/org/springblade/core/tool/support/xss/XssProperties.java index 2b4e3d5..959439e 100644 --- a/blade-core-tool/src/main/java/org/springblade/core/tool/support/xss/XssProperties.java +++ b/blade-core-tool/src/main/java/org/springblade/core/tool/support/xss/XssProperties.java @@ -33,7 +33,7 @@ public class XssProperties { /** * 开启xss */ - private Boolean enable = true; + private Boolean enabled = true; /** * 放行url