From ac1628aa2a34a98aed7e745eeaa4149e0b3f49fb Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Sun, 19 Jun 2022 07:57:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20`@Configuratio?= =?UTF-8?q?nProperties`=20record?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxyopen/novel/core/config/CorsConfig.java | 2 +- .../xxyopen/novel/core/config/CorsProperties.java | 8 +------- .../xxyopen/novel/core/config/XssProperties.java | 14 +------------- .../xxyopen/novel/core/filter/XssFilter.java | 4 ++-- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/main/java/io/github/xxyopen/novel/core/config/CorsConfig.java b/src/main/java/io/github/xxyopen/novel/core/config/CorsConfig.java index a14e497..a31692d 100644 --- a/src/main/java/io/github/xxyopen/novel/core/config/CorsConfig.java +++ b/src/main/java/io/github/xxyopen/novel/core/config/CorsConfig.java @@ -25,7 +25,7 @@ public class CorsConfig { public CorsFilter corsFilter() { CorsConfiguration config = new CorsConfiguration(); // 允许的域,不要写*,否则cookie就无法使用了 - for (String allowOrigin : corsProperties.getAllowOrigins()) { + for (String allowOrigin : corsProperties.allowOrigins()) { config.addAllowedOrigin(allowOrigin); } // 允许的头信息 diff --git a/src/main/java/io/github/xxyopen/novel/core/config/CorsProperties.java b/src/main/java/io/github/xxyopen/novel/core/config/CorsProperties.java index 51f5cfe..7f3f8f7 100644 --- a/src/main/java/io/github/xxyopen/novel/core/config/CorsProperties.java +++ b/src/main/java/io/github/xxyopen/novel/core/config/CorsProperties.java @@ -1,6 +1,5 @@ package io.github.xxyopen.novel.core.config; -import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.List; @@ -12,11 +11,6 @@ import java.util.List; * @date 2022/5/17 */ @ConfigurationProperties(prefix = "novel.cors") -@Data -public class CorsProperties { +public record CorsProperties(List allowOrigins) { - /** - * 允许跨域的域名 - * */ - private List allowOrigins; } diff --git a/src/main/java/io/github/xxyopen/novel/core/config/XssProperties.java b/src/main/java/io/github/xxyopen/novel/core/config/XssProperties.java index 613e090..58a1317 100644 --- a/src/main/java/io/github/xxyopen/novel/core/config/XssProperties.java +++ b/src/main/java/io/github/xxyopen/novel/core/config/XssProperties.java @@ -1,6 +1,5 @@ package io.github.xxyopen.novel.core.config; -import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.List; @@ -12,17 +11,6 @@ import java.util.List; * @date 2022/5/17 */ @ConfigurationProperties(prefix = "novel.xss") -@Data -public class XssProperties { - - /** - * 过滤开关 - * */ - private Boolean enabled; - - /** - * 排除链接 - * */ - private List excludes; +public record XssProperties(Boolean enabled,List excludes) { } diff --git a/src/main/java/io/github/xxyopen/novel/core/filter/XssFilter.java b/src/main/java/io/github/xxyopen/novel/core/filter/XssFilter.java index b1f3942..17a7b5b 100644 --- a/src/main/java/io/github/xxyopen/novel/core/filter/XssFilter.java +++ b/src/main/java/io/github/xxyopen/novel/core/filter/XssFilter.java @@ -48,11 +48,11 @@ public class XssFilter implements Filter { } private boolean handleExcludeUrl(HttpServletRequest request) { - if (CollectionUtils.isEmpty(xssProperties.getExcludes())) { + if (CollectionUtils.isEmpty(xssProperties.excludes())) { return false; } String url = request.getServletPath(); - for (String pattern : xssProperties.getExcludes()) { + for (String pattern : xssProperties.excludes()) { Pattern p = Pattern.compile("^" + pattern); Matcher m = p.matcher(url); if (m.find()) {