新增OAuth2用户权限列表登录传递

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/converter/OAuth2ClientUserAuthConverter.java

@@ -1,6 +1,7 @@
 package ink.wgink.login.oauth2.client.converter;
 
 import com.alibaba.fastjson.JSONObject;
+import ink.wgink.pojo.bos.RoleGrantedAuthorityBO;
 import ink.wgink.pojo.bos.UserInfoBO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,12 +36,22 @@ public class OAuth2ClientUserAuthConverter implements UserAuthenticationConverte
         // 解析客户端的权限请求
         Object principal = map.get("user_name");
         if (!Objects.isNull(principal)) {
-            Collection<GrantedAuthority> authorities = new ArrayList<>();
             // 包含用户信息，则直接抽取其中的用户信息
-            UserInfoBO userInfoBO = JSONObject.parseObject(map.get("user_info").toString(), UserInfoBO.class);
+            principal = JSONObject.parseObject(map.get("user_info").toString(), UserInfoBO.class);
-            principal = userInfoBO;
             LOG.debug("获取用户权限");
-            return new UsernamePasswordAuthenticationToken(principal, "N/A", authorities);
+            List<LinkedHashMap<String, Object>> grantedAuthoritieList = (ArrayList<LinkedHashMap<String, Object>>) map.get("authorities");
+            Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
+            grantedAuthoritieList.forEach(authMap -> {
+                RoleGrantedAuthorityBO roleGrantedAuthorityBO = new RoleGrantedAuthorityBO((String) authMap.get("roleId"),
+                        (String) authMap.get("roleName"),
+                        (List<String>) authMap.get("menuUrls"),
+                        (List<String>) authMap.get("inserts"),
+                        (List<String>) authMap.get("deletes"),
+                        (List<String>) authMap.get("updates"),
+                        (List<String>) authMap.get("queries"));
+                grantedAuthorities.add(roleGrantedAuthorityBO);
+            });
+            return new UsernamePasswordAuthenticationToken(principal, "N/A", grantedAuthorities);
         }
         return null;
     }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentRemoteService.java

@@ -1,6 +1,18 @@
 package ink.wgink.login.oauth2.client.remote.department;
 
 import ink.wgink.annotation.rpc.rest.RemoteService;
