From f9b24bded4642802020ac809d2ccd85957051492 Mon Sep 17 00:00:00 2001
From: zegezy <1098696801@qq.com>
Date: Sat, 1 Apr 2023 21:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/magic-api/api/系统管理/在线用户/列表.ms |  7 ++++---
 data/magic-api/api/系统管理/在线用户/踢人.ms | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/data/magic-api/api/系统管理/在线用户/列表.ms b/data/magic-api/api/系统管理/在线用户/列表.ms
index 24e06df..786ac7f 100644
--- a/data/magic-api/api/系统管理/在线用户/列表.ms
+++ b/data/magic-api/api/系统管理/在线用户/列表.ms
@@ -5,7 +5,7 @@
   "groupId" : "d95a58e77d314370862ffc4cdfdb8283",
   "name" : "列表",
   "createTime" : null,
-  "updateTime" : 1652170512725,
+  "updateTime" : 1680332611352,
   "lock" : null,
   "createBy" : null,
   "updateBy" : null,
@@ -116,13 +116,14 @@
       "children" : [ ]
     } ]
   }
-}
-================================
+}
+================================
 import cn.dev33.satoken.stp.StpUtil
 var tokens = StpUtil.searchTokenValue("", -1, 0).map(it => it.replace('token:login:token:', ''))
 
 return db.page("""
     select 
+        su.id,
         su.username,
         so.name office_name,
         sll.address,
diff --git a/data/magic-api/api/系统管理/在线用户/踢人.ms b/data/magic-api/api/系统管理/在线用户/踢人.ms
index 8e5570c..b5b295a 100644
--- a/data/magic-api/api/系统管理/在线用户/踢人.ms
+++ b/data/magic-api/api/系统管理/在线用户/踢人.ms
@@ -5,7 +5,7 @@
   "groupId" : "d95a58e77d314370862ffc4cdfdb8283",
   "name" : "踢人",
   "createTime" : null,
-  "updateTime" : 1652170543213,
+  "updateTime" : 1680332529466,
   "lock" : null,
   "createBy" : null,
   "updateBy" : null,
@@ -32,7 +32,9 @@
   "description" : null,
   "requestBodyDefinition" : null,
   "responseBodyDefinition" : null
-}
-================================
+}
+================================
 import cn.dev33.satoken.stp.StpUtil
-return StpUtil.logoutByTokenValue(token);
\ No newline at end of file
+// 先踢下线
+StpUtil.logoutByTokenValue(StpUtil.getTokenValueByLoginId(id)) 
+return StpUtil.disable(id, time.asLong());
\ No newline at end of file