From 071a3bc598f607296cfe32b61a295689afe0c1dd Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sat, 30 Nov 2019 19:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=BC=93=E5=AD=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E9=81=BF=E5=85=8D=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9Credis=E5=B8=A6=E6=9D=A5=E7=9A=84=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=9A=90=E6=82=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/redis.js          |  37 ---------
 src/utils/request.js              |  60 +++++++--------
 src/views/monitor/redis/index.vue | 120 ------------------------------
 3 files changed, 30 insertions(+), 187 deletions(-)
 delete mode 100644 src/api/monitor/redis.js
 delete mode 100644 src/views/monitor/redis/index.vue

diff --git a/src/api/monitor/redis.js b/src/api/monitor/redis.js
deleted file mode 100644
index a85f037..0000000
--- a/src/api/monitor/redis.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/redis',
-    method: 'post',
-    data
-  })
-}
-
-export function del(key) {
-  const data = {
-    key
-  }
-  return request({
-    url: 'api/redis/',
-    method: 'delete',
-    data
-  })
-}
-
-export function delAll() {
-  return request({
-    url: 'api/redis/all',
-    method: 'delete'
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/redis',
-    method: 'put',
-    data
-  })
-}
-
-export default { del, delAll }
diff --git a/src/utils/request.js b/src/utils/request.js
index 84cd03b..f997d12 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -48,42 +48,42 @@ service.interceptors.response.use(
       if (error.toString().indexOf('Error: timeout') !== -1) {
         Notification.error({
           title: '网络请求超时',
-          duration: 2500
-        })
-        return Promise.reject(error)
-      }
-      if (error.toString().indexOf('Error: Network Error') !== -1) {
-        Notification.error({
-          title: '网络请求错误',
-          duration: 2500
+          duration: 5000
         })
         return Promise.reject(error)
       }
     }
-    if (code === 401) {
-      MessageBox.confirm(
-        '登录状态已过期，您可以继续留在该页面，或者重新登录',
-        '系统提示',
-        {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
+    if (code) {
+      if (code === 401) {
+        MessageBox.confirm(
+          '登录状态已过期，您可以继续留在该页面，或者重新登录',
+          '系统提示',
+          {
+            confirmButtonText: '重新登录',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          store.dispatch('LogOut').then(() => {
+            location.reload() // 为了重新实例化vue-router对象 避免bug
+          })
+        })
+      } else if (code === 403) {
+        router.push({ path: '/401' })
+      } else {
+        const errorMsg = error.response.data.message
+        if (errorMsg !== undefined) {
+          Notification.error({
+            title: errorMsg,
+            duration: 5000
+          })
         }
-      ).then(() => {
-        store.dispatch('LogOut').then(() => {
-          location.reload() // 为了重新实例化vue-router对象 避免bug
-        })
-      })
-    } else if (code === 403) {
-      router.push({ path: '/401' })
-    } else {
-      const errorMsg = error.response.data.message
-      if (errorMsg !== undefined) {
-        Notification.error({
-          title: errorMsg,
-          duration: 2500
-        })
       }
+    } else {
+      Notification.error({
+        title: '接口请求失败',
+        duration: 5000
+      })
     }
     return Promise.reject(error)
   }
diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue
deleted file mode 100644
index 017c837..0000000
--- a/src/views/monitor/redis/index.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.key" clearable size="small" placeholder="输入Key搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 清空缓存 -->
-      <el-button v-permission="['admin','redis:del']" :loading="deleteAllLoading" type="danger" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
-    </div>
-    <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column :show-overflow-tooltip="true" prop="key" label="KEY" />
-      <el-table-column prop="value" label="VALUE">
-        <template slot-scope="scope">
-          <div style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
-            {{ scope.row.value }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','redis:del'])" label="操作" width="130px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <el-popover
-            :ref="scope.$index"
-            v-permission="['admin','redis:del']"
-            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.$index, scope.row)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </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 crud from '@/mixins/crud'
-import crudRedis from '@/api/monitor/redis'
-export default {
-  name: 'Redis',
-  mixins: [crud],
-  data() {
-    return {
-      title: '系统缓存',
-      crudMethod: { ...crudRedis },
-      deleteAllLoading: false
-    }
-  },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-
-    beforeInit() {
-      this.url = 'api/redis'
-      if (!this.query.key) {
-        this.params['key'] = '*'
-      }
-      return true
-    },
-    delMethod(index, row) {
-      this.delLoading = true
-      this.crudMethod.del(row.key).then(res => {
-        this.delLoading = false
-        this.$refs[index].doClose()
-        this.dleChangePage()
-        this.init()
-        this.notify('删除成功', 'success')
-      }).catch(() => {
-        this.delLoading = false
-        this.$refs[index].doClose()
-      })
-    },
-    deleteAll() {
-      this.$confirm('你确定要清空缓存数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.deleteAllLoading = true
-        this.crudMethod.delAll().then(res => {
-          this.page = 0
-          this.init()
-          this.deleteAllLoading = false
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>