diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java index c773df79..d66c9e1c 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java @@ -65,9 +65,9 @@ public class IndexRouteController { List menus; if (StringUtils.equalsIgnoreCase(ISystemConstant.ADMIN, userInfoBO.getUserUsername())) { - menus = menuService.list(oAuth2ClientProperties.getClient().getClientId(), ISystemConstant.ADMIN); + menus = menuService.listAll(oAuth2ClientProperties.getClient().getClientId(), ISystemConstant.ADMIN); } else { - menus = menuService.list(oAuth2ClientProperties.getClient().getClientId(), securityComponent.getCurrentUser().getRoles()); + menus = menuService.listAll(oAuth2ClientProperties.getClient().getClientId(), securityComponent.getCurrentUser().getRoles()); } mv.addObject("menus", menus); return mv; diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java index 6d356fdf..7ab09b6b 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java @@ -28,10 +28,10 @@ public interface IMenuRemoteService { * @param accessToken token * @return */ - @RemoteGetMethod("/resource/oauth2client/list/{clientId}/{userId}") - List list(@RemoteServerParams String server, - @RemotePathParams("clientId") String clientId, - @RemotePathParams("userId") String userId, - @RemoteQueryParams("access_token") String accessToken); + @RemoteGetMethod("/resource/oauth2client/list-all/{clientId}/{userId}") + List listAll(@RemoteServerParams String server, + @RemotePathParams("clientId") String clientId, + @RemotePathParams("userId") String userId, + @RemoteQueryParams("access_token") String accessToken); } diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/IMenuService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/IMenuService.java index bbe8b076..72f975be 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/IMenuService.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/IMenuService.java @@ -21,7 +21,7 @@ public interface IMenuService { * @param roleId 角色ID * @return */ - List list(String clientId, String roleId); + List listAll(String clientId, String roleId); /** * 菜单列表 @@ -30,5 +30,5 @@ public interface IMenuService { * @param roles 角色列表 * @return */ - List list(String clientId, List roles); + List listAll(String clientId, List roles); } diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java index 2e414ed3..380377e7 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java @@ -29,12 +29,12 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService @Override - public List list(String clientId, String roleId) { - return menuRemoteService.list(apiPathProperties.getUserCenter(), clientId, roleId, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken()); + public List listAll(String clientId, String roleId) { + return menuRemoteService.listAll(apiPathProperties.getUserCenter(), clientId, roleId, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken()); } @Override - public List list(String clientId, List roles) { + public List listAll(String clientId, List roles) { StringBuilder roleIdsSB = new StringBuilder(); for (RoleSimpleDTO role : roles) { if (roleIdsSB.length() > 0) { @@ -42,6 +42,6 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService } roleIdsSB.append(role.getRoleId()); } - return menuRemoteService.list(apiPathProperties.getUserCenter(), clientId, roleIdsSB.toString(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken()); + return menuRemoteService.listAll(apiPathProperties.getUserCenter(), clientId, roleIdsSB.toString(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken()); } } 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 462183d6..1b2c7489 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 @@ -37,9 +37,9 @@ public class OAuth2ClientResourceController extends DefaultBaseController { @ApiImplicitParam(name = "roleIds", value = "角色ID列表,逗号分割", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("list/{clientId}/{roleIds}") + @GetMapping("list-all/{clientId}/{roleIds}") public List list(@PathVariable("clientId") String clientId, @PathVariable("roleIds") List roleIds) throws SearchException { - return oAuth2ClientMenuService.list(clientId, roleIds); + return oAuth2ClientMenuService.listAll(clientId, roleIds); } diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientMenuService.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientMenuService.java index b322b989..246b048c 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientMenuService.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientMenuService.java @@ -20,6 +20,6 @@ public interface IOAuth2ClientMenuService { * @param roleIds 角色ID列表 * @return */ - List list(String clientId, List roleIds); + List listAll(String clientId, List roleIds); } 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 be473e6a..527fbfd2 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 @@ -34,7 +34,7 @@ public class OAuth2ClientMenuServiceImpl extends DefaultBaseService implements I private IOAuth2ClientService oAuth2ClientService; @Override - public List list(String clientId, List roleIds) { + public List listAll(String clientId, List roleIds) { if (roleMenuBaseService == null) { throw new DependencyException("角色依赖未引入"); }