From 6200fa74a7f3783fe8c837cd10a1270531dbbc96 Mon Sep 17 00:00:00 2001
From: Heiky <hongtaoguo0214@sina.com>
Date: Wed, 9 Dec 2020 17:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/logging/domain/Logging.java       | 45 ++++++++++---------
 .../controller/SysLoggingController.java      | 15 ++++++-
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/pear-common/src/main/java/com/pearadmin/common/plugins/logging/domain/Logging.java b/pear-common/src/main/java/com/pearadmin/common/plugins/logging/domain/Logging.java
index e8344a5a..55585c81 100644
--- a/pear-common/src/main/java/com/pearadmin/common/plugins/logging/domain/Logging.java
+++ b/pear-common/src/main/java/com/pearadmin/common/plugins/logging/domain/Logging.java
@@ -1,11 +1,13 @@
 package com.pearadmin.common.plugins.logging.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pearadmin.common.plugins.logging.enums.BusinessType;
 import com.pearadmin.common.plugins.logging.enums.LoggingType;
 import com.pearadmin.common.plugins.logging.enums.RequestMethod;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +16,7 @@ import java.util.Map;
  * Describe: 日 志 实 体 类
  * Author: 就 眠 仪 式
  * CreateTime: 2019/10/23
- * */
+ */
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -22,96 +24,97 @@ public class Logging {
 
     /**
      * 编号
-     * */
+     */
     private String id;
 
     /**
      * 标题
-     * */
+     */
     private String title;
 
     /**
      * 描述
-     * */
+     */
     private String description;
 
     /**
      * 业务类型
-     * */
+     */
     private BusinessType businessType;
 
     /**
      * 请求方式
-     * */
+     */
     private RequestMethod requestMethod;
 
     /**
      * 请求的方法
-     * */
+     */
     private String method;
 
     /**
      * 请求的连接
-     * */
+     */
     private String operateUrl;
 
     /**
      * 用户 IP 地址
-     * */
+     */
     private String operateAddress;
 
     /**
      * 请 求 参 数
-     * */
+     */
     private String requestParam;
 
     /**
      * 获 取 请 求 体
-     * */
+     */
     private String requestBody;
 
     /**
      * 接 口 响 应 数 据
-     * */
+     */
     private String responseBody;
 
     /**
      * 接 口 执 行 状 态
-     * */
+     */
     private boolean success;
 
     /**
      * 日 志 类 型
-     * */
+     */
     private LoggingType loggingType;
 
     /**
      * 异 常 信 息
-     * */
+     */
     private String errorMsg;
 
     /**
      * 使用浏览器
-     * */
+     */
     private String Browser;
 
     /**
      * 操作系统
-     * */
+     */
     private String systemOs;
 
     /**
      * 操 作 时 间
-     * */
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
      * 操 作 人 员 名 称
-     * */
+     */
     private String operateName;
 
     /**
      * 扩 展 信 息
-     * */
-    private Map<String,String> map = new HashMap<>();
+     */
+    private Map<String, String> map = new HashMap<>();
 }
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java
index b16be0cd..4d07c21a 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java
@@ -1,6 +1,8 @@
 package com.pearadmin.system.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.pearadmin.common.plugins.logging.domain.Logging;
@@ -9,6 +11,7 @@ import com.pearadmin.common.plugins.logging.service.LoggingService;
 import com.pearadmin.common.web.base.BaseController;
 import com.pearadmin.common.web.domain.request.PageDomain;
 import com.pearadmin.common.web.domain.response.ResultTable;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +31,10 @@ import java.util.Map;
 @RequestMapping("system/logging")
 public class SysLoggingController extends BaseController {
 
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
     /**
      * 引 入 日 志 组 件  的 日 志 服 务
      */
@@ -72,9 +79,13 @@ public class SysLoggingController extends BaseController {
     }
 
     @GetMapping("/details")
-    public ModelAndView details(String id) {
+    public ModelAndView details(String id){
         Map<String, Object> params = new HashMap<>();
-        params.put("loggingDetails", JSON.toJSONString(loggingService.getById(id)));
+        try {
+            params.put("loggingDetails", objectMapper.writeValueAsString(loggingService.getById(id)));
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
         return JumpPage("system/logging/logging-details", params);
     }
 }
-- 
Gitee