From 166d5ec55fa9fb4294d55babf6b5068505679101 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 7 Mar 2020 10:19:04 +0800
Subject: [PATCH] 修改个人信息，密码后redis中登录信息不会过期问题

---
 ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java | 8 ++++----
 ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java         | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
index 1bdb667..021e9a5 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
@@ -51,16 +51,16 @@ public class SysPermissionService
      */
     public Set<String> getMenuPermission(SysUser user)
     {
-        Set<String> roles = new HashSet<String>();
+        Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限
         if (user.isAdmin())
         {
-            roles.add("*:*:*");
+            perms.add("*:*:*");
         }
         else
         {
-            roles.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
         }
-        return roles;
+        return perms;
     }
 }
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index 3ecbc00..7637ed8 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -77,8 +77,7 @@ public class TokenService
     {
         if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
         {
-            String userKey = getTokenKey(loginUser.getToken());
-            redisCache.setCacheObject(userKey, loginUser);
+            refreshToken(loginUser);
         }
     }
 
--
libgit2 0.21.4