LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reLoginUrl

Browse Source
This commit is contained in:
MaxKey
2021-07-16 21:10:45 +08:00
parent 1141894808
commit fd54caf50c
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LogoutEndpoint.java
View File

@@ -95,9 +95,9 @@ public class LogoutEndpoint {
ModelAndView modelAndView = new ModelAndView();
authenticationRealm.logout(response);
if(reLoginUrl==null){
if(reLoginUrl==null ||reLoginUrl.equals("")){
SavedRequest firstSavedRequest = (SavedRequest)WebContext.getAttribute(WebConstants.FIRST_SAVED_REQUEST_PARAMETER);
reLoginUrl=WebContext.getHttpContextPath()+"/login";
reLoginUrl="/login";
if(firstSavedRequest!=null){
reLoginUrl= firstSavedRequest.getRedirectUrl();
WebContext.removeAttribute(WebConstants.FIRST_SAVED_REQUEST_PARAMETER);
@@ -106,7 +106,11 @@ public class LogoutEndpoint {
//not start with http or https
if(reLoginUrl!=null && !reLoginUrl.toLowerCase().startsWith("http")) {
reLoginUrl=WebContext.getHttpContextPath()+"/"+reLoginUrl;
if(reLoginUrl.startsWith("/")) {
reLoginUrl=request.getContextPath()+reLoginUrl;
}else {
reLoginUrl=request.getContextPath()+"/"+reLoginUrl;
}
}
_logger.debug("re Login URL : "+ reLoginUrl);

3
maxkey-web-maxkey/src/main/resources/templates/views/authorize/authorize_common.ftl
View File

@@ -1,8 +1,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link type="text/css" rel="stylesheet" href="<@base />/static/css/base.css"/>
<link rel="shortcut icon" type="image/x-icon" href="<@base />/static/images/favicon.ico"/>
<base href="<@basePath/>"/>
<base href="<@base />"/>
<script src ="<@base />/static/jquery/jquery-3.5.0.min.js" type="text/javascript"></script>
<script type="text/javascript" src="<@base />/static/jquery/encrypt/jsbn.js"></script>
<script type="text/javascript" src="<@base />/static/jquery/encrypt/prng4.js"></script>