From f5fb1872bd3c5c84f0eea22627f804720ff88b1b Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sat, 26 Oct 2019 23:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=A8=E7=BA=BF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=B3=A8?=
 =?UTF-8?q?=E9=94=80=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD=EF=BC=8Ctoken?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=8Eredis=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js                   |  7 +++
 src/api/online.js                  |  8 +++
 src/store/modules/user.js          | 14 +++--
 src/views/monitor/log/errorLog.vue | 32 ++++++++++-
 src/views/monitor/log/index.vue    | 32 ++++++++++-
 src/views/monitor/online/index.vue | 88 ++++++++++++++++++++++++++++++
 src/views/system/user/center.vue   |  1 +
 src/views/system/user/index.vue    |  5 --
 8 files changed, 171 insertions(+), 16 deletions(-)
 create mode 100644 src/api/online.js
 create mode 100644 src/views/monitor/online/index.vue

diff --git a/src/api/login.js b/src/api/login.js
index 41920b7..fe257d2 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -26,3 +26,10 @@ export function getCodeImg() {
     method: 'get'
   })
 }
+
+export function logout() {
+  return request({
+    url: 'auth/logout',
+    method: 'delete'
+  })
+}
diff --git a/src/api/online.js b/src/api/online.js
new file mode 100644
index 0000000..fc9a90c
--- /dev/null
+++ b/src/api/online.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function del(key) {
+  return request({
+    url: 'auth/online/' + key,
+    method: 'delete'
+  })
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1a3881b..26fde35 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, getInfo } from '@/api/login'
+import { login, getInfo, logout } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { decrypt } from '@/utils/rsaEncrypt'
 
@@ -63,10 +63,14 @@ const user = {
     // 登出
     LogOut({ commit }) {
       return new Promise((resolve, reject) => {
-        commit('SET_TOKEN', '')
-        commit('SET_ROLES', [])
-        removeToken()
-        resolve()
+        logout().then(res => {
+          commit('SET_TOKEN', '')
+          commit('SET_ROLES', [])
+          removeToken()
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
       })
     },
 
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index e32bdab..7189d7c 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -3,12 +3,23 @@
     <Search :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" inline class="demo-table-expand">
+            <el-form-item label="请求方法">
+              <span>{{ props.row.method }}</span>
+            </el-form-item>
+            <el-form-item label="请求参数">
+              <span>{{ props.row.params }}</span>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
       <el-table-column prop="username" label="用户名"/>
       <el-table-column prop="requestIp" label="IP"/>
       <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
       <el-table-column prop="description" label="描述"/>
-      <el-table-column :show-overflow-tooltip="true" prop="method" label="方法名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="params" label="参数"/>
+      <el-table-column prop="browser" label="浏览器"/>
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -76,6 +87,21 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
+  .demo-table-expand {
+    font-size: 0;
+  }
+  .demo-table-expand label {
+    width: 70px;
+    color: #99a9bf;
+  }
+  .demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+    width: 100%;
+  }
+  .demo-table-expand .el-form-item__content {
+    font-size: 12px;
 
+  }
 </style>
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index f265300..95ab90e 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -3,12 +3,23 @@
     <Search :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" inline class="demo-table-expand">
+            <el-form-item label="请求方法">
+              <span>{{ props.row.method }}</span>
+            </el-form-item>
+            <el-form-item label="请求参数">
+              <span>{{ props.row.params }}</span>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
       <el-table-column prop="username" label="用户名"/>
       <el-table-column prop="requestIp" label="IP"/>
       <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
       <el-table-column prop="description" label="描述"/>
-      <el-table-column :show-overflow-tooltip="true" prop="method" label="方法名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="params" label="参数"/>
+      <el-table-column prop="browser" label="浏览器"/>
       <el-table-column prop="time" label="请求耗时" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
@@ -61,6 +72,21 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
+  .demo-table-expand {
+    font-size: 0;
+  }
+  .demo-table-expand label {
+    width: 70px;
+    color: #99a9bf;
+  }
+  .demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+    width: 100%;
+  }
+  .demo-table-expand .el-form-item__content {
+    font-size: 12px;
 
+  }
 </style>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
new file mode 100644
index 0000000..2d1d48c
--- /dev/null
+++ b/src/views/monitor/online/index.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="app-container">
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="userName" label="用户名"/>
+      <el-table-column prop="job" label="岗位"/>
+      <el-table-column prop="ip" label="登录IP"/>
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="登录地点"/>
+      <el-table-column prop="browser" label="浏览器"/>
+      <el-table-column prop="loginTime" label="登录时间">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="操作" width="100px">
+        <template slot-scope="scope">
+          <el-popover
+            v-permission="['ADMIN']"
+            :ref="scope.$index"
+            placement="top"
+            width="180">
+            <p>确定踢出该用户吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.$index, scope.row.key)">确定</el-button>
+            </div>
+            <el-button slot="reference" size="mini" type="text">踢出</el-button>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"/>
+  </div>
+</template>
+
+<script>
+import initData from '@/mixins/initData'
+import { parseTime } from '@/utils/index'
+import { del } from '@/api/online'
+export default {
+  name: 'OnlineUser',
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    beforeInit() {
+      this.url = 'auth/online'
+      this.params = { page: this.page, size: this.size }
+      if (this.query.value) { this.params['filter'] = this.query.value }
+      return true
+    },
+    subDelete(index, key) {
+      this.delLoading = true
+      del(key).then(res => {
+        this.delLoading = false
+        this.$refs[index].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '踢出成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[index].doClose()
+        console.log(err.response.data.message)
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 355b088..5f69ea3 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -46,6 +46,7 @@
               <el-table-column prop="description" label="行为"/>
               <el-table-column prop="requestIp" label="IP"/>
               <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
+              <el-table-column prop="browser" label="浏览器"/>
               <el-table-column prop="time" label="请求耗时" align="center">
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e36ca4e..460486d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -61,11 +61,6 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" label="更新日期">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.updateTime) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column v-if="checkPermission(['ADMIN','USER_ALL','USER_EDIT','USER_DELETE'])" label="操作" width="125" align="center" fixed="right">
             <template slot-scope="scope">
               <el-button v-permission="['ADMIN','USER_ALL','USER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>