From 37e0482c72886474318b68241672a74bfbc049c2 Mon Sep 17 00:00:00 2001
From: suwings <suwings@outlook.com>
Date: Thu, 26 Apr 2018 19:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20-=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper/Permission.js         | 10 ++++++++++
 public/template/userset.html |  7 +++++--
 route/websocket/user.js      |  9 +++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/helper/Permission.js b/helper/Permission.js
index 8f1c7b7f..16ef26c5 100644
--- a/helper/Permission.js
+++ b/helper/Permission.js
@@ -94,4 +94,14 @@ module.exports.isCanServer = (userName, serverName) => {
         }
     }
     return false;
+}
+
+module.exports.isOnline = (username) => {
+    let onlineusers = MCSERVER.onlineUser;
+    for (let k in onlineusers) {
+        if (k === username) {
+            return true;
+        }
+    }
+    return false;
 }
\ No newline at end of file
diff --git a/public/template/userset.html b/public/template/userset.html
index 64ef08a4..e95eb623 100644
--- a/public/template/userset.html
+++ b/public/template/userset.html
@@ -27,8 +27,11 @@
 										<span v-text="item.username"></span>
 									</h4>
 									<div>
-										创建时间:
-										<span v-text="item.data.createDate"> </span> | 最后上线:
+										<span v-if="item.data.online" class="color-green">正在线上</span>
+										<span v-if="!item.data.online" class="color-red">离线</span>
+										| 创建时间:
+										<span v-text="item.data.createDate"> </span>
+										| 最后上线:
 										<span v-text="item.data.lastDate"> </span>
 									</div>
 								</div>
diff --git a/route/websocket/user.js b/route/websocket/user.js
index 6cd44054..7ebbfbbe 100644
--- a/route/websocket/user.js
+++ b/route/websocket/user.js
@@ -13,7 +13,16 @@ const os = require("os");
 WebSocketObserver().listener('userset/update', (data) => {
     if (!permssion.isMaster(data.WsSession)) return;
 
+    //添加是否在线
     let userNameList = userCenter().getUserList();
+    for (let k in userNameList) {
+        let userdata = userNameList[k];
+        if (permssion.isOnline(userdata.username))
+            userdata.data.online = true;
+        else
+            userdata.data.online = false;
+    }
+
     response.wsSend(data.ws, 'userset/update', {
         items: userNameList
     });