diff --git a/README.md b/README.md index ad5f79f33..831d2a26d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# hsweb4 基于spring-boot2,全响应式的后台管理框架 +# hsweb4 基于spring-boot3,全响应式的后台管理框架 [![Codecov](https://codecov.io/gh/hs-web/hsweb-framework/branch/4.0.x/graph/badge.svg)](https://codecov.io/gh/hs-web/hsweb-framework/branch/master) [![Build Status](https://api.travis-ci.com/hs-web/hsweb-framework.svg?branch=4.0.x)](https://travis-ci.com/hs-web/hsweb-framework) @@ -50,9 +50,9 @@ https://github.com/zhou-hao/hsweb4-examples ## 核心技术选型 -1. Java 8 +1. Java 17 2. Maven3 -3. Spring Boot 2.x +3. Spring Boot 3.x 4. Project Reactor 响应式编程框架 5. hsweb easy orm 对r2dbc的orm封装 diff --git a/hsweb-logging/hsweb-access-logging-aop/pom.xml b/hsweb-logging/hsweb-access-logging-aop/pom.xml index 02a2d1d5a..439647ae6 100644 --- a/hsweb-logging/hsweb-access-logging-aop/pom.xml +++ b/hsweb-logging/hsweb-access-logging-aop/pom.xml @@ -31,11 +31,6 @@ org.springframework spring-aop - - io.swagger - swagger-annotations - - org.springframework spring-webmvc diff --git a/hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/AopAccessLoggerSupportAutoConfiguration.java b/hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/AopAccessLoggerSupportAutoConfiguration.java index ef9b5ac58..cc95a3ec1 100644 --- a/hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/AopAccessLoggerSupportAutoConfiguration.java +++ b/hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/AopAccessLoggerSupportAutoConfiguration.java @@ -42,14 +42,6 @@ public DefaultAccessLoggerParser defaultAccessLoggerParser() { return new DefaultAccessLoggerParser(); } - @Bean - @ConditionalOnClass(name = "io.swagger.annotations.Api") - @Order(10) - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) - public SwaggerAccessLoggerParser swaggerAccessLoggerParser() { - return new SwaggerAccessLoggerParser(); - } - @Bean @ConditionalOnClass(name = "io.swagger.v3.oas.annotations.tags.Tag") @Order(1) diff --git a/hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/SwaggerAccessLoggerParser.java b/hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/SwaggerAccessLoggerParser.java deleted file mode 100644 index 0ce5a0054..000000000 --- a/hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/SwaggerAccessLoggerParser.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.hswebframework.web.logging.aop; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.hswebframework.web.aop.MethodInterceptorHolder; -import org.hswebframework.web.logging.LoggerDefine; -import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; - -import java.lang.reflect.Method; - -public class SwaggerAccessLoggerParser implements AccessLoggerParser { - @Override - public boolean support(Class clazz, Method method) { - - Api api = AnnotationUtils.findAnnotation(clazz, Api.class); - ApiOperation operation = AnnotationUtils.findAnnotation(method, ApiOperation.class); - - return api != null || operation != null; - } - - @Override - public LoggerDefine parse(MethodInterceptorHolder holder) { - Api api = holder.findAnnotation(Api.class); - ApiOperation operation = holder.findAnnotation(ApiOperation.class); - String action = ""; - if (api != null) { - action = action.concat(api.value()); - } - if (null != operation) { - action = ObjectUtils.isEmpty(action) ? operation.value() : action + "-" + operation.value(); - } - return new LoggerDefine(action, ""); - } -} diff --git a/hsweb-starter/src/main/resources/META-INF/spring.factories b/hsweb-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 5ad0657ab..000000000 --- a/hsweb-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.SpringBootExceptionReporter=\ -org.hswebframework.web.starter.reporter.GenericExceptionReport \ No newline at end of file diff --git a/pom.xml b/pom.xml index 97eae9a48..49b77f12f 100644 --- a/pom.xml +++ b/pom.xml @@ -87,16 +87,11 @@ 1.2.83 2.3.232 - 5.1.39 - 3.2.2 1.6.12 4.2.2-SNAPSHOT 3.0.4 3.0.2 - 2.7.0 - - Borca-SR2 @@ -135,7 +130,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.6.0 -Xdoclint:none @@ -297,7 +292,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + 3.2.5 **/*Test.java @@ -452,13 +447,6 @@ 0.9.13 - - junit - junit - 4.13.1 - test - - com.h2database h2 @@ -471,12 +459,6 @@ ${fastjson.version} - - io.swagger - swagger-annotations - 1.5.10 - - io.swagger.core.v3 swagger-annotations