diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java index de5393d90..4d1f932fe 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java @@ -96,7 +96,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap @Bean public TokenEnhancer tokenEnhancer() { return (accessToken, authentication) -> { - final Map additionalInfo = new HashMap<>(4); + final Map additionalInfo = new HashMap<>(8); PigxUser pigxUser = (PigxUser) authentication.getUserAuthentication().getPrincipal(); additionalInfo.put("user_id", pigxUser.getId()); additionalInfo.put("dept_id", pigxUser.getDeptId()); diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index cc5d03f71..a0818d5e1 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -22,6 +22,7 @@ package com.pig4cloud.pigx.auth.endpoint; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.constant.PaginationConstants; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; @@ -79,20 +80,26 @@ public class PigxTokenEndpoint { * @param authHeader Authorization */ @DeleteMapping("/logout") - public R logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) { + public R logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) { if (StrUtil.isBlank(authHeader)) { - return new R<>(false, "退出失败，token 为空"); + return R.builder() + .code(CommonConstants.FAIL) + .data(Boolean.FALSE) + .msg("退出失败，token 为空").build(); } String tokenValue = authHeader.replace("Bearer", "").trim(); OAuth2AccessToken accessToken = tokenStore.readAccessToken(tokenValue); if (accessToken == null || StrUtil.isBlank(accessToken.getValue())) { - return new R<>(false, "退出失败，token 无效"); + return R.builder() + .code(CommonConstants.FAIL) + .data(Boolean.FALSE) + .msg("退出失败，token 无效").build(); } OAuth2Authentication auth2Authentication = tokenStore.readAuthentication(accessToken); cacheManager.getCache("user_details") - .evict(auth2Authentication.getName()); + .evict(auth2Authentication.getName()); tokenStore.removeAccessToken(accessToken); return new R<>(Boolean.TRUE); } @@ -101,14 +108,10 @@ public class PigxTokenEndpoint { * 令牌管理调用 * * @param token token - * @param from 内部调用标志 * @return */ @DeleteMapping("/{token}") - public R delToken(@PathVariable("token") String token, @RequestHeader(required = false) String from) { - if (StrUtil.isBlank(from)) { - return null; - } + public R delToken(@PathVariable("token") String token) { return new R<>(redisTemplate.delete(PIGX_OAUTH_ACCESS + token)); } diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 75fa28f3d..9f43c2c22 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -40,12 +40,6 @@ pigx-common-core 2.0.0 - - - com.pig4cloud - pigx-common-cache - 2.0.0 - org.springframework.cloud diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java index 3351cd8bf..e85e1798b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java @@ -47,9 +47,8 @@ public interface RemoteTokenService { * 删除token * * @param token token - * @param from 调用标志 * @return */ @DeleteMapping("/token/{token}") - R removeTokenById(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from); + R removeTokenById(@PathVariable("token") String token); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java index 1704621e6..39263ca18 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java @@ -54,11 +54,10 @@ public class RemoteTokenServiceFallbackImpl implements RemoteTokenService { * 删除token * * @param token - * @param from * @return */ @Override - public R removeTokenById(String token, String from) { + public R removeTokenById(String token) { log.error("删除token 失败 {}", token, cause); return null; } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index b52dcf5bb..c2bca98e1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -62,12 +62,12 @@ public class MenuController { // 获取符合条件的菜单 Set all = new HashSet<>(); SecurityUtils.getRoles() - .forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId))); + .forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId))); List menuTreeList = all.stream() - .filter(menuVo -> CommonConstants.MENU.equals(menuVo.getType())) - .map(MenuTree::new) - .sorted(Comparator.comparingInt(MenuTree::getSort)) - .collect(Collectors.toList()); + .filter(menuVo -> CommonConstants.MENU.equals(menuVo.getType())) + .map(MenuTree::new) + .sorted(Comparator.comparingInt(MenuTree::getSort)) + .collect(Collectors.toList()); return new R<>(TreeUtil.bulid(menuTreeList, -1)); } @@ -90,9 +90,9 @@ public class MenuController { @GetMapping("/tree/{roleId}") public List getRoleTree(@PathVariable Integer roleId) { return sysMenuService.findMenuByRoleId(roleId) - .stream() - .map(MenuVO::getMenuId) - .collect(Collectors.toList()); + .stream() + .map(MenuVO::getMenuId) + .collect(Collectors.toList()); } /** @@ -128,7 +128,7 @@ public class MenuController { @SysLog("删除菜单") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_menu_del')") - public R removeById(@PathVariable SysMenu id) { + public R removeById(@PathVariable Integer id) { return sysMenuService.removeMenuById(id); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java index 6c19b0b7e..42a60381f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java @@ -61,6 +61,6 @@ public class TokenController { @DeleteMapping("/{token}") @PreAuthorize("@pms.hasPermission('sys_token_del')") public R removeById(@PathVariable String token) { - return remoteTokenService.removeTokenById(token, SecurityConstants.FROM_IN); + return remoteTokenService.removeTokenById(token); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java index 8d4673145..747049dca 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java @@ -50,7 +50,7 @@ public interface SysMenuService extends IService { * @param id 菜单ID * @return 成功、失败 */ - R removeMenuById(SysMenu id); + R removeMenuById(Integer id); /** * 更新菜单信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index c70bd4464..fb4ec98c3 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -60,7 +60,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) @CacheEvict(value = "menu_details", allEntries = true) - public R removeMenuById(SysMenu id) { + public R removeMenuById(Integer id) { // 查询父节点为当前节点的节点 List menuList = this.list(Wrappers.query() .lambda().eq(SysMenu::getParentId, id)); diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml index 7394d89ef..3a1c36426 100644 --- a/pigx-visual/pigx-activiti/pom.xml +++ b/pigx-visual/pigx-activiti/pom.xml @@ -43,6 +43,12 @@ pigx-common-core 2.0.0 + + + com.pig4cloud + pigx-common-cache + 2.0.0 + com.pig4cloud pigx-upms-api diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index ff7537063..4931c6fc6 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -26,6 +26,12 @@ mybatis-plus-boot-starter ${mybatis-plus.version} + + + com.pig4cloud + pigx-common-cache + 2.0.0 + mysql mysql-connector-java diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml index 8a2644420..e697168b2 100644 --- a/pigx-visual/pigx-daemon/pom.xml +++ b/pigx-visual/pigx-daemon/pom.xml @@ -48,6 +48,12 @@ pigx-common-swagger 2.0.0 + + + com.pig4cloud + pigx-common-cache + 2.0.0 + com.baomidou