From dff33b105be71c6b096c22e94041c6e4725accfe Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Sun, 20 Nov 2022 07:45:21 +0800 Subject: [PATCH] [+] spring boot 3.0 --- pom.xml | 65 ++++++++++++------- .../boot/config/BootAutoConfiguration.java | 7 +- .../boot/config/OpenApiAutoConfiguration.java | 3 - .../controller/TaoyaoControllerAdvice.java | 6 +- .../controller/TaoyaoErrorController.java | 5 +- .../acgist/taoyao/boot/utils/ErrorUtils.java | 5 +- .../main/resources/META-INF/spring.factories | 4 -- ...ot.autoconfigure.AutoConfiguration.imports | 3 + .../interceptor/SecurityInterceptor.java | 5 +- .../taoyao/interceptor/SlowInterceptor.java | 5 +- .../acgist/taoyao/main/TaoyaoApplication.java | 2 - .../src/main/resources/static/meeting.html | 2 +- .../client/websocket/WebSocketSession.java | 3 +- .../client/websocket/WebSocketSignal.java | 13 ++-- .../signal/protocol/ProtocolManager.java | 3 +- .../main/resources/META-INF/spring.factories | 2 - ...ot.autoconfigure.AutoConfiguration.imports | 1 + 17 files changed, 70 insertions(+), 64 deletions(-) delete mode 100644 taoyao-boot/src/main/resources/META-INF/spring.factories create mode 100644 taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 taoyao-signal/src/main/resources/META-INF/spring.factories create mode 100644 taoyao-signal/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/pom.xml b/pom.xml index fa1d8eb..2835e20 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.5 + 3.0.0-RC2 @@ -210,31 +210,31 @@ windows-x86_64 --> - org.bytedeco - ffmpeg-platform - ${ffmpeg.version}-${javacv.version} - - - org.bytedeco - ffmpeg - - - org.bytedeco - javacpp - - + org.bytedeco + ffmpeg-platform + ${ffmpeg.version}-${javacv.version} + + + org.bytedeco + ffmpeg + + + org.bytedeco + javacpp + + - org.bytedeco - ffmpeg - ${ffmpeg.version}-${javacv.version} - ${javacv.os.version} + org.bytedeco + ffmpeg + ${ffmpeg.version}-${javacv.version} + ${javacv.os.version} - org.bytedeco - javacpp - ${javacv.version} - ${javacv.os.version} + org.bytedeco + javacpp + ${javacv.version} + ${javacv.os.version} @@ -417,4 +417,25 @@ + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + \ No newline at end of file diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java index ff70a84..75b119b 100644 --- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java +++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java @@ -6,9 +6,6 @@ import java.util.Timer; import java.util.TimerTask; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.slf4j.ILoggerFactory; import org.slf4j.LoggerFactory; import org.springframework.beans.ConversionNotSupportedException; @@ -59,6 +56,8 @@ import com.acgist.taoyao.boot.utils.JSONUtils; import com.fasterxml.jackson.databind.ObjectMapper; import ch.qos.logback.classic.LoggerContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; /** @@ -72,7 +71,7 @@ import lombok.extern.slf4j.Slf4j; @EnableAsync @Configuration @EnableScheduling -@EnableAspectJAutoProxy(exposeProxy = true) +@EnableAspectJAutoProxy(exposeProxy = false) @EnableConfigurationProperties({ IdProperties.class, MediaProperties.class, TaoyaoProperties.class, WebrtcProperties.class, SecurityProperties.class }) public class BootAutoConfiguration { diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java index 65f6ed5..82d623d 100644 --- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java +++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java @@ -18,15 +18,12 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; -import io.swagger.v3.oas.models.servers.Server; -import lombok.extern.slf4j.Slf4j; /** * 文档配置 * * @author acgist */ -@Slf4j @Profile("dev") @Configuration @ConditionalOnClass(OpenAPI.class) diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoControllerAdvice.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoControllerAdvice.java index 29150fb..6287e0a 100644 --- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoControllerAdvice.java +++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoControllerAdvice.java @@ -1,14 +1,14 @@ package com.acgist.taoyao.boot.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.boot.utils.ErrorUtils; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * 统一异常处理 * diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoErrorController.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoErrorController.java index 5b2a185..a85d820 100644 --- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoErrorController.java +++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoErrorController.java @@ -1,8 +1,5 @@ package com.acgist.taoyao.boot.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +9,8 @@ import com.acgist.taoyao.boot.utils.ErrorUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 统一错误页面 diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java index 87173ca..7e7b4dd 100644 --- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java +++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java @@ -6,9 +6,6 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.springframework.validation.BindException; import org.springframework.validation.ObjectError; @@ -20,6 +17,8 @@ import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.boot.model.MessageCode; import com.acgist.taoyao.boot.model.MessageCodeException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; /** diff --git a/taoyao-boot/src/main/resources/META-INF/spring.factories b/taoyao-boot/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 746eede..0000000 --- a/taoyao-boot/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.acgist.taoyao.boot.config.BootAutoConfiguration,\ -com.acgist.taoyao.boot.config.OpenApiAutoConfiguration,\ -com.acgist.taoyao.boot.config.WebMvcConfigurerAutoConfiguration diff --git a/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ba5c725 --- /dev/null +++ b/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.acgist.taoyao.boot.config.BootAutoConfiguration +com.acgist.taoyao.boot.config.OpenApiAutoConfiguration +com.acgist.taoyao.boot.config.WebMvcConfigurerAutoConfiguration diff --git a/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SecurityInterceptor.java b/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SecurityInterceptor.java index 233d419..75a2e1a 100644 --- a/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SecurityInterceptor.java +++ b/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SecurityInterceptor.java @@ -2,9 +2,6 @@ package com.acgist.taoyao.interceptor; import java.util.Base64; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +11,8 @@ import org.springframework.http.HttpStatus; import com.acgist.taoyao.boot.config.SecurityProperties; import com.acgist.taoyao.boot.interceptor.InterceptorAdapter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; /** diff --git a/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SlowInterceptor.java b/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SlowInterceptor.java index e5aceec..e2ae9ea 100644 --- a/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SlowInterceptor.java +++ b/taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SlowInterceptor.java @@ -1,13 +1,12 @@ package com.acgist.taoyao.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.springframework.beans.factory.annotation.Autowired; import com.acgist.taoyao.boot.config.TaoyaoProperties; import com.acgist.taoyao.boot.interceptor.InterceptorAdapter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; /** diff --git a/taoyao-server/src/main/java/com/acgist/taoyao/main/TaoyaoApplication.java b/taoyao-server/src/main/java/com/acgist/taoyao/main/TaoyaoApplication.java index d69bb4f..80f28f7 100644 --- a/taoyao-server/src/main/java/com/acgist/taoyao/main/TaoyaoApplication.java +++ b/taoyao-server/src/main/java/com/acgist/taoyao/main/TaoyaoApplication.java @@ -3,11 +3,9 @@ package com.acgist.taoyao.main; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.EnableAspectJAutoProxy; @ComponentScan(basePackages = "com.acgist.taoyao") @SpringBootApplication -@EnableAspectJAutoProxy(exposeProxy = true) public class TaoyaoApplication { public static void main(String[] args) { diff --git a/taoyao-server/src/main/resources/static/meeting.html b/taoyao-server/src/main/resources/static/meeting.html index 021d051..6a447ef 100644 --- a/taoyao-server/src/main/resources/static/meeting.html +++ b/taoyao-server/src/main/resources/static/meeting.html @@ -11,7 +11,7 @@
- + diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSession.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSession.java index adbcb00..69220ee 100644 --- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSession.java +++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSession.java @@ -1,10 +1,9 @@ package com.acgist.taoyao.signal.client.websocket; -import javax.websocket.Session; - import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.ClientSessionAdapter; +import jakarta.websocket.Session; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSignal.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSignal.java index edff458..e883c00 100644 --- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSignal.java +++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSignal.java @@ -1,12 +1,5 @@ package com.acgist.taoyao.signal.client.websocket; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; - import org.springframework.beans.factory.annotation.Autowired; import com.acgist.taoyao.boot.model.Message; @@ -14,6 +7,12 @@ import com.acgist.taoyao.signal.client.ClientSessionManager; import com.acgist.taoyao.signal.protocol.ProtocolManager; import com.acgist.taoyao.signal.protocol.platform.ErrorProtocol; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import lombok.extern.slf4j.Slf4j; /** diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java index 92a22c6..fa58efe 100644 --- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java +++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java @@ -3,8 +3,6 @@ package com.acgist.taoyao.signal.protocol; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.PostConstruct; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; @@ -19,6 +17,7 @@ import com.acgist.taoyao.signal.client.ClientSessionManager; import com.acgist.taoyao.signal.protocol.client.ClientRegisterProtocol; import com.acgist.taoyao.signal.protocol.platform.ErrorProtocol; +import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; /** diff --git a/taoyao-signal/src/main/resources/META-INF/spring.factories b/taoyao-signal/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 985c929..0000000 --- a/taoyao-signal/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.acgist.taoyao.signal.config.SignalAutoConfiguration diff --git a/taoyao-signal/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/taoyao-signal/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..31e8ad0 --- /dev/null +++ b/taoyao-signal/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.acgist.taoyao.signal.config.SignalAutoConfiguration