+import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod;
+import ink.wgink.annotation.rpc.rest.method.RemotePostMethod;
+import ink.wgink.annotation.rpc.rest.params.*;
+import ink.wgink.pojo.dtos.ZTreeDTO;
+import ink.wgink.pojo.dtos.department.DepartmentDTO;
+import ink.wgink.pojo.pos.DepartmentPO;
+import ink.wgink.pojo.result.SuccessResultData;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: IDepartmentRemoteService
@@ -11,4 +23,44 @@ import ink.wgink.annotation.rpc.rest.RemoteService;
  */
 @RemoteService("/resource/department")
 public interface IDepartmentRemoteService {
+
+    @RemoteGetMethod("/list")
+    List<DepartmentDTO> list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/get/{departmentId}")
+    DepartmentDTO get(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemoteGetMethod("/listpage")
+    SuccessResultList<List<DepartmentDTO>> listPage(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParams("page") int page, @RemoteQueryParams("rows") int rows, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list-all")
+    List<DepartmentDTO> listAll(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list-ztree")
+    List<ZTreeDTO> listZtree(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list-id")
+    List<String> listId(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/count")
+    SuccessResultData<Integer> count(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/get-po/{departmentId}")
+    DepartmentPO getPO(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemoteGetMethod("/list-po")
+    List<DepartmentPO> listPO(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemotePostMethod("/list-po/ids")
+    List<DepartmentPO> listPOByIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/list-po/parentid/{departmentId}")
+    List<DepartmentPO> listPOByParentId(@RemoteServerParams String userCenter, @RemotePathParams("departmentParentId") String departmentParentId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemoteGetMethod("/list-po/parentid/{departmentParentId}/add-date/{addDate}")
+    List<DepartmentPO> listPOByParentIdAndAddDate(@RemoteServerParams String userCenter, @RemotePathParams("departmentParentId") String departmentParentId, @RemotePathParams("addDate") String addDate, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemoteGetMethod("/list-po/parentid/{departmentParentId}/update-date/{updateDate}")
+    List<DepartmentPO> listPOByParentIdAndUpdateDate(@RemoteServerParams String userCenter, @RemotePathParams("departmentParentId") String departmentParentId, @RemotePathParams("updateDate") String updateDate, @RemoteQueryParams("access_token") String accessToken);
+
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java

@@ -1,6 +1,16 @@
 package ink.wgink.login.oauth2.client.remote.department;
 
 import ink.wgink.annotation.rpc.rest.RemoteService;
+import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod;
+import ink.wgink.annotation.rpc.rest.method.RemotePostMethod;
+import ink.wgink.annotation.rpc.rest.params.*;
+import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: IDepartmentUserRemoteService
@@ -11,4 +21,29 @@ import ink.wgink.annotation.rpc.rest.RemoteService;
  */
 @RemoteService("/resource/department/user")
 public interface IDepartmentUserRemoteService {
+
+    @RemoteGetMethod("/list")
+    List<DepartmentUserDTO> list(@RemoteServerParams String userCenter, @RemotePathParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list/{department}")
+    List<DepartmentUserDTO> listByDepartmentId(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemotePathParams("access_token") String accessToken);
+
+    @RemotePostMethod("/list/department-ids")
+    List<DepartmentUserDTO> listByDepartmentIds(@RemoteServerParams String userCenter, @RemotePathParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/list-user-id/{departmentId}")
+    List<String> listUserId(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemotePathParams("access_token") String accessToken);
+
+    @RemotePostMethod("/list-user-id/department-ids")
+    List<String> listUserIdByDepartmentIds(@RemoteServerParams String userCenter, @RemotePathParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemotePostMethod("/list-user-id/department-id/{departmentId}/user-ids")
+    List<String> listUserIdByDepartmentIdAndUserIds(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemotePathParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemotePostMethod("/list-user-id/department-ids/user-ids")
+    List<String> listUserIdByDepartmentIdsAndUserIds(@RemoteServerParams String userCenter, @RemotePathParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/listpage/{departmentId}")
+    SuccessResultList<List<DepartmentUserDTO>> listPage(@RemoteServerParams String userCenter, @PathVariable("departmentId") String departmentId, @RemotePathParams("access_token") String accessToken, @RemoteQueryParams("page") int page, @RemoteQueryParams("rows") int rows, @RemoteQueryParamsMap Map<String, Object> params);
+
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/position/IPositionRemoteService.java

@@ -1,6 +1,18 @@
 package ink.wgink.login.oauth2.client.remote.position;
 
 import ink.wgink.annotation.rpc.rest.RemoteService;
+import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod;
+import ink.wgink.annotation.rpc.rest.method.RemotePostMethod;
+import ink.wgink.annotation.rpc.rest.params.*;
+import ink.wgink.pojo.dtos.ZTreeDTO;
+import ink.wgink.pojo.dtos.position.PositionDTO;
+import ink.wgink.pojo.pos.PositionPO;
+import ink.wgink.pojo.result.SuccessResultData;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: IPositionRemoteService
@@ -11,4 +23,34 @@ import ink.wgink.annotation.rpc.rest.RemoteService;
  */
 @RemoteService("/resource/position")
 public interface IPositionRemoteService {
+
+    @RemoteGetMethod("/list-all")
+    List<PositionDTO> listAll(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/get")
+    PositionDTO get(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/get/id/{positionId}")
+    PositionDTO getById(@RemoteServerParams String userCenter, @RemotePathParams("positionId") String positionId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemoteGetMethod("/list-ztree")
+    List<ZTreeDTO> listZTree(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/listpage")
+    SuccessResultList<List<PositionDTO>> listPage(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParams("page") int page, @RemotePathParams("rows") int rows, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list")
+    List<PositionDTO> list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemotePostMethod("/list/ids")
+    List<PositionDTO> listByIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/list-po")
+    List<PositionPO> listPO(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemotePostMethod("/list-po/ids")
+    List<PositionPO> listPOByIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/count")
+    SuccessResultData<Integer> count(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/position/IPositionUserRemoteService.java

@@ -1,6 +1,16 @@
 package ink.wgink.login.oauth2.client.remote.position;
 
 import ink.wgink.annotation.rpc.rest.RemoteService;
+import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod;
+import ink.wgink.annotation.rpc.rest.method.RemotePostMethod;
+import ink.wgink.annotation.rpc.rest.params.*;
+import ink.wgink.pojo.dtos.position.PositionUserDTO;
+import ink.wgink.pojo.pos.PositionPO;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: IPositionUserRemoteService
@@ -11,4 +21,19 @@ import ink.wgink.annotation.rpc.rest.RemoteService;
  */
 @RemoteService("/resource/position/user")
 public interface IPositionUserRemoteService {
+
+    @RemoteGetMethod("/list-userid/{positionId}")
+    List<String> listUserId(@RemoteServerParams String userCenter, @RemotePathParams("positionId") String positionId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemotePostMethod("/list-userid/position-ids")
+    List<String> listUserIdByPositionIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/listpage/{positionId}")
+    SuccessResultList<List<PositionUserDTO>> listPage(@RemoteServerParams String userCenter, @RemotePathParams("positionId") String positionId, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParams("page") int page, @RemoteQueryParams("rows") int rows, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list-position-po/userid/{userId}")
+    List<PositionPO> listPositionPOByUserId(@RemoteServerParams String userCenter, @RemotePathParams("userId") String userId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemotePostMethod("/list-position-po/user-ids")
+    List<PositionPO> listPositionPOByUserIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleRemoteService.java

@@ -1,6 +1,18 @@
 package ink.wgink.login.oauth2.client.remote.role;
 
 import ink.wgink.annotation.rpc.rest.RemoteService;
+import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod;
+import ink.wgink.annotation.rpc.rest.method.RemotePostMethod;
+import ink.wgink.annotation.rpc.rest.params.*;
+import ink.wgink.pojo.dtos.ZTreeDTO;
+import ink.wgink.pojo.dtos.role.RoleDTO;
+import ink.wgink.pojo.pos.RolePO;
+import ink.wgink.pojo.result.SuccessResultData;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: IRoleRemoteService
@@ -11,4 +23,31 @@ import ink.wgink.annotation.rpc.rest.RemoteService;
  */
 @RemoteService("/resource/role")
 public interface IRoleRemoteService {
+
+    @RemoteGetMethod("get")
+    RoleDTO get(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("get/{roleId}")
+    RoleDTO getByRoleId(@RemoteServerParams String userCenter, @RemotePathParams("roleId") String roleId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemoteGetMethod("/list")
+    List<RoleDTO> list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list-po")
+    List<RolePO> listPO(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemotePostMethod("/list-po/role-ids")
+    List<RolePO> listPOByRoleIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/list-all")
+    List<RoleDTO> listAll(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemoteGetMethod("/list-ztree")
+    List<ZTreeDTO> listZTree(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/listpage")
+    SuccessResultList<List<RoleDTO>> listPage(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParams("page") int page, @RemoteQueryParams("page") int rows, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/count")
+    SuccessResultData<Integer> count(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleUserRemoteService.java

@@ -1,6 +1,17 @@
 package ink.wgink.login.oauth2.client.remote.role;
 
 import ink.wgink.annotation.rpc.rest.RemoteService;
+import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod;
+import ink.wgink.annotation.rpc.rest.method.RemotePostMethod;
+import ink.wgink.annotation.rpc.rest.params.*;
+import ink.wgink.pojo.dtos.role.RoleUserDTO;
+import ink.wgink.pojo.pos.RolePO;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: IRoleUserRemoteService
@@ -11,4 +22,16 @@ import ink.wgink.annotation.rpc.rest.RemoteService;
  */
 @RemoteService("/resource/role/user")
 public interface IRoleUserRemoteService {
+
+    @RemoteGetMethod("/list-userid/roleid/{roleId}")
+    List<String> listUserIdByRoleId(@RemoteServerParams String userCenter, @PathVariable("roleID") String roleId, @RemoteQueryParams("access_token") String accessToken);
+
+    @RemotePostMethod("/list-userid/role-ids")
+    List<String> listUserIdByRoleIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO);
+
+    @RemoteGetMethod("/listpage/{roleId}")
+    SuccessResultList<List<RoleUserDTO>> listPage(@RemoteServerParams String userCenter, @RemotePathParams("roleId") String roleId, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParams("page") int page, @RemoteQueryParams("rows") int rows, @RemoteQueryParamsMap Map<String, Object> params);
+
+    @RemoteGetMethod("/list-role-po/userid/{userId}")
+    List<RolePO> listRolePOByUserId(@RemoteServerParams String userCenter, @PathVariable("userId") String userId, @RemoteQueryParams("access_token") String accessToken);
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java

@@ -1,20 +1,26 @@
 package ink.wgink.login.oauth2.client.service.department.impl;
 
 import ink.wgink.common.base.DefaultBaseService;
-import ink.wgink.login.oauth2.client.remote.department.IDepartmentUserRemoteService;
+import ink.wgink.login.oauth2.client.remote.department.IDepartmentRemoteService;
 import ink.wgink.login.oauth2.client.service.department.IDepartmentService;
+import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.ZTreeDTO;
 import ink.wgink.pojo.dtos.department.DepartmentDTO;
 import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO;
 import ink.wgink.pojo.pos.DepartmentPO;
+import ink.wgink.pojo.result.SuccessResultData;
 import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
 import ink.wgink.properties.ApiPathProperties;
+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;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @ClassName: DepartmentServiceImpl
@@ -27,92 +33,133 @@ import java.util.Map;
 public class DepartmentServiceImpl extends DefaultBaseService implements IDepartmentService {
 
     @Autowired
-    private IDepartmentUserRemoteService departmentUserRemoteService;
+    private IDepartmentRemoteService departmentRemoteService;
     @Autowired
     private ApiPathProperties apiPathProperties;
 
     @Override
     public List<DepartmentDTO> list(Map<String, Object> params) {
-        return null;
+        return departmentRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public DepartmentDTO get(String departmentId) {
-        return null;
+        return departmentRemoteService.get(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public SuccessResultList<List<DepartmentDTO>> listPage(ListPage page) {
-        return null;
+        return departmentRemoteService.listPage(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getPage(), page.getRows(), page.getParams());
     }
 
     @Override
     public SuccessResultList<List<DepartmentDTO>> listPageByParentId(String departmentParentId, ListPage page) {
-        return null;
+        page.getParams().put("departmentParentId", departmentParentId);
+        return listPage(page);
     }
 
     @Override
     public List<DepartmentDTO> listAll(Map<String, Object> params) {
-        return null;
+        return departmentRemoteService.listAll(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<ZTreeDTO> listZTree(Map<String, Object> params) {
-        return null;
+        return departmentRemoteService.listZtree(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<ZTreeDTO> listZTree(String departmentParentId, Map<String, Object> params) {
-        return null;
+        params.put("id", departmentParentId);
+        return listZTree(params);
     }
 
     @Override
     public List<String> listId(Map<String, Object> params) {
-        return null;
+        return departmentRemoteService.listId(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<String> listRootId(List<DepartmentSimpleDTO> departmentSimpleDTOs) {
-        return null;
+        List<String> departmentIds = new ArrayList<>();
+        if (Objects.isNull(departmentSimpleDTOs) || departmentSimpleDTOs.isEmpty()) {
+            return departmentIds;
+        }
+        List<DepartmentSimpleDTO> departmentList = new ArrayList<>(departmentSimpleDTOs);
+        List<DepartmentSimpleDTO> departmentTempList = new ArrayList<>(departmentSimpleDTOs);
+        for (int i = 0; i < departmentList.size(); i++) {
+            DepartmentSimpleDTO departmentSimpleDTO = null;
+            // 找出CODE
+            for (DepartmentSimpleDTO department : departmentList) {
+                DepartmentSimpleDTO higherDepartmentSimpleDTO = getHigherLevel(departmentList.get(i), department);
+                if (higherDepartmentSimpleDTO != null) {
+                    departmentSimpleDTO = higherDepartmentSimpleDTO;
+                }
+            }
+            departmentIds.add(departmentSimpleDTO.getDepartmentId());
+            // 删除包含关系的内容
+            for (int j = 0; j < departmentList.size(); j++) {
+                if (StringUtils.startsWith(departmentList.get(j).getDepartmentCode(), departmentSimpleDTO.getDepartmentCode())) {
+                    departmentList.remove(j);
+                    j--;
+                }
+            }
+            for (int j = 0; j < departmentTempList.size(); j++) {
+                if (StringUtils.startsWith(departmentTempList.get(j).getDepartmentCode(), departmentSimpleDTO.getDepartmentCode())) {
+                    departmentTempList.remove(j);
+                    j--;
+                }
+            }
+            i = -1;
+        }
+        return departmentIds;
     }
 
     @Override
     public DepartmentSimpleDTO getHigherLevel(DepartmentSimpleDTO departmentSimpleDTO1, DepartmentSimpleDTO departmentSimpleDTO2) {
+        if (StringUtils.startsWith(departmentSimpleDTO1.getDepartmentCode(), departmentSimpleDTO2.getDepartmentCode())) {
+            return departmentSimpleDTO2;
+        } else if (StringUtils.startsWith(departmentSimpleDTO2.getDepartmentCode(), departmentSimpleDTO1.getDepartmentCode())) {
+            return departmentSimpleDTO1;
+        }
         return null;
     }
 
     @Override
     public Integer count(Map<String, Object> params) {
-        return null;
+        SuccessResultData<Integer> successResultData = departmentRemoteService.count(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
+        return successResultData.getData();
     }
 
     @Override
     public DepartmentPO getPO(String departmentId) {
-        return null;
+        return departmentRemoteService.getPO(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<DepartmentPO> listPO(Map<String, Object> params) {
-        return null;
+        return departmentRemoteService.listPO(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<DepartmentPO> listPO(List<String> departmentIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(departmentIds);
+        return departmentRemoteService.listPOByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
-    public List<DepartmentPO> listByParentId(String departmentParentId) {
+    public List<DepartmentPO> listPOByParentId(String departmentParentId) {
-        return null;
+        return departmentRemoteService.listPOByParentId(apiPathProperties.getUserCenter(), departmentParentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
-    public List<DepartmentPO> listByParentIdAndAddDate(String departmentParentId, String addDate) {
+    public List<DepartmentPO> listPOByParentIdAndAddDate(String departmentParentId, String addDate) {
-        return null;
+        return departmentRemoteService.listPOByParentIdAndAddDate(apiPathProperties.getUserCenter(), departmentParentId, addDate, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
-    public List<DepartmentPO> listByParentIdAndUpdateDate(String departmentParentId, String updateDate) {
+    public List<DepartmentPO> listPOByParentIdAndUpdateDate(String departmentParentId, String updateDate) {
-        return null;
+        return departmentRemoteService.listPOByParentIdAndUpdateDate(apiPathProperties.getUserCenter(), departmentParentId, updateDate, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java

@@ -3,9 +3,11 @@ package ink.wgink.login.oauth2.client.service.department.impl;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.login.oauth2.client.remote.department.IDepartmentUserRemoteService;
 import ink.wgink.login.oauth2.client.service.department.IDepartmentUserService;
+import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
 import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
 import ink.wgink.properties.ApiPathProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,41 +32,50 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
 
     @Override
     public List<DepartmentUserDTO> list(Map<String, Object> params) {
-        return null;
+        return departmentUserRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<DepartmentUserDTO> list(String departmentId) {
-        return null;
+        return departmentUserRemoteService.listByDepartmentId(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<DepartmentUserDTO> list(List<String> departmentIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(departmentIds);
+        return departmentUserRemoteService.listByDepartmentIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<String> listUserId(String departmentId) {
-        return null;
+        return departmentUserRemoteService.listUserId(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<String> listUserId(List<String> departmentIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(departmentIds);
+        return departmentUserRemoteService.listUserIdByDepartmentIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<String> listUserId(String departmentId, List<String> userIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(userIds);
+        return departmentUserRemoteService.listUserIdByDepartmentIdAndUserIds(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<String> listUserId(List<String> departmentIds, List<String> userIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(departmentIds);
+        idsVO.setIds2(userIds);
+        return departmentUserRemoteService.listUserIdByDepartmentIdsAndUserIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public SuccessResultList<List<DepartmentUserDTO>> listPage(String departmentId, ListPage page) {
-        return null;
+        return departmentUserRemoteService.listPage(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getPage(), page.getRows(), page.getParams());
     }
 }

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

@@ -30,7 +30,7 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
 
     @Override
     public List<MenuDTO> listAll(String clientId, String roleId) {
-        return menuRemoteService.listAll(apiPathProperties.getUserCenter(), clientId, roleId, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        return menuRemoteService.listAll(apiPathProperties.getUserCenter(), clientId, roleId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
@@ -42,6 +42,6 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
             }
             roleIdsSB.append(role.getRoleId());
         }
-        return menuRemoteService.listAll(apiPathProperties.getUserCenter(), clientId, roleIdsSB.toString(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        return menuRemoteService.listAll(apiPathProperties.getUserCenter(), clientId, roleIdsSB.toString(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/position/impl/PositionServiceImpl.java

@@ -3,11 +3,14 @@ package ink.wgink.login.oauth2.client.service.position.impl;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.login.oauth2.client.remote.position.IPositionRemoteService;
 import ink.wgink.login.oauth2.client.service.position.IPositionService;
+import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.ZTreeDTO;
 import ink.wgink.pojo.dtos.position.PositionDTO;
 import ink.wgink.pojo.pos.PositionPO;
+import ink.wgink.pojo.result.SuccessResultData;
 import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
 import ink.wgink.properties.ApiPathProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,56 +35,63 @@ public class PositionServiceImpl extends DefaultBaseService implements IPosition
 
     @Override
     public List<PositionDTO> listAllByParentId(String groupParentId) {
-        return null;
+        Map<String, Object> params = getHashMap(2);
+        params.put("parentId", groupParentId);
+        return listAll(params);
     }
 
     @Override
     public List<PositionDTO> listAll(Map<String, Object> params) {
-        return null;
+        return positionRemoteService.listAll(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public PositionDTO get(Map<String, Object> params) {
-        return null;
+        return positionRemoteService.get(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public PositionDTO get(String positionId) {
-        return null;
+        return positionRemoteService.getById(apiPathProperties.getUserCenter(), positionId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<ZTreeDTO> listZTree(Map<String, Object> params) {
-        return null;
+        return positionRemoteService.listZTree(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public SuccessResultList<List<PositionDTO>> listPage(ListPage page) {
-        return null;
+        return positionRemoteService.listPage(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getPage(), page.getRows(), page.getParams());
     }
 
     @Override
     public List<PositionDTO> list(Map<String, Object> params) {
-        return null;
+        return positionRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
-    public List<PositionDTO> list(List<String> groupIds) {
+    public List<PositionDTO> list(List<String> positionIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(positionIds);
+        return positionRemoteService.listByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<PositionPO> listPO(Map<String, Object> params) {
-        return null;
+        return positionRemoteService.listPO(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<PositionPO> listPO(List<String> positionIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(positionIds);
+        return positionRemoteService.listPOByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public Integer count(Map<String, Object> params) {
-        return null;
+        SuccessResultData<Integer> count = positionRemoteService.count(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
+        return count.getData();
     }
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/position/impl/PositionUserServiceImpl.java

@@ -3,15 +3,18 @@ package ink.wgink.login.oauth2.client.service.position.impl;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.login.oauth2.client.remote.position.IPositionUserRemoteService;
 import ink.wgink.login.oauth2.client.service.position.IPositionUserService;
+import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.position.PositionSimpleDTO;
 import ink.wgink.pojo.dtos.position.PositionUserDTO;
 import ink.wgink.pojo.pos.PositionPO;
 import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
 import ink.wgink.properties.ApiPathProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,31 +34,47 @@ public class PositionUserServiceImpl extends DefaultBaseService implements IPosi
 
     @Override
     public List<String> listUserId(String positionId) {
-        return null;
+        return positionUserRemoteService.listUserId(apiPathProperties.getUserCenter(), positionId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<String> listUserId(List<String> positionIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(positionIds);
+        return positionUserRemoteService.listUserIdByPositionIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public SuccessResultList<List<PositionUserDTO>> listPage(String positionId, ListPage page) {
-        return null;
+        return positionUserRemoteService.listPage(apiPathProperties.getUserCenter(), positionId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getPage(), page.getRows(), page.getParams());
     }
 
     @Override
     public List<PositionPO> listPositionPOByUserId(String userId) {
-        return null;
+        return positionUserRemoteService.listPositionPOByUserId(apiPathProperties.getUserCenter(), userId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<PositionPO> listPositionPOByUserIds(List<String> userIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(userIds);
+        return positionUserRemoteService.listPositionPOByUserIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<PositionSimpleDTO> listSimple(List<PositionPO> positionPOs) {
-        return null;
+        if (positionPOs == null || positionPOs.isEmpty()) {
+            return new ArrayList<>();
+        }
+        List<PositionSimpleDTO> positionSimpleDTOs = new ArrayList<>();
+        positionPOs.forEach(positionPO -> {
+            PositionSimpleDTO positionSimpleDTO = new PositionSimpleDTO();
+            positionSimpleDTO.setPositionId(positionPO.getPositionId());
+            positionSimpleDTO.setPositionParentId(positionPO.getPositionParentId());
+            positionSimpleDTO.setPositionName(positionPO.getPositionName());
+            positionSimpleDTO.setPositionCode(positionPO.getPositionCode());
+            positionSimpleDTOs.add(positionSimpleDTO);
+        });
+        return positionSimpleDTOs;
     }
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleServiceImpl.java

@@ -3,11 +3,14 @@ package ink.wgink.login.oauth2.client.service.role.impl;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.login.oauth2.client.remote.role.IRoleRemoteService;
 import ink.wgink.login.oauth2.client.service.role.IRoleService;
+import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.ZTreeDTO;
 import ink.wgink.pojo.dtos.role.RoleDTO;
 import ink.wgink.pojo.pos.RolePO;
+import ink.wgink.pojo.result.SuccessResultData;
 import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
 import ink.wgink.properties.ApiPathProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,46 +35,49 @@ public class RoleServiceImpl extends DefaultBaseService implements IRoleService
 
     @Override
     public RoleDTO get(Map<String, Object> params) {
-        return null;
+        return roleRemoteService.get(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public RoleDTO get(String roleId) {
-        return null;
+        return roleRemoteService.getByRoleId(apiPathProperties.getUserCenter(), roleId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<RoleDTO> list(Map<String, Object> params) {
-        return null;
+        return roleRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<RolePO> listPO(Map<String, Object> params) {
-        return null;
+        return roleRemoteService.listPO(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public List<RolePO> listPO(List<String> roleIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(roleIds);
+        return roleRemoteService.listPOByRoleIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<RoleDTO> listAll(Map<String, Object> params) {
-        return null;
+        return roleRemoteService.listAll(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<ZTreeDTO> listZTree(Map<String, Object> params) {
-        return null;
+        return roleRemoteService.listZTree(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public SuccessResultList<List<RoleDTO>> listPage(ListPage page) {
-        return null;
+        return roleRemoteService.listPage(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getPage(), page.getRows(), page.getParams());
     }
 
     @Override
     public Integer count(Map<String, Object> params) {
-        return null;
+        SuccessResultData<Integer> count = roleRemoteService.count(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
+        return count.getData();
     }
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleUserServiceImpl.java

@@ -3,15 +3,18 @@ package ink.wgink.login.oauth2.client.service.role.impl;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.login.oauth2.client.remote.role.IRoleUserRemoteService;
 import ink.wgink.login.oauth2.client.service.role.IRoleUserService;
+import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.role.RoleSimpleDTO;
 import ink.wgink.pojo.dtos.role.RoleUserDTO;
 import ink.wgink.pojo.pos.RolePO;
 import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.pojo.vos.IdsVO;
 import ink.wgink.properties.ApiPathProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,26 +34,41 @@ public class RoleUserServiceImpl extends DefaultBaseService implements IRoleUser
 
     @Override
     public List<String> listUserId(String roleId) {
-        return null;
+        return roleUserRemoteService.listUserIdByRoleId(apiPathProperties.getUserCenter(), roleId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<String> listUserId(List<String> roleIds) {
-        return null;
+        IdsVO idsVO = new IdsVO();
+        idsVO.setIds(roleIds);
+        return roleUserRemoteService.listUserIdByRoleIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public SuccessResultList<List<RoleUserDTO>> listPage(String roleId, ListPage page) {
-        return null;
+        return roleUserRemoteService.listPage(apiPathProperties.getUserCenter(), roleId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getPage(), page.getRows(), page.getParams());
     }
 
     @Override
     public List<RolePO> listRolePOByUserId(String userId) {
-        return null;
+        return roleUserRemoteService.listRolePOByUserId(apiPathProperties.getUserCenter(), userId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<RoleSimpleDTO> listSimple(List<RolePO> rolePOs) {
-        return null;
+        if (rolePOs == null || rolePOs.isEmpty()) {
+            return new ArrayList<>();
+        }
+        List<RoleSimpleDTO> roleSimpleDTOs = new ArrayList<>();
+        rolePOs.forEach(rolePO -> {
+            RoleSimpleDTO roleSimpleDTO = new RoleSimpleDTO();
+            roleSimpleDTO.setRoleId(rolePO.getRoleId());
+            roleSimpleDTO.setRoleParentId(rolePO.getRoleParentId());
+            roleSimpleDTO.setRoleName(rolePO.getRoleName());
+            roleSimpleDTO.setRoleCode(rolePO.getRoleCode());
+            roleSimpleDTO.setRoleDataRight(rolePO.getRoleDataRight());
+            roleSimpleDTOs.add(roleSimpleDTO);
+        });
+        return roleSimpleDTOs;
     }
 }

login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java

@@ -36,83 +36,83 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
 
     @Override
     public UserDTO get(String userId) {
-        return userRemoteService.get(apiPathProperties.getUserCenter(), userId, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        return userRemoteService.get(apiPathProperties.getUserCenter(), userId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public UserDTO getByUsername(String username) {
-        return userRemoteService.getByUsername(apiPathProperties.getUserCenter(), username, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        return userRemoteService.getByUsername(apiPathProperties.getUserCenter(), username, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override
     public List<UserDTO> listByUserIds(List<String> userIds) {
         IdsVO idsVO = new IdsVO();
         idsVO.setIds(userIds);
-        return userRemoteService.listByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken(), idsVO);
+        return userRemoteService.listByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<UserDTO> listByUsernames(List<String> usernames) {
         IdsVO idsVO = new IdsVO();
         idsVO.setIds(usernames);
-        return userRemoteService.listByUsernames(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken(), idsVO);
+        return userRemoteService.listByUsernames(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
     }
 
     @Override
     public List<UserDTO> list(Map<String, Object> params) {
-        return userRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken(), params);
+        return userRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
     @Override
     public SuccessResultList<List<UserDTO>> listPage(ListPage page) {
-        return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken(), page.getParams());
+        return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getParams());
     }
 
     @Override
     public SuccessResultList<List<UserDTO>> listPageByIds(List<String> userIds, ListPage page) {
         page.getParams().put("userIds", userIds);
-        return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken(), page.getParams());
+        return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getParams());
     }
 
     @Override
     public SuccessResultList<List<UserDTO>> listPageByExcludeIds(List<String> excludeUserIds, ListPage page) {
         page.getParams().put("excludeUserIds", excludeUserIds);
-        return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken(), page.getParams());
+        return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getParams());
     }
 
     @Override
     public int countDateRange(String startDate, String endDate) {
-        SuccessResultData<Integer> successResultData = userRemoteService.countDateRange(apiPathProperties.getUserCenter(), startDate, endDate, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        SuccessResultData<Integer> successResultData = userRemoteService.countDateRange(apiPathProperties.getUserCenter(), startDate, endDate, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
         return successResultData.getData();
     }
 
     @Override
     public int count() {
-        SuccessResultData<Integer> successResultData = userRemoteService.count(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        SuccessResultData<Integer> successResultData = userRemoteService.count(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
         return successResultData.getData();
     }
 
     @Override
     public int countType(int userType) {
-        SuccessResultData<Integer> successResultData = userRemoteService.countType(apiPathProperties.getUserCenter(), userType, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        SuccessResultData<Integer> successResultData = userRemoteService.countType(apiPathProperties.getUserCenter(), userType, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
         return successResultData.getData();
     }
 
     @Override
     public int countErrorType() {
-        SuccessResultData<Integer> successResultData = userRemoteService.countErrorType(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        SuccessResultData<Integer> successResultData = userRemoteService.countErrorType(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
         return successResultData.getData();
     }
 
     @Override
     public Integer countState(int userState) {
-        SuccessResultData<Integer> successResultData = userRemoteService.countState(apiPathProperties.getUserCenter(), userState, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        SuccessResultData<Integer> successResultData = userRemoteService.countState(apiPathProperties.getUserCenter(), userState, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
         return successResultData.getData();
     }
 
     @Override
     public SuccessResultData<String> getPasswordStatus(String userId) {
-        return userRemoteService.getPasswordStatus(apiPathProperties.getUserCenter(), userId, OAuth2ClientTokenManager.getInstance().getAccessToken().getAccessToken());
+        return userRemoteService.getPasswordStatus(apiPathProperties.getUserCenter(), userId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
     }
 
     @Override

login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/converter/UserAuthConverter.java

@@ -32,6 +32,7 @@ public class UserAuthConverter implements UserAuthenticationConverter {
     public Map<String, ?> convertUserAuthentication(Authentication authentication) {
         Map<String, Object> response = new LinkedHashMap<>();
         response.put("user_name", authentication.getName());
+        response.put("authorities", authentication.getAuthorities());
         // 删除token中的权限信息，通过客户端请求获取，减少accessToken长度
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         // 传递登录用户