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

v2.0.0RC1

Browse Source 
v2.0.0RC1
This commit is contained in:
shimingxy
2020-05-23 14:46:46 +08:00
parent 239573cd05
commit bcbd926bbe
7 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java
View File

@@ -14,9 +14,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
import org.springframework.security.web.savedrequest.RequestCache;
import org.springframework.security.web.savedrequest.SavedRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -87,18 +84,7 @@ public class LoginEndpoint {
modelAndView.addObject("isCaptcha", applicationConfig.getLoginConfig().isCaptcha());
modelAndView.addObject("sessionid", WebContext.getSession().getId());
}
//save first protected url
SavedRequest firstSavedRequest = (SavedRequest)WebContext.getAttribute(WebConstants.FIRST_SAVED_REQUEST_PARAMETER);
if(firstSavedRequest==null){
RequestCache requestCache = new HttpSessionRequestCache();
SavedRequest savedRequest =requestCache.getRequest(request, response);
if(savedRequest!=null){
_logger.debug("first request parameter "+savedRequest.getRedirectUrl());
WebContext.setAttribute(WebConstants.FIRST_SAVED_REQUEST_PARAMETER, savedRequest);
}
}else {
WebContext.setAttribute(WebConstants.SPRING_PROCESS_SAVED_REQUEST, firstSavedRequest);
}
if(WebContext.isAuthenticated()){
return WebContext.redirect("/main");
}