diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index 4ca306d70..564d9b6f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -1,9 +1,7 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -42,39 +40,56 @@ public class SysUserOnlineController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(String ipaddr, String userName)
     {
-        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
+        // 一次性取出 在线用户
+        Map<String, Object> maps = redisCache.getCacheMap(Constants.LOGIN_TOKEN_KEY_ONLINE);
+        List<String> delList=new ArrayList<>();
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        for (String key : keys)
-        {
-            LoginUser user = redisCache.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+        Iterator<Map.Entry<String, Object>> it = maps.entrySet().iterator();
+        while(it.hasNext()){
+            Map.Entry<String, Object> entry = it.next();
+            LoginUser user=(LoginUser) entry.getValue();
+            boolean removed = true;
+            if (user.getExpireTime()<=System.currentTimeMillis()){
+                it.remove();
+                removed=false;
+                delList.add(entry.getKey());
+            }
+            if (removed){
+                if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
                 {
-                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+                    if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+                    {
+                        userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+                    }
+                }
+                else if (StringUtils.isNotEmpty(ipaddr))
+                {
+                    if (StringUtils.equals(ipaddr, user.getIpaddr()))
+                    {
+                        userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+                    }
+                }
+                else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+                {
+                    if (StringUtils.equals(userName, user.getUsername()))
+                    {
+                        userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+                    }
+                }
+                else
+                {
+                    userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
                 }
             }
-            else if (StringUtils.isNotEmpty(ipaddr))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                }
-            }
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
-            {
-                if (StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-                }
-            }
-            else
-            {
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
-            }
-        }
+
+        };
+
         Collections.reverse(userOnlineList);
         userOnlineList.removeAll(Collections.singleton(null));
+        if (!delList.isEmpty()){
+            String[] delTokens=new String[delList.size()];
+            redisCache.delCacheMapKey(Constants.LOGIN_TOKEN_KEY_ONLINE,delList.toArray(delTokens));
+        }
         return getDataTable(userOnlineList);
     }
 
@@ -86,7 +101,10 @@ public class SysUserOnlineController extends BaseController
     @DeleteMapping("/{tokenId}")
     public AjaxResult forceLogout(@PathVariable String tokenId)
     {
-        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+        redisCache.deleteObject(tokenId);
+        redisCache.delCacheMapKey(Constants.LOGIN_TOKEN_KEY_ONLINE , tokenId);
         return AjaxResult.success();
     }
+
+
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index 188f0b7c7..8afa8e4bb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -61,6 +61,12 @@ public class Constants
      * 登录用户 redis key
      */
     public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+
+    /**
+     * 登录当前在线 用户 redis key
+     */
+    public static final String LOGIN_TOKEN_KEY_ONLINE = "login_tokens_onlie:";
     
     /**
      * 防重提交 redis key
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
index 1f91350ab..31eefeedc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Component;
 
 /**
@@ -23,6 +25,7 @@ public class RedisCache
     @Autowired
     public RedisTemplate redisTemplate;
 
+
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
@@ -47,6 +50,8 @@ public class RedisCache
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
 
+
+
     /**
      * 设置有效时间
      *
@@ -189,6 +194,20 @@ public class RedisCache
         redisTemplate.opsForHash().put(key, hKey, value);
     }
 
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key 缓存的键值
+     * @param value 缓存的值
+     * @param timeout 时间
+     * @param timeUnit 时间颗粒度
+     */
+    public boolean  delCacheMapKey(final String key,final String... token)
+    {
+        return redisTemplate.opsForHash().delete(key,token)>=1;
+    }
+
     /**
      * 获取Hash中的数据
      *
@@ -224,4 +243,9 @@ public class RedisCache
     {
         return redisTemplate.keys(pattern);
     }
+
+
+
+
+
 }