From bcbd926bbe6069b5c995713ce1e93f5ee68b299f Mon Sep 17 00:00:00 2001 From: shimingxy Date: Sat, 23 May 2020 14:46:46 +0800 Subject: [PATCH] v2.0.0RC1 v2.0.0RC1 --- ReleaseNotes.txt | 2 +- gradle.properties | 2 +- .../authz/cas/endpoint/CasAuthorizeEndpoint.java | 1 + .../org/maxkey/web/endpoint/LoginEndpoint.java | 16 +--------------- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/spring/maxkey.xml | 7 ++++--- 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 254488cf1..f6b3d9391 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,4 +1,4 @@ -MaxKey v 1.5.0 GA 2020/**/** +MaxKey v 2.0.0 RC1 2020/**/** *(MAXKEY-200601) RBAC 基于角色的访问控制(Role-Based Access Control )支持 *(MAXKEY-200602) 主题切换支持 黑色经典|薄荷清新|激情紫荆 *(MAXKEY-200603) 修复用户组访问权限删除问题 diff --git a/gradle.properties b/gradle.properties index 615601e9b..a20ef0e5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group =org.maxkey -version =1.5.0.RELEASE +version =2.0.0.RELEASE vendor =https://github.com/shimingxy/MaxKey author =shimingxy #Version For use jar diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java index 129bca271..735178762 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java @@ -80,6 +80,7 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{ WebContext.setAttribute(CasConstants.PARAMETER.ENDPOINT_CAS_DETAILS, casDetails); WebContext.setAttribute(WebConstants.SINGLE_SIGN_ON_APP_ID, casDetails.getId()); + WebContext.setAttribute(AuthorizeBaseEndpoint.class.getName(),casDetails); return WebContext.redirect("/authz/cas/granting"); } diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index f666af62e..0d4f7bfb7 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -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"); } diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties index 944a7119c..ca63519b7 100644 --- a/maxkey-web-manage/src/main/resources/application.properties +++ b/maxkey-web-manage/src/main/resources/application.properties @@ -2,7 +2,7 @@ #application application.title=MaxKey application.name=MaxKey-Mgt -application.formatted-version=v1.5.0 GA +application.formatted-version=v2.0.0 RC1 #server config #server port server.port=9521 diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties index 196b303a8..4234f0a91 100644 --- a/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-web-maxkey/src/main/resources/application.properties @@ -2,7 +2,7 @@ #application application.title=MaxKey application.name=MaxKey -application.formatted-version=v1.5.0 GA +application.formatted-version=v2.0.0 RC1 #server config #spring.profiles.active=dev #server port diff --git a/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml index 09962846e..f9bfb24f1 100644 --- a/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml +++ b/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml @@ -193,9 +193,10 @@ - - - + + + +