diff --git a/maxkey-client-sdk/.classpath b/maxkey-client-sdk/.classpath index b79fc0c54..7a7f31fec 100644 --- a/maxkey-client-sdk/.classpath +++ b/maxkey-client-sdk/.classpath @@ -10,6 +10,7 @@ + diff --git a/maxkey-core/.classpath b/maxkey-core/.classpath index b79fc0c54..7a7f31fec 100644 --- a/maxkey-core/.classpath +++ b/maxkey-core/.classpath @@ -10,6 +10,7 @@ + diff --git a/maxkey-core/src/main/java/org/maxkey/web/ExceptionEndpoint.java b/maxkey-core/src/main/java/org/maxkey/web/ExceptionEndpoint.java new file mode 100644 index 000000000..1a91b945d --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/ExceptionEndpoint.java @@ -0,0 +1,39 @@ +package org.maxkey.web; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +/** + * Index + * @author Crystal.Sea + * + */ +@Controller +public class ExceptionEndpoint { + private static Logger _logger = LoggerFactory.getLogger(ExceptionEndpoint.class); + + @RequestMapping(value={"/exception/error/400"}) + public ModelAndView error400() { + _logger.debug("exception/400."); + return new ModelAndView("exception/400"); + } + + @RequestMapping(value={"/exception/error/404"}) + public ModelAndView error404() { + _logger.debug("exception/404."); + return new ModelAndView("exception/404"); + } + @RequestMapping(value={"/exception/error/500"}) + public ModelAndView error500() { + _logger.debug("exception/500."); + return new ModelAndView("exception/500"); + } + @RequestMapping(value={"/exception/accessdeny"}) + public ModelAndView accessdeny() { + _logger.debug("exception/accessdeny."); + return new ModelAndView("exception/accessdeny"); + } +} \ No newline at end of file diff --git a/maxkey-dao/.classpath b/maxkey-dao/.classpath index 540156aa7..8b3d57e2b 100644 --- a/maxkey-dao/.classpath +++ b/maxkey-dao/.classpath @@ -16,12 +16,14 @@ + + diff --git a/maxkey-protocols/maxkey-protocol-cas/.classpath b/maxkey-protocols/maxkey-protocol-cas/.classpath index b79fc0c54..7a7f31fec 100644 --- a/maxkey-protocols/maxkey-protocol-cas/.classpath +++ b/maxkey-protocols/maxkey-protocol-cas/.classpath @@ -10,6 +10,7 @@ + diff --git a/maxkey-web-manage/.classpath b/maxkey-web-manage/.classpath index 2a1397787..7fea4e142 100644 --- a/maxkey-web-manage/.classpath +++ b/maxkey-web-manage/.classpath @@ -14,10 +14,6 @@ - - - - - + diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java index a6e1f05b6..5ab28fcec 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java @@ -1,8 +1,13 @@ package org.maxkey; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.server.ConfigurableWebServerFactory; +import org.springframework.boot.web.server.ErrorPage; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; @Configuration @@ -19,4 +24,24 @@ public class MaxKeyMgtConfig { public void setPort(int port) { this.port = port; } + + /** + * 配置默认错误页面（仅用于内嵌tomcat启动时） + * 使用这种方式，在打包为war后不起作用 + * + * @return + */ + @Bean + public WebServerFactoryCustomizer webServerFactoryCustomizer() { + return new WebServerFactoryCustomizer() { + @Override + public void customize(ConfigurableWebServerFactory factory) { + ErrorPage errorPage400 = new ErrorPage(HttpStatus.BAD_REQUEST,"/exception/error/400"); + ErrorPage errorPage404 = new ErrorPage(HttpStatus.NOT_FOUND,"/exception/error/404"); + ErrorPage errorPage500 = new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR,"/exception/error/500"); + factory.addErrorPages(errorPage400, errorPage404,errorPage500); + + } + }; + } } diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java index c1ee499a0..9079df960 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java @@ -30,16 +30,4 @@ public class IndexEndpoint { return new ModelAndView("index"); } - - @RequestMapping(value={"/accessdeny"}) - public ModelAndView accessdeny() { - _logger.debug("exception/accessdeny."); - return new ModelAndView("exception/accessdeny"); - } - -// @RequestMapping(value={"/error"}) -// public ModelAndView error() { -// _logger.debug("exception/error."); -// return new ModelAndView("exception/error"); -// } } \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/500.jsp b/maxkey-web-manage/src/main/resources/templates/views/exception/400.ftl similarity index 66% rename from maxkey-web-maxkey/src/main/resources/templates/views/exception/500.jsp rename to maxkey-web-manage/src/main/resources/templates/views/exception/400.ftl index 1409b1b4b..7455b65cd 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/exception/500.jsp +++ b/maxkey-web-manage/src/main/resources/templates/views/exception/400.ftl @@ -1,6 +1,6 @@ -

Error!

+

BAD_REQUEST!

\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/404.ftl b/maxkey-web-manage/src/main/resources/templates/views/exception/404.ftl index 2f09c3628..324548b53 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/exception/404.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/exception/404.ftl @@ -1,5 +1,6 @@ + - -

Page not found!

- + +

REQUEST NOT_FOUND !

+ \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/500.ftl b/maxkey-web-manage/src/main/resources/templates/views/exception/500.ftl new file mode 100644 index 000000000..378c5ebea --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/exception/500.ftl @@ -0,0 +1,6 @@ + + + +

