From bb273b7db0d55a1bbefb32a571000681466c2f77 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 3 Jun 2020 16:26:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B8=85=E7=90=86=E9=83=A8=E5=88=86=E5=BA=9F?= =?UTF-8?q?=E5=BC=83=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/MybatisGovAccessFeignClient.java | 15 ----- .../MybatisGovAccessFeignClientFallback.java | 10 --- .../epmet/controller/AccessController.java | 63 ------------------- .../java/com/epmet/service/AccessService.java | 16 ----- .../epmet/service/impl/AccessServiceImpl.java | 48 -------------- .../com/epmet/feign/GovAccessFeignClient.java | 38 ----------- .../GovAccessFeignClientFallback.java | 33 ---------- 7 files changed, 223 deletions(-) diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java index a7dc3a05f9..2b712ff301 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java @@ -20,21 +20,6 @@ import java.util.Set; @FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = MybatisGovAccessFeignClientFallback.class) public interface MybatisGovAccessFeignClient { - /** - * 查询角色的操作key对应操作范围列表 - * @param operationScopeFormDTO - * @return - */ - @PostMapping("/gov/access/access/operationscopes") - Result> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO); - - /** - * 查询角色所有operation及其范围(缓存) - * @return - */ - @PostMapping("/gov/access/access/roleallopesandscopes/{roleId}") - Result> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId); - /** * 查询sql过滤片段 * @param form diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java index a14452346a..97f64e9d95 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java @@ -21,16 +21,6 @@ import java.util.Set; @Component public class MybatisGovAccessFeignClientFallback implements MybatisGovAccessFeignClient { - @Override - public Result> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getOperationScopesByRoleId", operationScopeFormDTO); - } - - @Override - public Result> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId){ - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listRoleAllOperationScopesByRoleId", roleId); - } - @Override public Result getSqlFilterSegment(GetSQLFilterFormDTO form) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getSqlFilterSegment", form); diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java index 487c854dd9..dad8f7e095 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java @@ -3,12 +3,10 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; -import com.epmet.dto.result.RoleOpeScopeResultDTO; import com.epmet.service.AccessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; import java.util.Set; /** @@ -24,67 +22,6 @@ public class AccessController { @Autowired private AccessService accessService; - /** - * 更新工作人员权限缓存(前端查询权限时候gov-mine会调用此处) - * @param staffPermCacheFormDTO - * @return - */ - @PostMapping("updatepermissioncache") - public Result updatePermissionCache(@RequestBody StaffPermCacheFormDTO staffPermCacheFormDTO) { - ValidatorUtils.validateEntity(staffPermCacheFormDTO, StaffPermCacheFormDTO.UpdatePermissionCache.class); - String staffId = staffPermCacheFormDTO.getStaffId(); - String app = staffPermCacheFormDTO.getApp(); - String client = staffPermCacheFormDTO.getClient(); - Set permissions = staffPermCacheFormDTO.getPermissions(); - Set roleIdList = staffPermCacheFormDTO.getRoleIdList(); - String orgId = staffPermCacheFormDTO.getOrgIdPath(); - String gridId = staffPermCacheFormDTO.getGridId(); - accessService.updatePermissionCache(staffId, app, client, permissions, roleIdList, orgId, gridId); - return new Result(); - } - - ///** - // * 从缓存中查询用户信息(DataFilterAspect中用到) - // * @return - // */ - //@PostMapping("loginuserinfo") - //public Result getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) { - // ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class); - // GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId()); - // LoginUserInfoResultDTO resultDTO = null; - // if (govTokenDto != null) { - // resultDTO = new LoginUserInfoResultDTO(); - // resultDTO.setRoleIdList(govTokenDto.getRoleIdList()); - // //resultDTO.setGridId(govTokenDto.getGridId()); - // resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath()); - // resultDTO.setGridIdList(govTokenDto.getGridIdList()); - // resultDTO.setDeptIdList(govTokenDto.getDeptIdList()); - // resultDTO.setUserId(govTokenDto.getUserId()); - // } - // return new Result().ok(resultDTO); - //} - - /** - * 查询角色的操作key对应操作范围列表(缓存) - * @return - */ - @PostMapping("operationscopes") - public Result> getOperationScopesByRoleId(@RequestBody OperationScopeFormDTO operationScopeFormDTO) { - ValidatorUtils.validateEntity(operationScopeFormDTO, OperationScopeFormDTO.ListOperationScopeGroup.class); - Set scopes = accessService.listOperationScopesByRoleId(operationScopeFormDTO.getRoleId(), operationScopeFormDTO.getOperationKey()); - return new Result>().ok(scopes); - } - - /** - * 查询角色所有operation及其范围(缓存) - * @return - */ - @PostMapping("roleallopesandscopes/{roleId}") - public Result> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId) { - List scopes = accessService.listAllRoleOperationScopesByRoleId(roleId); - return new Result>().ok(scopes); - } - /** * 用户是否具有指定功能权限 * @return diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java index de151c9eed..7b365fa21b 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java @@ -1,21 +1,13 @@ package com.epmet.service; -import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.dto.form.GetSQLFilterFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.RoleOpeScopeResultDTO; import java.util.List; -import java.util.Map; import java.util.Set; public interface AccessService { - /** - * 更新权限缓存 - * @param staffId - * @param permissions - */ - void updatePermissionCache(String staffId, String app, String client, Set permissions, Set roleIdList, String orgIdPath, String gridId); /** * 查询登陆用户登陆信息 @@ -23,14 +15,6 @@ public interface AccessService { */ LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId); - /** - * 查询角色的操作key对应操作范围列表 - * @param roleId - * @param operationKey - * @return - */ - Set listOperationScopesByRoleId(String roleId, String operationKey); - /** * 查询角色所有operation及其范围(缓存) * @param roleId diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java index ea8397e386..3b3707d27e 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java @@ -4,9 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.epmet.bean.OpeScopeFilterResultBean; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.Result; @@ -65,57 +63,11 @@ public class AccessServiceImpl implements AccessService { public static final String ORG_RELATION_SUP = "sup"; public static final String ORG_PATH_SEPARATOR = ":"; - /** - * 更新权限缓存 - * @param staffId - * @param permissions - */ - @Override - public void updatePermissionCache(String staffId, String app, String client, Set permissions, Set roleIdList, - String orgIdPath, String gridId) { - GovTokenDto govTokenDto = cpUserDetailRedis.get(app, client, staffId, GovTokenDto.class); - if (govTokenDto == null) { - logger.warn("更新[{}]用户缓存:Redis中不存在该用户TokenDto缓存信息", staffId); - return ; - } - // 将权限，角色列表，和当前组织ID存入TokenDto - govTokenDto.setPermissions(permissions); - govTokenDto.setRoleIdList(roleIdList); - govTokenDto.setOrgIdPath(orgIdPath); - govTokenDto.setGridId(gridId); - - // 将新的TokenDto更新到redis中 - long expire = cpUserDetailRedis.getExpire(app, client, staffId); - cpUserDetailRedis.set(govTokenDto, expire); - logger.warn("更新[{}]用户缓存成功。", staffId); - } - @Override public LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId) { return cpUserDetailRedis.get(app, client, staffId, LoginUserDetailsResultDTO.class); } - /** - * 查询角色的操作key对应操作范围列表 - * @param roleId - * @param operationKey - * @return - */ - public Set listOperationScopesByRoleId(String roleId, String operationKey) { - Set roleOpeScopes = roleOpeScopeRedis.getRoleOpeScopes(roleId, operationKey); - if (roleOpeScopes != null) { - return roleOpeScopes; - } - Set scopes = operationScopeDao.listOperationScopesByRoleId(roleId, operationKey); - try { - roleOpeScopeRedis.setRoleOpeScopes(roleId, operationKey, scopes); - } catch (Exception e) { - String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); - logger.error("GovAccess:查询角色的操作范围:缓存范围出错:{}", errorStackTrace); - } - return scopes; - } - @Override public List listAllRoleOperationScopesByRoleId(String roleId) { List roleAllOpeScopes = roleOpeScopeRedis.getRoleAllOpeScopes(roleId); diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java index d3ea928230..fadab52ce9 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -2,19 +2,12 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.OperationScopeDTO; import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.dto.form.OperationScopeFormDTO; -import com.epmet.dto.form.StaffPermCacheFormDTO; -import com.epmet.dto.result.RoleOpeScopeResultDTO; -import com.epmet.dto.result.RoleOperationResultDTO; import com.epmet.feign.fallback.GovAccessFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import java.util.List; import java.util.Set; /** @@ -25,37 +18,6 @@ import java.util.Set; @FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallback.class) public interface GovAccessFeignClient { - /** - * 根据角色ID查询角色权限列表 - * @param roleId - * @return - */ - @PostMapping("/gov/access/role/operations/{roleId}") - Result> listOperationsByRoleId(@PathVariable("roleId") String roleId); - - /** - * 刷新用户权限缓存 - * @param staffPermCacheFormDTO - * @return - */ - @PostMapping("/gov/access/access/updatepermissioncache") - Result updatePermissionCache(@RequestBody StaffPermCacheFormDTO staffPermCacheFormDTO); - - /** - * 查询角色的操作key对应操作范围列表 - * @param operationScopeFormDTO - * @return - */ - @PostMapping("/gov/access/access/operationscopes") - Result> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO); - - /** - * 查询角色所有operation及其范围(缓存) - * @return - */ - @PostMapping("/gov/access/access/roleallopesandscopes/{roleId}") - Result> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId); - /** * 列出觉得的功能权限列表 * @return diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallback.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallback.java index 36ed3ae74f..1f9b0aaa2e 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallback.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallback.java @@ -3,17 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.OperationScopeDTO; import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.dto.form.OperationScopeFormDTO; -import com.epmet.dto.form.StaffPermCacheFormDTO; -import com.epmet.dto.result.RoleOpeScopeResultDTO; -import com.epmet.dto.result.RoleOperationResultDTO; import com.epmet.feign.GovAccessFeignClient; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; import java.util.Set; /** @@ -23,31 +15,6 @@ import java.util.Set; @Component public class GovAccessFeignClientFallback implements GovAccessFeignClient { - @Override - public Result> listOperationsByRoleId(String roleId) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationsByRoleId"); - } - - /** - * 刷新用户权限缓存 - * @param staffPermCacheFormDTO - * @return - */ - @Override - public Result updatePermissionCache(@RequestBody StaffPermCacheFormDTO staffPermCacheFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "updatePermissionCache"); - } - - @Override - public Result> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getOperationScopesByRoleId", operationScopeFormDTO); - } - - @Override - public Result> listRoleAllOperationScopesByRoleId(String roleId) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listRoleAllOperationScopesByRoleId", roleId); - } - @Override public Result> listOperationPermissions(ListOpePermsFormDTO listOpePermsFormDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationPermissions", listOpePermsFormDTO);