diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 4d0989e..8df5024 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -19,34 +19,4 @@ public class RuoYiApplication SpringApplication.run(RuoYiApplication.class, args); System.out.println("(♥◠‿◠)ノ゙ ---tongue---启动成功 ლ(´ڡ`ლ)゙ "); } - - - @Bean - public TomcatServletWebServerFactory servletContainer() { //springboot2 新变化 - - TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() { - - @Override - protected void postProcessContext(Context context) { - - SecurityConstraint securityConstraint = new SecurityConstraint(); - securityConstraint.setUserConstraint("CONFIDENTIAL"); - SecurityCollection collection = new SecurityCollection(); - collection.addPattern("/*"); - securityConstraint.addCollection(collection); - context.addConstraint(securityConstraint); - } - }; - tomcat.addAdditionalTomcatConnectors(initiateHttpConnector()); - return tomcat; - } - - private Connector initiateHttpConnector() { - Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); - connector.setScheme("http"); - connector.setPort(8888); - connector.setSecure(false); - connector.setRedirectPort(9080); - return connector; - } } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 856e711..17298ba 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -34,9 +34,6 @@ server: max: 800 # Tomcat启动初始化的线程数,默认值10 min-spare: 100 - ssl: - key-store: tongue.nanjingyinuo.com.jks - key-store-password: 123456 # 日志配置 logging: