admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReleaseNotes.txt
View File

@ -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-200601) RBAC 基于角色的访问控制(Role-Based Access Control )支持
*(MAXKEY-200602) 主题切换支持 黑色经典|薄荷清新|激情紫荆 *(MAXKEY-200602) 主题切换支持 黑色经典|薄荷清新|激情紫荆
*(MAXKEY-200603) 修复用户组访问权限删除问题 *(MAXKEY-200603) 修复用户组访问权限删除问题

2
gradle.properties
View File

@ -1,5 +1,5 @@
group =org.maxkey group =org.maxkey
version =1.5.0.RELEASE version =2.0.0.RELEASE
vendor =https://github.com/shimingxy/MaxKey vendor =https://github.com/shimingxy/MaxKey
author =shimingxy author =shimingxy
#Version For use jar #Version For use jar

1
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java
View File

@ -80,6 +80,7 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{
WebContext.setAttribute(CasConstants.PARAMETER.ENDPOINT_CAS_DETAILS, casDetails); WebContext.setAttribute(CasConstants.PARAMETER.ENDPOINT_CAS_DETAILS, casDetails);
WebContext.setAttribute(WebConstants.SINGLE_SIGN_ON_APP_ID, casDetails.getId()); WebContext.setAttribute(WebConstants.SINGLE_SIGN_ON_APP_ID, casDetails.getId());
WebContext.setAttribute(AuthorizeBaseEndpoint.class.getName(),casDetails);
return WebContext.redirect("/authz/cas/granting"); return WebContext.redirect("/authz/cas/granting");
} }

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.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; 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.stereotype.Controller;
import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
@ -87,18 +84,7 @@ public class LoginEndpoint {
modelAndView.addObject("isCaptcha", applicationConfig.getLoginConfig().isCaptcha()); modelAndView.addObject("isCaptcha", applicationConfig.getLoginConfig().isCaptcha());
modelAndView.addObject("sessionid", WebContext.getSession().getId()); 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()){ if(WebContext.isAuthenticated()){
return WebContext.redirect("/main"); return WebContext.redirect("/main");
} }

2
maxkey-web-manage/src/main/resources/application.properties
View File

@ -2,7 +2,7 @@
#application #application
application.title=MaxKey application.title=MaxKey
application.name=MaxKey-Mgt application.name=MaxKey-Mgt
application.formatted-version=v1.5.0 GA application.formatted-version=v2.0.0 RC1
#server config #server config
#server port #server port
server.port=9521 server.port=9521

2
maxkey-web-maxkey/src/main/resources/application.properties
View File

@ -2,7 +2,7 @@
#application #application
application.title=MaxKey application.title=MaxKey
application.name=MaxKey application.name=MaxKey
application.formatted-version=v1.5.0 GA application.formatted-version=v2.0.0 RC1
#server config #server config
#spring.profiles.active=dev #spring.profiles.active=dev
#server port #server port

7
maxkey-web-maxkey/src/main/resources/spring/maxkey.xml
View File

@ -193,9 +193,10 @@
<mvc:mapping path="/authz/tokenbased/*"/> <mvc:mapping path="/authz/tokenbased/*"/>
<mvc:mapping path="/authz/saml20/idpinit/*"/> <mvc:mapping path="/authz/saml20/idpinit/*"/>
<mvc:mapping path="/authz/saml20/assertion"/> <mvc:mapping path="/authz/saml20/assertion"/>
<mvc:mapping path="/authz/cas/login"/> <mvc:mapping path="/authz/cas/*"/>
<mvc:mapping path="/authz/cas/granting"/> <mvc:mapping path="/authz/cas/*/*"/>
<mvc:mapping path="/oauth/v20/authorize"/> <mvc:mapping path="/authz/cas/granting/*"/>
<mvc:mapping path="/oauth/v20/authorize/*"/>
<bean class="org.maxkey.web.interceptor.PermissionAdapter" /> <bean class="org.maxkey.web.interceptor.PermissionAdapter" />
</mvc:interceptor> </mvc:interceptor>