diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java index 5256b528b..eae5a7286 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java @@ -18,15 +18,11 @@ import org.springframework.context.annotation.Configuration; */ @Configuration public class TomcatFactoryConfig { - @Value("${server.port-https}") - private String serverPortHttp; - @Value("${server.port}") - private String serverPortHttps; /** * tomcat-embed-jasper引用后提示jar找不到的问题 */ - /*@Bean + @Bean public TomcatServletWebServerFactory tomcatFactory() { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() { @Override @@ -39,8 +35,13 @@ public class TomcatFactoryConfig { connector.setProperty("relaxedQueryChars", "[]{}"); }); return factory; - }*/ + } + //TODO 配置https证书 部署服务器的时候解开。 + /* @Value("${server.port-https}") + private String serverPortHttp; + @Value("${server.port}") + private String serverPortHttps; @Bean public TomcatServletWebServerFactory tomcatFactory() { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() { @@ -71,5 +72,5 @@ public class TomcatFactoryConfig { connector.setSecure(false); connector.setRedirectPort(Integer.parseInt(serverPortHttps)); return connector; - } + }*/ } diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 391799eff..61a634c68 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -1,6 +1,5 @@ server: port: 8080 - port-https: 8089 #自定义https端口 tomcat: max-swallow-size: -1 error: @@ -13,10 +12,12 @@ server: enabled: true min-response-size: 1024 mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* - ssl: #配置https证书 - key-store: classpath:bxxt.hzwlsoft.com.jks - key-store-password: w933m5y1kz0xj8w - key-store-type: JKS +##配置https证书 部署服务器的时候解开。 +# port-https: 8089 #自定义https端口 +# ssl: +# key-store: classpath:bxxt.hzwlsoft.com.jks +# key-store-password: w933m5y1kz0xj8w +# key-store-type: JKS management: endpoints: web: