From 4ad08d68032d3f8b5007eb21d6fe03b38bf8d951 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Mon, 13 Jan 2020 13:32:39 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.8.2=E7=A7=BB=E9=99=A4idworker,=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AFspringsecuriry+jwt=E9=AA=8C=E8=AF=81=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B,=E6=98=8E=E7=BB=86=E5=8F=AF=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/online.js           |   9 ++
 src/views/dashboard/YshopInfo.vue   |  22 ++---
 src/views/monitor/online/indext.vue | 128 ++++++++++++++++++++++++++++
 3 files changed, 148 insertions(+), 11 deletions(-)
 create mode 100644 src/views/monitor/online/indext.vue

diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
index 057275b..b39ee7f 100644
--- a/src/api/monitor/online.js
+++ b/src/api/monitor/online.js
@@ -7,3 +7,12 @@ export function del(keys) {
     data: keys
   })
 }
+
+export function delT(keys) {
+  return request({
+    url: 'auth/online/delete',
+    method: 'post',
+    data: keys
+  })
+}
+
diff --git a/src/views/dashboard/YshopInfo.vue b/src/views/dashboard/YshopInfo.vue
index 8e7609f..156d744 100644
--- a/src/views/dashboard/YshopInfo.vue
+++ b/src/views/dashboard/YshopInfo.vue
@@ -70,37 +70,37 @@
             <span style="font-weight: bolder">更新日志</span>
           </div>
           <div class="text item">
-            <span style="font-weight: bolder">（2020-01-11）yshop1.8.1版本 发布更新如下：</span>
+            <span style="font-weight: bolder">（2020-01-13）yshop1.8.2版本 发布更新如下：</span>
           </div>
           <div class="text item">
-            1.修复库存问题#I17Z5X
+            1.移除idworker
           </div>
           <div class="text item">
-            2.修复评价百分比精度问题#I17UQY
+            2.移动端springsecuriry+jwt验证改进
           </div>
           <div class="text item">
-            3.修复评价列表问题#I17TZC
+            3.新增注解可匿名访问
           </div>
           <div class="text item">
-            4.移动端图片上传修改为统一处理
+            4.jwt token redis储存
           </div>
           <div class="text item">
-            <span style="font-weight: bolder">（2020-01-10）yshop1.8版本 发布更新如下：</span>
+            5.后台新增移动端在线管理会员，后台可监控
           </div>
           <div class="text item">
-            1.新增小程序支付与登录,后台新增小程序跳转页面,
+            <span style="font-weight: bolder">（2020-01-11）yshop1.8.1版本 发布更新如下：</span>
           </div>
           <div class="text item">
-            2.后台新增图片素材管理
+            1.修复库存问题#I17Z5X
           </div>
           <div class="text item">
-            3.本地上传与七牛云上传合并，修改一个yml即可两者随意切换
+            2.修复评价百分比精度问题#I17UQY
           </div>
           <div class="text item">
-            4.升级swagger-bootstrap,swaager统一配置迁移到common(防止注解冲突)
+            3.修复评价列表问题#I17TZC
           </div>
           <div class="text item">
-            5.后台优化操作显示
+            4.移动端图片上传修改为统一处理
           </div>
         </el-card>
       </div>
diff --git a/src/views/monitor/online/indext.vue b/src/views/monitor/online/indext.vue
new file mode 100644
index 0000000..d7fd22c
--- /dev/null
+++ b/src/views/monitor/online/indext.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-input v-model="query.filter" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :loading="delLoading"
+          :disabled="crud.selections.length === 0"
+          @click="doDelete(crud.selections)"
+        >
+          强退
+        </el-button>
+      </crudOperation>
+    </div>
+    <!--表格渲染-->
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
+      <el-table-column v-if="columns.visible('nickName')" prop="nickName" label="用户昵称" />
+      <el-table-column v-if="columns.visible('ip')" prop="ip" label="登录IP" />
+      <el-table-column v-if="columns.visible('address')" :show-overflow-tooltip="true" prop="address" label="登录地点" />
+      <el-table-column v-if="columns.visible('browser')" prop="browser" label="浏览器" />
+      <el-table-column v-if="columns.visible('loginTime')" prop="loginTime" label="登录时间">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="100px" fixed="right">
+        <template slot-scope="scope">
+          <el-popover
+            :ref="scope.$index"
+            v-permission="['admin']"
+            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="delMethod(scope.row.key, scope.$index)">确定</el-button>
+            </div>
+            <el-button slot="reference" size="mini" type="text">强退</el-button>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+  </div>
+</template>
+
+<script>
+import { delT } from '@/api/monitor/online'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ url: 'auth/online', title: '在线用户' , query: {type : 1} })
+export default {
+  name: 'OnlineUser',
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), crud()],
+  data() {
+    return {
+      delLoading: false,
+      permission: {}
+    }
+  },
+  created() {
+    this.crud.msg.del = '强退成功！'
+    this.crud.optShow = {
+      add: false,
+      edit: false,
+      del: false,
+      download: true
+    }
+  },
+  methods: {
+    // 获取数据前设置好接口地址
+    beforeInit() {
+      this.url = 'auth/online'
+      return true
+    },
+    doDelete(datas) {
+      this.$confirm(`确认强退选中的${datas.length}个用户?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.delMethod(datas)
+      }).catch(() => {})
+    },
+    // 踢出用户
+    delMethod(key, index) {
+      const ids = []
+      if (key instanceof Array) {
+        key.forEach(val => {
+          ids.push(val.key)
+        })
+      } else ids.push(key)
+      this.delLoading = true
+      delT(ids).then(() => {
+        this.delLoading = false
+        if (this.$refs[index]) {
+          this.$refs[index].doClose()
+        }
+        this.crud.dleChangePage(1)
+        this.crud.delSuccessNotify()
+        this.crud.toQuery()
+      }).catch(() => {
+        this.delLoading = false
+        if (this.$refs[index]) {
+          this.$refs[index].doClose()
+        }
+      })
+    }
+  }
+}
+</script>