diff --git a/continew-starter-api-doc/pom.xml b/continew-starter-api-doc/pom.xml index 9aa4ca51..56fae460 100644 --- a/continew-starter-api-doc/pom.xml +++ b/continew-starter-api-doc/pom.xml @@ -22,17 +22,15 @@ continew-starter-core - + top.nextdoc4j nextdoc4j-springboot3-starter - - + top.nextdoc4j nextdoc4j-plugin-enums - \ No newline at end of file diff --git a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java index f2edf67f..d0658b26 100644 --- a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java +++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java @@ -76,7 +76,7 @@ public class SpringDocAutoConfiguration implements WebMvcConfigurer { } /** - * 基础枚举处理器 + * BaseEnum 枚举处理器 * * @return {@link BaseEnumProcessor } */ diff --git a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/processor/BaseEnumProcessor.java b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/processor/BaseEnumProcessor.java index 829c9708..e76d43ea 100644 --- a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/processor/BaseEnumProcessor.java +++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/processor/BaseEnumProcessor.java @@ -22,13 +22,14 @@ import top.continew.starter.core.enums.BaseEnum; import top.nextdoc4j.enums.resolver.EnumMetadataResolver; /** - * 基础枚举处理器 - nextdoc4j 枚举插件展示枚举值 + * BaseEnum 枚举处理器 - NexDoc4j 枚举插件展示枚举值 * * @author echo * @since 2.15.0 */ @Component public class BaseEnumProcessor implements EnumMetadataResolver { + @Override public boolean supports(Class aClass) { return aClass != null && aClass.isEnum() && ClassUtil.isAssignable(BaseEnum.class, aClass); diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/GeneralPropertySourceFactory.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/GeneralPropertySourceFactory.java index 3ca91a38..c6e963d4 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/util/GeneralPropertySourceFactory.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/GeneralPropertySourceFactory.java @@ -29,8 +29,8 @@ import java.io.IOException; /** * 通用配置文件读取工厂 *

- * DefaultPropertySourceFactory 仅支持 properties - * 配置文件读取,详见: + * 详见:YAMLShortcomings *

* diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/SpringWebUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/SpringWebUtils.java index e6327ce6..bec4c6a1 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/util/SpringWebUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/SpringWebUtils.java @@ -48,11 +48,11 @@ import java.util.Map; */ public class SpringWebUtils { + private static final AntPathMatcher MATCHER = new AntPathMatcher(); + private SpringWebUtils() { } - private static final AntPathMatcher MATCHER = new AntPathMatcher(); - /** * 路径是否匹配 * @@ -97,7 +97,8 @@ public class SpringWebUtils { * @param path 路径 * @param pattern 匹配模式 * @return 是否匹配 - * @since 2.4.0 + * @author echo + * @since 2.15.0 */ public static boolean isMatchAnt(String path, String pattern) { return MATCHER.match(pattern, path); @@ -109,7 +110,8 @@ public class SpringWebUtils { * @param path 路径 * @param patterns 匹配模式列表 * @return 是否匹配 - * @since 2.6.0 + * @author echo + * @since 2.15.0 */ public static boolean isMatchAnt(String path, List patterns) { return patterns.stream().anyMatch(pattern -> isMatchAnt(path, pattern)); diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index 89a0cc8f..64a6fb3f 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -63,7 +63,7 @@ 1.1.5 - 2.2.36 + 2.2.38 1.5.2 @@ -317,7 +317,7 @@ ${crane4j.version} - + top.nextdoc4j nextdoc4j-bom @@ -325,6 +325,12 @@ pom import + + + io.swagger.core.v3 + swagger-annotations-jakarta + ${swagger.version} + @@ -421,13 +427,6 @@ ${commons-compress.version} - - - io.swagger.core.v3 - swagger-annotations-jakarta - ${swagger-annotations.version} - - top.continew.starter diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java index 8fb221ed..c856d0b9 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java @@ -36,15 +36,15 @@ import java.util.stream.Collectors; */ public class AccessLogUtils { - private AccessLogUtils() { - } - /** * 静态资源路径模式 */ private static final List RESOURCE_PATH = List .of("/**/doc/**", "/**/doc.html", "/**/nextdoc/**", "/**/v*/api-docs/**", "/**/api-docs/**", "/**/swagger-ui/**", "/**/swagger-ui.html", "/**/swagger-resources/**", "/**/webjars/**", "/**/favicon.ico", "/**/static/**", "/**/assets/**", "/**/actuator/**", "/error", "/health"); + private AccessLogUtils() { + } + /** * 获取参数信息 *