From fa11707377f2d75e9f1c3f0770facf15e0f5f1ae Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Thu, 26 May 2022 17:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- login-oauth2-client/pom.xml | 4 +-- login-oauth2-server/pom.xml | 4 +-- .../OAuth2ClientResourceController.java | 1 - .../OAuth2ClientAuthorizationEndpoint.java | 2 +- .../exceptions/OAuth2ClientMenuException.java | 29 +++++++++++++++++++ .../impl/OAuth2ClientMenuServiceImpl.java | 4 +-- pom.xml | 2 +- 7 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/exceptions/OAuth2ClientMenuException.java diff --git a/login-oauth2-client/pom.xml b/login-oauth2-client/pom.xml index 2790086b..48b83395 100644 --- a/login-oauth2-client/pom.xml +++ b/login-oauth2-client/pom.xml @@ -31,12 +31,12 @@ org.springframework.security spring-security-jwt - 1.0.9.RELEASE + 1.1.1.RELEASE org.springframework.security.oauth.boot spring-security-oauth2-autoconfigure - 2.5.13 + 2.0.0.RELEASE com.fasterxml.jackson.core diff --git a/login-oauth2-server/pom.xml b/login-oauth2-server/pom.xml index 92dc70b1..0dfdd81b 100644 --- a/login-oauth2-server/pom.xml +++ b/login-oauth2-server/pom.xml @@ -41,12 +41,12 @@ org.springframework.security spring-security-jwt - 1.0.9.RELEASE + 1.1.1.RELEASE org.springframework.security.oauth.boot spring-security-oauth2-autoconfigure - 2.5.13 + 2.0.0.RELEASE com.fasterxml.jackson.core diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java index e6c97ab4..6a4594d8 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java @@ -31,7 +31,6 @@ public class OAuth2ClientResourceController extends DefaultBaseController { @Autowired private IOAuth2ClientMenuService oAuth2ClientMenuService; - @ApiOperation(value = "Oauth2客户端菜单列表", notes = "Oauth2客户端菜单列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "clientId", value = "客户端ID", paramType = "path"), diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/endpoint/OAuth2ClientAuthorizationEndpoint.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/endpoint/OAuth2ClientAuthorizationEndpoint.java index 0efc0d29..2be8ed6d 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/endpoint/OAuth2ClientAuthorizationEndpoint.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/endpoint/OAuth2ClientAuthorizationEndpoint.java @@ -56,7 +56,7 @@ public class OAuth2ClientAuthorizationEndpoint extends AbstractEndpoint { private SessionAttributeStore sessionAttributeStore = new DefaultSessionAttributeStore(); private OAuth2RequestValidator oauth2RequestValidator = new DefaultOAuth2RequestValidator(); private String userApprovalPage = "error/oauth_confirm_access"; - private String errorPage = "error/oauth_error"; + private String errorPage = "error/exception"; private Object implicitLock = new Object(); @Autowired private UserApprovalHandler userApprovalHandler; diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/exceptions/OAuth2ClientMenuException.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/exceptions/OAuth2ClientMenuException.java new file mode 100644 index 00000000..a97c957a --- /dev/null +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/exceptions/OAuth2ClientMenuException.java @@ -0,0 +1,29 @@ +package ink.wgink.login.oauth2.server.exceptions; + +import org.springframework.security.oauth2.common.exceptions.ClientAuthenticationException; + +/** + * @ClassName: OAuth2ClientMenuException + * @Description: 单点登录客户端菜单异常 + * @Author: wanggeng + * @Date: 2022/5/26 17:17 + * @Version: 1.0 + */ +public class OAuth2ClientMenuException extends ClientAuthenticationException { + + + public OAuth2ClientMenuException(String msg) { + super(msg); + } + + @Override + public int getHttpErrorCode() { + return 401; + } + + @Override + public String getOAuth2ErrorCode() { + return "menu_error"; + } + +} diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientMenuServiceImpl.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientMenuServiceImpl.java index b86a2ada..4e9b6365 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientMenuServiceImpl.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientMenuServiceImpl.java @@ -2,7 +2,6 @@ package ink.wgink.login.oauth2.server.service.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.DependencyException; -import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.interfaces.menu.IMenuBaseService; import ink.wgink.interfaces.role.IRoleMenuBaseService; @@ -14,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -43,7 +43,7 @@ public class OAuth2ClientMenuServiceImpl extends DefaultBaseService implements I } OAuth2ClientPO oAuth2ClientPO = oAuth2ClientService.getPO(clientId); if (StringUtils.isBlank(oAuth2ClientPO.getMenuId())) { - throw new ParamsException("客户端未绑定菜单"); + return new ArrayList<>(); } List menuIds; if (StringUtils.equals(roleIds.get(0), ISystemConstant.ADMIN)) { diff --git a/pom.xml b/pom.xml index 3dad7742..5171ab00 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 5.3.20 5.2.9.RELEASE 2.7.0 - 1.2.25 + 1.2.83 2.0.2 20210307 3.0.5