错误页面优化、兼容war和jar方式、升级beetl2.7.26

This commit is contained in:
thinkgem
2018-02-16 21:50:38 +08:00
parent d6f963b3be
commit 3e78c3c3ee
8 changed files with 40 additions and 24 deletions

View File

@@ -9,6 +9,9 @@
<dependent-module archiveName="jeesite-common-4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="beetl-2.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/beetl/beetl">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="jeesite-module-devtools-4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-devtools/jeesite-module-devtools">
<dependency-type>uses</dependency-type>
</dependent-module>

View File

@@ -26,6 +26,7 @@ public class Application extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
this.setRegisterErrorPageFilter(false); // 错误页面有容器来处理而不是SpringBoot
builder.properties(PropertiesUtils.getInstance().getProperties());
return builder.sources(Application.class);
}

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<display-name>JeeSite</display-name>
<error-page>
<error-code>500</error-code>
<location>/error/500</location>
</error-page>
<error-page>
<error-code>404</error-code>
<location>/error/404</location>
</error-page>
</web-app>