qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] spring boot 3.0

Browse Source
This commit is contained in:
acgist
2022-11-20 07:45:21 +08:00
parent f5bfe2cef9
commit dff33b105b
17 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.5</version>
<version>3.0.0-RC2</version>
<relativePath />
</parent>
@@ -417,4 +417,25 @@
</profile>
</profiles>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>

7
taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/BootAutoConfiguration.java
View File

@@ -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 {

3
taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java
View File

@@ -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)

6
taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoControllerAdvice.java
View File

@@ -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;
/**
* 统一异常处理
*

5
taoyao-boot/src/main/java/com/acgist/taoyao/boot/controller/TaoyaoErrorController.java
View File

@@ -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;
/**
* 统一错误页面

5
taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/ErrorUtils.java
View File

@@ -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;
/**

4
taoyao-boot/src/main/resources/META-INF/spring.factories
View File

@@ -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

3
taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports Normal file
View File

@@ -0,0 +1,3 @@
com.acgist.taoyao.boot.config.BootAutoConfiguration
com.acgist.taoyao.boot.config.OpenApiAutoConfiguration
com.acgist.taoyao.boot.config.WebMvcConfigurerAutoConfiguration

5
taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SecurityInterceptor.java
View File

@@ -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;
/**

5
taoyao-server/src/main/java/com/acgist/taoyao/interceptor/SlowInterceptor.java
View File

@@ -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;
/**

2
taoyao-server/src/main/java/com/acgist/taoyao/main/TaoyaoApplication.java
View File

@@ -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) {

2
taoyao-server/src/main/resources/static/meeting.html
View File

@@ -11,7 +11,7 @@
<body>
<div class="taoyao" id="app">
<div class="handler">
<a class="create icon-svg" title="创建房间" @click="create"></a>
<a class="create icon-make-group" title="创建房间" @click="create"></a>
<a class="invite icon-address-book" title="邀请房间" @click="invite"></a>
<a class="enter icon-enter" title="进入房间" @click="enter"></a>
<a class="leave icon-exit" title="离开房间" @click="leave"></a>

3
taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSession.java
View File

@@ -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;

13
taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/websocket/WebSocketSignal.java
View File

@@ -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;
/**

3
taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java
View File

@@ -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;
/**

2
taoyao-signal/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.acgist.taoyao.signal.config.SignalAutoConfiguration

1
taoyao-signal/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports Normal file
View File

@@ -0,0 +1 @@
com.acgist.taoyao.signal.config.SignalAutoConfiguration