diff --git a/maxkey-core/src/main/java/org/maxkey/web/InitWebContext.java b/maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java similarity index 100% rename from maxkey-core/src/main/java/org/maxkey/web/InitWebContext.java rename to maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java 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 ce9611dc1..c1ee499a0 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 @@ -1,39 +1,45 @@ -package org.maxkey.web.endpoint; - -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 IndexEndpoint { - - private static Logger _logger = LoggerFactory.getLogger(IndexEndpoint.class); - - - @RequestMapping(value={"/main"}) - public ModelAndView home() { - _logger.debug("IndexController /main."); - - return new ModelAndView("main"); - } - - @RequestMapping(value={"/"}) - public ModelAndView index() { - _logger.debug("IndexController /."); - return new ModelAndView("index"); - - } - - @RequestMapping(value={"/accessdeny"}) - public ModelAndView accessdeny() { - _logger.debug("exception/accessdeny."); - return new ModelAndView("exception/accessdeny"); - } +package org.maxkey.web.endpoint; + +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 IndexEndpoint { + + private static Logger _logger = LoggerFactory.getLogger(IndexEndpoint.class); + + + @RequestMapping(value={"/main"}) + public ModelAndView home() { + _logger.debug("IndexController /main."); + + return new ModelAndView("main"); + } + + @RequestMapping(value={"/"}) + public ModelAndView index() { + _logger.debug("IndexController /."); + 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-manage/src/main/resources/templates/views/accounts/appAccountsList.jsp b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.jsp rename to maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.jsp b/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.jsp rename to maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/404.jsp b/maxkey-web-manage/src/main/resources/templates/views/exception/404.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/exception/404.jsp rename to maxkey-web-manage/src/main/resources/templates/views/exception/404.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/accessdeny.jsp b/maxkey-web-manage/src/main/resources/templates/views/exception/accessdeny.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/exception/accessdeny.jsp rename to maxkey-web-manage/src/main/resources/templates/views/exception/accessdeny.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/loginError.jsp b/maxkey-web-manage/src/main/resources/templates/views/exception/loginError.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/exception/loginError.jsp rename to maxkey-web-manage/src/main/resources/templates/views/exception/loginError.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/exception/oauthError.jsp b/maxkey-web-manage/src/main/resources/templates/views/exception/oauthError.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/exception/oauthError.jsp rename to maxkey-web-manage/src/main/resources/templates/views/exception/oauthError.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.jsp b/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.jsp rename to maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.jsp b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.jsp rename to maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.jsp b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.jsp rename to maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginApp.jsp b/maxkey-web-manage/src/main/resources/templates/views/report/loginApp.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/report/loginApp.jsp rename to maxkey-web-manage/src/main/resources/templates/views/report/loginApp.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginBrowser.jsp b/maxkey-web-manage/src/main/resources/templates/views/report/loginBrowser.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/report/loginBrowser.jsp rename to maxkey-web-manage/src/main/resources/templates/views/report/loginBrowser.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginDay.jsp b/maxkey-web-manage/src/main/resources/templates/views/report/loginDay.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/report/loginDay.jsp rename to maxkey-web-manage/src/main/resources/templates/views/report/loginDay.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginMonth.jsp b/maxkey-web-manage/src/main/resources/templates/views/report/loginMonth.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/report/loginMonth.jsp rename to maxkey-web-manage/src/main/resources/templates/views/report/loginMonth.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginYear.jsp b/maxkey-web-manage/src/main/resources/templates/views/report/loginYear.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/report/loginYear.jsp rename to maxkey-web-manage/src/main/resources/templates/views/report/loginYear.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.jsp rename to maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl