Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增OAuth2客户单菜单查询与加载功能

Browse Source
This commit is contained in:
wanggeng 2021-09-22 17:02:02 +08:00
parent 62c4a26567
commit 47b64ec677
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/controller/route/IndexRouteController.java
View File

@ -65,9 +65,9 @@ public class IndexRouteController {
List<MenuDTO> 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;

4
login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java
View File

@ -28,8 +28,8 @@ public interface IMenuRemoteService {
* @param accessToken token
* @return
*/
@RemoteGetMethod("/resource/oauth2client/list/{clientId}/{userId}")
List<MenuDTO> list(@RemoteServerParams String server,
@RemoteGetMethod("/resource/oauth2client/list-all/{clientId}/{userId}")
List<MenuDTO> listAll(@RemoteServerParams String server,
@RemotePathParams("clientId") String clientId,
@RemotePathParams("userId") String userId,
@RemoteQueryParams("access_token") String accessToken);

4
login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/IMenuService.java
View File

@ -21,7 +21,7 @@ public interface IMenuService {
* @param roleId 角色ID
* @return
*/
List<MenuDTO> list(String clientId, String roleId);
List<MenuDTO> listAll(String clientId, String roleId);
/**
* 菜单列表
@ -30,5 +30,5 @@ public interface IMenuService {
* @param roles 角色列表
* @return
*/
List<MenuDTO> list(String clientId, List<RoleSimpleDTO> roles);
List<MenuDTO> listAll(String clientId, List<RoleSimpleDTO> roles);
}

8
login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java
View File

@ -29,12 +29,12 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
@Override
public List<MenuDTO> list(String clientId, String roleId) {
return menuRemoteService.list(apiPathProperties.getUserCenter(), clientId, roleId, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
public List<MenuDTO> listAll(String clientId, String roleId) {
return menuRemoteService.listAll(apiPathProperties.getUserCenter(), clientId, roleId, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
}
@Override
public List<MenuDTO> list(String clientId, List<RoleSimpleDTO> roles) {
public List<MenuDTO> listAll(String clientId, List<RoleSimpleDTO> 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());
}
}

4
login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java
View File

@ -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<MenuDTO> list(@PathVariable("clientId") String clientId, @PathVariable("roleIds") List<String> roleIds) throws SearchException {
return oAuth2ClientMenuService.list(clientId, roleIds);
return oAuth2ClientMenuService.listAll(clientId, roleIds);
}

2
login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientMenuService.java
View File

@ -20,6 +20,6 @@ public interface IOAuth2ClientMenuService {
* @param roleIds 角色ID列表
* @return
*/
List<MenuDTO> list(String clientId, List<String> roleIds);
List<MenuDTO> listAll(String clientId, List<String> roleIds);
}

2
login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientMenuServiceImpl.java
View File

@ -34,7 +34,7 @@ public class OAuth2ClientMenuServiceImpl extends DefaultBaseService implements I
private IOAuth2ClientService oAuth2ClientService;
@Override
public List<MenuDTO> list(String clientId, List<String> roleIds) {
public List<MenuDTO> listAll(String clientId, List<String> roleIds) {
if (roleMenuBaseService == null) {
throw new DependencyException("角色依赖未引入");
}