From 9034da66411c0f40c2890d22e9c98a75696f5789 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 27 Feb 2021 12:55:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20API=20=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/infra/apiAccessLog.js        | 35 -----------
 .../src/views/infra/apiAccessLog/index.vue    | 63 +++++++++++++------
 .../src/views/system/operatelog/index.vue     | 11 +---
 .../logger/InfApiAccessLogController.java     |  9 ---
 .../apiaccesslog/InfApiAccessLogBaseVO.java   |  2 +-
 .../apiaccesslog/InfApiAccessLogExcelVO.java  |  2 +-
 .../logger/InfApiAccessLogService.java        |  8 ---
 .../impl/InfApiAccessLogServiceImpl.java      |  5 --
 8 files changed, 50 insertions(+), 85 deletions(-)

diff --git a/ruoyi-ui/src/api/infra/apiAccessLog.js b/ruoyi-ui/src/api/infra/apiAccessLog.js
index 5d1249a1e..6456a5085 100644
--- a/ruoyi-ui/src/api/infra/apiAccessLog.js
+++ b/ruoyi-ui/src/api/infra/apiAccessLog.js
@@ -1,40 +1,5 @@
 import request from '@/utils/request'
 
-// 创建API 访问日志
-export function createApiAccessLog(data) {
-  return request({
-    url: '/infra/api-access-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新API 访问日志
-export function updateApiAccessLog(data) {
-  return request({
-    url: '/infra/api-access-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-
-// 删除API 访问日志
-export function deleteApiAccessLog(id) {
-  return request({
-    url: '/infra/api-access-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得API 访问日志
-export function getApiAccessLog(id) {
-  return request({
-    url: '/infra/api-access-log/get?id=' + id,
-    method: 'get'
-  })
-}
-
 // 获得API 访问日志分页
 export function getApiAccessLogPage(query) {
   return request({
diff --git a/ruoyi-ui/src/views/infra/apiAccessLog/index.vue b/ruoyi-ui/src/views/infra/apiAccessLog/index.vue
index ee7819f3c..04c61fe86 100644
--- a/ruoyi-ui/src/views/infra/apiAccessLog/index.vue
+++ b/ruoyi-ui/src/views/infra/apiAccessLog/index.vue
@@ -18,7 +18,7 @@
       <el-form-item label="请求地址" prop="requestUrl">
         <el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable size="small" @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="开始请求时间">
+      <el-form-item label="请求时间">
         <el-date-picker v-model="dateRangeBeginTime" size="small" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
@@ -45,8 +45,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="日志主键" align="center" prop="id" />
-      <el-table-column label="链路追踪编号" align="center" prop="traceId" />
+      <el-table-column label="日志编号" align="center" prop="id" />
       <el-table-column label="用户编号" align="center" prop="userId" />
       <el-table-column label="用户类型" align="center" prop="userType">
         <template slot-scope="scope">
@@ -55,31 +54,26 @@
       </el-table-column>>
       <el-table-column label="应用名" align="center" prop="applicationName" />
       <el-table-column label="请求方法名" align="center" prop="requestMethod" />
-      <el-table-column label="请求地址" align="center" prop="requestUrl" />
-      <el-table-column label="Java 方法的参数" align="center" prop="requestParams" />
-      <el-table-column label="用户 IP" align="center" prop="userIp" />
-      <el-table-column label="浏览器 UA" align="center" prop="userAgent" />
-      <el-table-column label="开始请求时间" align="center" prop="beginTime" width="180">
+      <el-table-column label="请求地址" align="center" prop="requestUrl" width="250" />
+      <el-table-column label="请求时间" align="center" prop="beginTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.beginTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束请求时间" align="center" prop="endTime" width="180">
+      <el-table-column label="执行时长" align="center" prop="startTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ scope.row.duration }}  ms</span>
         </template>
       </el-table-column>
-      <el-table-column label="执行时长" align="center" prop="duration" />
-      <el-table-column label="结果码" align="center" prop="resultCode" />
-      <el-table-column label="结果提示" align="center" prop="resultMsg" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="操作结果" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ scope.row.resultCode === 0 ? '成功' : '失败(' + scope.row.resultMsg + ')' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row,scope.index)"
+                     v-hasPermi="['infra:api-access-log:query']">详细</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -87,11 +81,39 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
 
+    <!-- 操作日志详细 -->
+    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="日志主键：">{{ form.id }}</el-form-item>
+            <el-form-item label="链路追踪：">{{ form.traceId }}</el-form-item>
+            <el-form-item label="链路追踪：">{{ form.applicationName }}</el-form-item>
+            <el-form-item label="用户信息：">
+              {{ form.userId }} | {{ getDictDataLabel(DICT_TYPE.USER_TYPE, form.userType) }} | {{ form.userIp }} | {{ form.userAgent}}
+            </el-form-item>
+            <el-form-item label="请求信息：">{{ form.requestMethod }} | {{ form.requestUrl }} </el-form-item>
+            <el-form-item label="请求参数：">{{ form.requestParams }}</el-form-item>
+            <el-form-item label="开始时间：">
+              {{ parseTime(form.beginTime) }} ~ {{ parseTime(form.endTime) }} | {{ form.duration }} ms
+            </el-form-item>
+            <el-form-item label="操作结果：">
+              <div v-if="form.resultCode === 0">正常</div>
+              <div v-else-if="form.resultCode > 0">失败 | {{ form.resultCode }} || {{ form.resultMsg}}</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { getApiAccessLog, getApiAccessLogPage, exportApiAccessLogExcel } from "@/api/infra/apiAccessLog";
+import { getApiAccessLogPage, exportApiAccessLogExcel } from "@/api/infra/apiAccessLog";
 
 export default {
   name: "ApiAccessLog",
@@ -181,6 +203,11 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    /** 详细按钮操作 */
+    handleView(row) {
+      this.open = true;
+      this.form = row;
+    },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
diff --git a/ruoyi-ui/src/views/system/operatelog/index.vue b/ruoyi-ui/src/views/system/operatelog/index.vue
index 1f1bc1571..0ba07c6c8 100644
--- a/ruoyi-ui/src/views/system/operatelog/index.vue
+++ b/ruoyi-ui/src/views/system/operatelog/index.vue
@@ -115,13 +115,8 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
-            v-hasPermi="['system:operate-log:query']"
-          >详细</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row,scope.index)"
+                     v-hasPermi="['system:operate-log:query']">详细</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -135,7 +130,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog title="访问日志详细" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="24">
diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java b/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java
index b3f0f78bc..4a40424d7 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java
@@ -39,15 +39,6 @@ public class InfApiAccessLogController {
     @Resource
     private InfApiAccessLogService apiAccessLogService;
 
-    @GetMapping("/get")
-    @ApiOperation("获得API 访问日志")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('infra:api-access-log:query')")
-    public CommonResult<InfApiAccessLogRespVO> getApiAccessLog(@RequestParam("id") Long id) {
-        InfApiAccessLogDO apiAccessLog = apiAccessLogService.getApiAccessLog(id);
-        return success(InfApiAccessLogConvert.INSTANCE.convert(apiAccessLog));
-    }
-
     @GetMapping("/page")
     @ApiOperation("获得API 访问日志分页")
     @PreAuthorize("@ss.hasPermission('infra:api-access-log:query')")
diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java b/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java
index ecfa69d3f..04dbf39ce 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java
@@ -40,7 +40,7 @@ public class InfApiAccessLogBaseVO {
     @NotNull(message = "请求地址不能为空")
     private String requestUrl;
 
-    @ApiModelProperty(value = "Java 方法的参数")
+    @ApiModelProperty(value = "请求参数")
     private String requestParams;
 
     @ApiModelProperty(value = "用户 IP", required = true, example = "127.0.0.1")
diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java b/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java
index 96fe3571b..9d2f4b1c6 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java
@@ -39,7 +39,7 @@ public class InfApiAccessLogExcelVO {
     @ExcelProperty("请求地址")
     private String requestUrl;
 
-    @ExcelProperty("Java 方法的参数")
+    @ExcelProperty("请求参数")
     private String requestParams;
 
     @ExcelProperty("用户 IP")
diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java b/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java
index ba9aafbee..c04e69cb9 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java
@@ -15,14 +15,6 @@ import java.util.List;
  */
 public interface InfApiAccessLogService extends ApiAccessLogFrameworkService {
 
-    /**
-     * 获得 API 访问日志
-     *
-     * @param id 编号
-     * @return API 访问日志
-     */
-    InfApiAccessLogDO getApiAccessLog(Long id);
-
     /**
      * 获得 API 访问日志分页
      *
diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java b/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java
index 9698eb536..4200bdcfc 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java
@@ -36,11 +36,6 @@ public class InfApiAccessLogServiceImpl implements InfApiAccessLogService {
         apiAccessLogMapper.insert(apiAccessLog);
     }
 
-    @Override
-    public InfApiAccessLogDO getApiAccessLog(Long id) {
-        return apiAccessLogMapper.selectById(id);
-    }
-
     @Override
     public PageResult<InfApiAccessLogDO> getApiAccessLogPage(InfApiAccessLogPageReqVO pageReqVO) {
         return apiAccessLogMapper.selectPage(pageReqVO);