INTERNAL_SERVER_ERROR!

+ + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/503.jsp b/maxkey-web-manage/src/main/resources/templates/views/exception/501.ftl similarity index 51% rename from maxkey-web-maxkey/src/main/resources/templates/views/exception/503.jsp rename to maxkey-web-manage/src/main/resources/templates/views/exception/501.ftl index 9d32c094f..bef9849fd 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/exception/503.jsp +++ b/maxkey-web-manage/src/main/resources/templates/views/exception/501.ftl @@ -1,5 +1,5 @@ -

Error!

+

Not Implemented !

\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/503.ftl b/maxkey-web-manage/src/main/resources/templates/views/exception/503.ftl new file mode 100644 index 000000000..28e44e4f5 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/exception/503.ftl @@ -0,0 +1,5 @@ + + +

Service Unavailable !

+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/error.ftl b/maxkey-web-manage/src/main/resources/templates/views/exception/error.ftl deleted file mode 100644 index 2c00b45fb..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/exception/error.ftl +++ /dev/null @@ -1,5 +0,0 @@ - - -

ERROR!

- - \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/loginError.ftl b/maxkey-web-manage/src/main/resources/templates/views/exception/loginError.ftl deleted file mode 100644 index b2567997f..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/exception/loginError.ftl +++ /dev/null @@ -1,34 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> - - - - Login Error Page - - - - - - - - - -
- 登录失败,失败原因 : ${errorMsg}
- 系统将在5秒后,自动跳转到登录页面,您也可以通过点击登录手动跳转 -
- - diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/oauthError.ftl b/maxkey-web-manage/src/main/resources/templates/views/exception/oauthError.ftl deleted file mode 100644 index ab0b572fe..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/exception/oauthError.ftl +++ /dev/null @@ -1,18 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> - - - - Oauth Error Page - - - - - - - - -
- oauth认证失败!失败原因 : ${errorMsg} -
- - diff --git a/maxkey-web-maxkey/.classpath b/maxkey-web-maxkey/.classpath index 1501fbb14..1d13cc0b0 100644 --- a/maxkey-web-maxkey/.classpath +++ b/maxkey-web-maxkey/.classpath @@ -16,14 +16,11 @@ + - - - - - + diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java index 5dbea8d16..365dcf67c 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java @@ -37,20 +37,20 @@ public class MaxKeyConfig { return registration; } - /** - * 配置默认错误页面（仅用于内嵌tomcat启动时） - * 使用这种方式，在打包为war后不起作用 - * - * @return - */ + /** + * 配置默认错误页面（仅用于内嵌tomcat启动时） + * 使用这种方式，在打包为war后不起作用 + * + * @return + */ @Bean public WebServerFactoryCustomizer webServerFactoryCustomizer() { return new WebServerFactoryCustomizer() { @Override public void customize(ConfigurableWebServerFactory factory) { - ErrorPage errorPage400 = new ErrorPage(HttpStatus.BAD_REQUEST,"/error-400"); - ErrorPage errorPage404 = new ErrorPage(HttpStatus.NOT_FOUND,"/error-404"); - ErrorPage errorPage500 = new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR,"/error-500"); + ErrorPage errorPage400 = new ErrorPage(HttpStatus.BAD_REQUEST,"/exception/error/400"); + ErrorPage errorPage404 = new ErrorPage(HttpStatus.NOT_FOUND,"/exception/error/404"); + ErrorPage errorPage500 = new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR,"/exception/error/500"); factory.addErrorPages(errorPage400, errorPage404,errorPage500); } diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java index 4203b2f84..16741741a 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/IndexEndpoint.java @@ -75,10 +75,4 @@ public class IndexEndpoint { return new ModelAndView("index"); } - - @RequestMapping(value={"/accessdeny"}) - public ModelAndView accessdeny() { - _logger.debug("exception/accessdeny."); - return new ModelAndView("exception/accessdeny"); - } } \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/404.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/exception/400.ftl similarity index 66% rename from maxkey-web-maxkey/src/main/resources/templates/views/exception/404.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/exception/400.ftl index 1409b1b4b..7455b65cd 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/exception/404.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/exception/400.ftl @@ -1,6 +1,6 @@ -

Error!

+

BAD_REQUEST!

\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/404.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/exception/404.ftl new file mode 100644 index 000000000..324548b53 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/exception/404.ftl @@ -0,0 +1,6 @@ + + + +

REQUEST NOT_FOUND !

+ + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/500.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/exception/500.ftl new file mode 100644 index 000000000..378c5ebea --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/exception/500.ftl @@ -0,0 +1,6 @@ + + + +

INTERNAL_SERVER_ERROR!

+ + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/501.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/exception/501.ftl similarity index 51% rename from maxkey-web-maxkey/src/main/resources/templates/views/exception/501.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/exception/501.ftl index 9d32c094f..bef9849fd 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/exception/501.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/exception/501.ftl @@ -1,5 +1,5 @@ -

Error!

+

Not Implemented !

\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/503.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/exception/503.ftl new file mode 100644 index 000000000..28e44e4f5 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/exception/503.ftl @@ -0,0 +1,5 @@ + + +

Service Unavailable !

+ + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/exception/accessdeny.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/exception/accessdeny.ftl similarity index 100% rename from maxkey-web-maxkey/src/main/resources/templates/views/exception/accessdeny.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/exception/accessdeny.ftl