From 9a76de809260285429286527cf4250f50e1dba40 Mon Sep 17 00:00:00 2001 From: OPGame <1242479791@qq.com> Date: Mon, 23 Sep 2019 20:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=BC=93=E5=AD=98=EF=BC=8C=E8=AF=A5=E7=BC=93=E5=AD=98=E5=91=BD?= =?UTF-8?q?=E4=B8=AD=E7=8E=87=E4=B8=8D=E9=AB=98=EF=BC=8C=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=B1=E4=BA=8E=E7=94=B1=E4=BA=8E=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=BC=95=E8=B5=B7=E5=AF=86=E7=A0=81=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../YamiSysUserDetailsServiceImpl.java | 9 +------- .../api/security/YamiUserServiceImpl.java | 9 +------- .../controller/SysLoginController.java | 4 ---- .../shop/security/util/YamiTokenServices.java | 22 +++++++++---------- .../sys/controller/SysUserController.java | 4 ---- .../yami/shop/sys/service/SysUserService.java | 12 +++------- .../sys/service/impl/SysUserServiceImpl.java | 12 ++-------- 7 files changed, 18 insertions(+), 54 deletions(-) diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java index 5ec9556..1de2137 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java @@ -60,14 +60,7 @@ public class YamiSysUserDetailsServiceImpl implements YamiUserDetailsService { @Override @SneakyThrows public YamiSysUser loadUserByUsername(String username) { - YamiSysUser userDetails = cacheManagerUtil.getCache("yami_sys_user", username); - if (userDetails != null) { - return userDetails; - } - - userDetails = getUserDetails(username); - cacheManagerUtil.putCache("yami_sys_user",username, userDetails); - return userDetails; + return getUserDetails(username); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java index 029d44e..a690039 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java @@ -75,22 +75,15 @@ public class YamiUserServiceImpl implements YamiUserDetailsService { String cacheKey = app.value() + StrUtil.COLON + bizUserId; - YamiUser yamiUser = cacheManagerUtil.getCache("yami_user", cacheKey); - if (yamiUser != null) { - return yamiUser; - } - - User user = userMapper.getUserByBizUserId(app.value(), bizUserId); if (user == null) { throw new UsernameNotFoundExceptionBase("无法获取用户信息"); } String name = StrUtil.isBlank(user.getRealName()) ? user.getNickName() : user.getRealName(); - yamiUser = new YamiUser(user.getUserId(), bizUserId, app.value(), user.getStatus() == 1); + YamiUser yamiUser = new YamiUser(user.getUserId(), bizUserId, app.value(), user.getStatus() == 1); yamiUser.setName(name); yamiUser.setPic(user.getPic()); - cacheManagerUtil.putCache("yami_sys_user",cacheKey, yamiUser); return yamiUser; } diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java b/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java index 15103d5..2ae577d 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java @@ -63,10 +63,6 @@ public class SysLoginController { */ @PostMapping(value = "/sys/logout") public ResponseEntity logout() { - Cache cache = cacheManager.getCache("yami_sys_user"); - if (cache != null) { - cache.evict(SecurityUtils.getSysUser().getUsername()); - } SecurityContextHolder.clearContext(); return ResponseEntity.ok().build(); } diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java b/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java index 4224bd9..0be5b59 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java @@ -87,17 +87,17 @@ public class YamiTokenServices implements AuthorizationServerTokenServices, Reso OAuth2AccessToken existingAccessToken = tokenStore.getAccessToken(authentication); OAuth2RefreshToken refreshToken = null; // 如果有token，直接删除，更新token，避免出现缓存问题 - if (existingAccessToken != null) { - if (existingAccessToken.getRefreshToken() != null) { - refreshToken = existingAccessToken.getRefreshToken(); - // The token store could remove the refresh token when the - // access token is removed, but we want to - // be sure... - tokenStore.removeRefreshToken(refreshToken); - } - tokenStore.removeAccessToken(existingAccessToken); - - } +// if (existingAccessToken != null) { +// if (existingAccessToken.getRefreshToken() != null) { +// refreshToken = existingAccessToken.getRefreshToken(); +// // The token store could remove the refresh token when the +// // access token is removed, but we want to +// // be sure... +// tokenStore.removeRefreshToken(refreshToken); +// } +// tokenStore.removeAccessToken(existingAccessToken); +// +// } // Only create a new refresh token if there wasn't an existing one // associated with an expired access token. diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java index 8f0fa07..8385198 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java @@ -185,10 +185,6 @@ public class SysUserController { return ResponseEntity.badRequest().body("当前用户不能删除"); } sysUserService.deleteBatch(userIds,SecurityUtils.getSysUser().getShopId()); - // 删除缓存 - for (Long userId : userIds) { - sysUserService.evictSysUserById(userId); - } return ResponseEntity.ok().build(); } diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java index c4fead7..1b1b267 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java @@ -19,7 +19,7 @@ import com.yami.shop.sys.model.SysUser; * @author lgh */ public interface SysUserService extends IService { - + /** * 修改密码 * @param userId 用户ID @@ -32,8 +32,8 @@ public interface SysUserService extends IService { * @param user */ void saveUserAndUserRole(SysUser user); - - + + /** * 更新用户与用户角色关系 * @param user @@ -60,10 +60,4 @@ public interface SysUserService extends IService { */ SysUser getSysUserById(Long userId); - /** - * 根据用户id删除用户缓存信息 - * @param userId - * @return - */ - void evictSysUserById(Long userId); } diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java index b691358..69d9c05 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java @@ -35,7 +35,7 @@ import java.util.Date; public class SysUserServiceImpl extends ServiceImpl implements SysUserService { private SysUserRoleMapper sysUserRoleMapper; - + private SysUserMapper sysUserMapper; @Override @@ -52,11 +52,10 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) - @CacheEvict(cacheNames="sys_user",key="#user.userId") public void updateUserAndUserRole(SysUser user) { // 更新用户 sysUserMapper.updateById(user); - + //先删除用户与角色关系 sysUserRoleMapper.deleteByUserId(user.getUserId()); @@ -86,14 +85,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - @Cacheable(cacheNames="sys_user",key="#userId") public SysUser getSysUserById(Long userId) { return sysUserMapper.selectById(userId); } - - @Override - @CacheEvict(cacheNames="sys_user",key="#userId") - public void evictSysUserById(Long userId) { - - } }