Merge branch '2.7.x'
This commit is contained in:
commit
26db0c7120
|
@ -27,13 +27,13 @@ import org.springframework.context.annotation.Configuration;
|
|||
public class MyTomcatConfiguration {
|
||||
|
||||
@Bean
|
||||
public WebServerFactoryCustomizer<TomcatServletWebServerFactory> sslConnectorCustomizer() {
|
||||
return (tomcat) -> tomcat.addAdditionalTomcatConnectors(createConnectorConnector());
|
||||
public WebServerFactoryCustomizer<TomcatServletWebServerFactory> connectorCustomizer() {
|
||||
return (tomcat) -> tomcat.addAdditionalTomcatConnectors(createConnector());
|
||||
}
|
||||
|
||||
private Connector createConnectorConnector() {
|
||||
private Connector createConnector() {
|
||||
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
|
||||
connector.setPort(8080);
|
||||
connector.setPort(8081);
|
||||
return connector;
|
||||
}
|
||||
|
||||
|
|
|
@ -26,15 +26,17 @@ import org.springframework.context.annotation.Configuration
|
|||
class MyTomcatConfiguration {
|
||||
|
||||
@Bean
|
||||
fun sslConnectorCustomizer(): WebServerFactoryCustomizer<TomcatServletWebServerFactory> {
|
||||
fun connectorCustomizer(): WebServerFactoryCustomizer<TomcatServletWebServerFactory> {
|
||||
return WebServerFactoryCustomizer { tomcat: TomcatServletWebServerFactory ->
|
||||
tomcat.addAdditionalTomcatConnectors(createConnectorConnector())
|
||||
tomcat.addAdditionalTomcatConnectors(
|
||||
createConnector()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun createConnectorConnector(): Connector {
|
||||
private fun createConnector(): Connector {
|
||||
val connector = Connector("org.apache.coyote.http11.Http11NioProtocol")
|
||||
connector.port = 8080
|
||||
connector.port = 8081
|
||||
return connector
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue