From 38953c5157992c6ca7adffc525b0697876307c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E4=B9=98=E9=A3=8E?= <1794748404@qq.com>
Date: Wed, 15 May 2024 22:33:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=A4=B4=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/log/operationLog.js           |   6 ++
 src/views/log/operation-log/index.vue | 140 +++++++++++++++++++++-----
 2 files changed, 121 insertions(+), 25 deletions(-)

diff --git a/src/api/log/operationLog.js b/src/api/log/operationLog.js
index 3680fae..c27bf30 100644
--- a/src/api/log/operationLog.js
+++ b/src/api/log/operationLog.js
@@ -18,3 +18,9 @@ export function batchDeleteOperationLogByIds(data) {
   })
 }
 
+export function CleanOperationLog() {
+  return request({
+    url: '/api/log/operation/clean',
+    method: 'delete'
+  })
+}
diff --git a/src/views/log/operation-log/index.vue b/src/views/log/operation-log/index.vue
index 47c18b8..0e45a94 100644
--- a/src/views/log/operation-log/index.vue
+++ b/src/views/log/operation-log/index.vue
@@ -3,33 +3,87 @@
     <el-card class="container-card" shadow="always">
       <el-form size="mini" :inline="true" :model="params" class="demo-form-inline">
         <el-form-item label="请求人">
-          <el-input v-model.trim="params.username" clearable placeholder="请求人" @keyup.enter.native="search" @clear="search" />
+          <el-input
+            v-model.trim="params.username"
+            clearable
+            placeholder="请求人"
+            @keyup.enter.native="search"
+            @clear="search"
+          />
         </el-form-item>
         <el-form-item label="IP地址">
           <el-input v-model.trim="params.ip" clearable placeholder="IP地址" @keyup.enter.native="search" @clear="search" />
         </el-form-item>
         <el-form-item label="请求路径">
-          <el-input v-model.trim="params.path" clearable placeholder="请求路径" @keyup.enter.native="search" @clear="search" />
+          <el-input
+            v-model.trim="params.path"
+            clearable
+            placeholder="请求路径"
+            @keyup.enter.native="search"
+            @clear="search"
+          />
         </el-form-item>
+        <!-- <el-form-item label="请求方式">
+          <el-input v-model.trim="params.method" clearable placeholder="请求方式" @keyup.enter.native="search"
+            @clear="search" />
+        </el-form-item> -->
+        <el-form-item prop="method" label="请求方式">
+          <el-select v-model="params.method" placeholder="请选择请求状态" clearable @change="search" @clear="search">
+            <el-option v-for="item in RequestList" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="请求状态">
-          <el-input v-model.trim="params.status" clearable placeholder="请求状态" @keyup.enter.native="search" @clear="search" />
+          <el-input
+            v-model.trim="params.status"
+            clearable
+            placeholder="请求状态"
+            @keyup.enter.native="search"
+            @clear="search"
+          />
         </el-form-item>
         <el-form-item>
           <el-button :loading="loading" icon="el-icon-search" type="primary" @click="search">查询</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button :disabled="multipleSelection.length === 0" :loading="loading" icon="el-icon-delete" type="danger" @click="batchDelete">批量删除</el-button>
+          <el-button
+            :disabled="multipleSelection.length === 0"
+            :loading="loading"
+            icon="el-icon-delete"
+            type="danger"
+            @click="batchDelete"
+          >批量删除</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleClean">清空日志</el-button>
         </el-form-item>
       </el-form>
 
-      <el-table v-loading="loading" :data="tableData" border stripe style="width: 100%" @selection-change="handleSelectionChange">
+      <el-table
+        v-loading="loading"
+        :data="tableData"
+        border
+        stripe
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column show-overflow-tooltip sortable prop="username" label="请求人" />
         <el-table-column show-overflow-tooltip sortable prop="ip" label="IP地址" />
         <el-table-column show-overflow-tooltip sortable prop="path" label="请求路径" />
