From bc182f1392c1899bf66f308d3587455ef1034b2e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 四月 2021 11:52:21 +0800
Subject: [PATCH] fix 日志时间问题

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
index 28e5a68..a7d2297 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -1,15 +1,17 @@
 package com.ruoyi.common.core.domain;
 
+import cn.hutool.core.lang.Validator;
+import cn.hutool.http.HttpStatus;
+import lombok.Data;
+
 import java.util.HashMap;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 鎿嶄綔娑堟伅鎻愰啋
  * 
  * @author ruoyi
  */
-public class AjaxResult extends HashMap<String, Object>
+public class AjaxResult<T> extends HashMap<String, Object>
 {
     private static final long serialVersionUID = 1L;
 
@@ -21,6 +23,17 @@
 
     /** 鏁版嵁瀵硅薄 */
     public static final String DATA_TAG = "data";
+
+    public Integer getCode(){
+        return (Integer) super.get(CODE_TAG);
+    }
+
+    public String getMsg(){
+        return (String) super.get(MSG_TAG);
+    }
+    public T getData(){
+        return (T) super.get(DATA_TAG);
+    }
 
     /**
      * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄锛屼娇鍏惰〃绀轰竴涓┖娑堟伅銆�
@@ -48,11 +61,11 @@
      * @param msg 杩斿洖鍐呭
      * @param data 鏁版嵁瀵硅薄
      */
-    public AjaxResult(int code, String msg, Object data)
+    public AjaxResult(int code, String msg, T data)
     {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
-        if (StringUtils.isNotNull(data))
+        if (Validator.isNotNull(data))
         {
             super.put(DATA_TAG, data);
         }
@@ -63,7 +76,7 @@
      * 
      * @return 鎴愬姛娑堟伅
      */
-    public static AjaxResult success()
+    public static AjaxResult<Void> success()
     {
         return AjaxResult.success("鎿嶄綔鎴愬姛");
     }
@@ -73,7 +86,7 @@
      * 
      * @return 鎴愬姛娑堟伅
      */
-    public static AjaxResult success(Object data)
+    public static <T> AjaxResult<T> success(T data)
     {
         return AjaxResult.success("鎿嶄綔鎴愬姛", data);
     }
@@ -84,7 +97,7 @@
      * @param msg 杩斿洖鍐呭
      * @return 鎴愬姛娑堟伅
      */
-    public static AjaxResult success(String msg)
+    public static AjaxResult<Void> success(String msg)
     {
         return AjaxResult.success(msg, null);
     }
@@ -96,9 +109,9 @@
      * @param data 鏁版嵁瀵硅薄
      * @return 鎴愬姛娑堟伅
      */
-    public static AjaxResult success(String msg, Object data)
+    public static <T> AjaxResult<T> success(String msg, T data)
     {
-        return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+        return new AjaxResult(HttpStatus.HTTP_OK, msg, data);
     }
 
     /**
@@ -106,7 +119,7 @@
      * 
      * @return
      */
-    public static AjaxResult error()
+    public static AjaxResult<Void> error()
     {
         return AjaxResult.error("鎿嶄綔澶辫触");
     }
@@ -117,7 +130,7 @@
      * @param msg 杩斿洖鍐呭
      * @return 璀﹀憡娑堟伅
      */
-    public static AjaxResult error(String msg)
+    public static AjaxResult<Void> error(String msg)
     {
         return AjaxResult.error(msg, null);
     }
@@ -129,9 +142,9 @@
      * @param data 鏁版嵁瀵硅薄
      * @return 璀﹀憡娑堟伅
      */
-    public static AjaxResult error(String msg, Object data)
+    public static <T> AjaxResult<T> error(String msg, T data)
     {
-        return new AjaxResult(HttpStatus.ERROR, msg, data);
+        return new AjaxResult(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
     }
 
     /**
@@ -141,7 +154,7 @@
      * @param msg 杩斿洖鍐呭
      * @return 璀﹀憡娑堟伅
      */
-    public static AjaxResult error(int code, String msg)
+    public static AjaxResult<Void> error(int code, String msg)
     {
         return new AjaxResult(code, msg, null);
     }

--
Gitblit v1.9.3