+        <el-table-column show-overflow-tooltip sortable prop="method" label="请求方式" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.method === 'GET'" type="success">GET</el-tag>
+            <el-tag v-else-if="scope.row.method === 'POST'" type="warning">POST</el-tag>
+            <el-tag v-else-if="scope.row.method === 'PUT'" type="primary">PUT</el-tag>
+            <el-tag v-else-if="scope.row.method === 'DELETE'" type="danger">DELETE</el-tag>
+            <el-tag v-else type="info">{{ scope.row.method }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip sortable prop="status" label="请求状态" align="center">
           <template slot-scope="scope">
-            <el-tag size="small" :type="scope.row.status | statusTagFilter" disable-transitions>{{ scope.row.status }}</el-tag>
+            <el-tag size="small" :type="scope.row.status | statusTagFilter" disable-transitions>{{ scope.row.status
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip sortable prop="startTime" label="发起时间">
@@ -39,7 +93,8 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip sortable prop="timeCost" label="请求耗时(ms)" align="center">
           <template slot-scope="scope">
-            <el-tag size="small" :type="scope.row.timeCost | timeCostTagFilter" disable-transitions>{{ scope.row.timeCost }}</el-tag>
+            <el-tag size="small" :type="scope.row.timeCost | timeCostTagFilter" disable-transitions>{{ scope.row.timeCost
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip sortable prop="desc" label="说明" />
@@ -70,7 +125,7 @@
 </template>
 
 <script>
-import { getOperationLogs, batchDeleteOperationLogByIds } from '@/api/log/operationLog'
+import { getOperationLogs, batchDeleteOperationLogByIds, CleanOperationLog } from '@/api/log/operationLog'
 import { parseGoTime } from '@/utils/index'
 import { Message } from 'element-ui'
 
@@ -123,7 +178,20 @@ export default {
       // 删除按钮弹出框
       popoverVisible: false,
       // 表格多选
-      multipleSelection: []
+      multipleSelection: [],
+      RequestList: [{
+        value: 'GET',
+        label: 'GET'
+      }, {
+        value: 'POST',
+        label: 'POST'
+      }, {
+        value: 'DELETE',
+        label: 'DELETE'
+      }, {
+        value: 'PUT',
+        label: 'PUT'
+      }]
     }
   },
   created() {
@@ -150,14 +218,36 @@ export default {
     },
 
     // 判断结果
-    judgeResult(res){
-      if (res.code==0){
-          Message({
-            showClose: true,
-            message: "操作成功",
-            type: 'success'
-          })
+    judgeResult(res) {
+      if (res.code === 0) {
+        Message({
+          showClose: true,
+          message: '操作成功',
+          type: 'success'
+        })
+      }
+    },
+    // 清空日志
+    handleClean() {
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async res => {
+        this.loading = true
+        try {
+          await CleanOperationLog()
+        } finally {
+          this.loading = false
         }
+        this.getTableData()
+      }).catch(() => {
+        Message({
+          showClose: true,
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
 
     // 批量删除
@@ -173,7 +263,7 @@ export default {
           operationLogIds.push(x.ID)
         })
         try {
-          await batchDeleteOperationLogByIds({ operationLogIds: operationLogIds }).then(res =>{
+          await batchDeleteOperationLogByIds({ operationLogIds: operationLogIds }).then(res => {
             this.judgeResult(res)
           })
         } finally {
@@ -198,7 +288,7 @@ export default {
     async singleDelete(Id) {
       this.loading = true
       try {
-        await batchDeleteOperationLogByIds({ operationLogIds: [Id] }).then(res =>{
+        await batchDeleteOperationLogByIds({ operationLogIds: [Id] }).then(res => {
           this.judgeResult(res)
         })
       } finally {
@@ -221,12 +311,12 @@ export default {
 </script>
 
 <style scoped>
-  .container-card{
-    margin: 10px;
-    margin-bottom: 100px;
-  }
+.container-card {
+  margin: 10px;
+  margin-bottom: 100px;
+}
 
-  .delete-popover{
-    margin-left: 10px;
-  }
+.delete-popover {
+  margin-left: 10px;
+}
 </style>

From a3c55c1b61f0b67c5cc32db494cad89fc4e4e0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E4=B9=98=E9=A3=8E?= <1794748404@qq.com>
Date: Wed, 15 May 2024 22:39:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


From 49ac4b55774ae7674b2917563c02a485ab4a2a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E4=B9=98=E9=A3=8E?= <1794748404@qq.com>
Date: Wed, 15 May 2024 22:42:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


From 3c591fcbc075ca6fab9f683bc68718a9d3c2ae94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E4=B9=98=E9=A3=8E?= <1794748404@qq.com>
Date: Fri, 17 May 2024 18:13:39 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/log/operation-log/index.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/log/operation-log/index.vue b/src/views/log/operation-log/index.vue
index 0e45a94..49ea810 100644
--- a/src/views/log/operation-log/index.vue
+++ b/src/views/log/operation-log/index.vue
@@ -23,10 +23,6 @@
             @clear="search"
           />
         </el-form-item>
-        <!-- <el-form-item label="请求方式">
-          <el-input v-model.trim="params.method" clearable placeholder="请求方式" @keyup.enter.native="search"
-            @clear="search" />
-        </el-form-item> -->
         <el-form-item prop="method" label="请求方式">
           <el-select v-model="params.method" placeholder="请选择请求状态" clearable @change="search" @clear="search">
             <el-option v-for="item in RequestList" :key="item.value" :label="item.label" :value="item.value" />
@@ -236,7 +232,9 @@ export default {
       }).then(async res => {
         this.loading = true
         try {
-          await CleanOperationLog()
+          await CleanOperationLog().then(res => {
+            this.judgeResult(res)
+          })
         } finally {
           this.loading = false
         }