From bb493d43b53404776d6c2cf43b7e10168f43056f Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Thu, 28 Dec 2017 10:19:49 +0800
Subject: [PATCH] =?UTF-8?q?RetResult=E7=9A=84attach=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E7=94=B1Map<String,=20String>=20=E6=94=B9=E6=88=90=20Map<Strin?=
 =?UTF-8?q?g,=20Serializable>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/service/RetResult.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/org/redkale/service/RetResult.java b/src/org/redkale/service/RetResult.java
index c9c381bd7..d1c52e5f5 100644
--- a/src/org/redkale/service/RetResult.java
+++ b/src/org/redkale/service/RetResult.java
@@ -5,6 +5,7 @@
  */
 package org.redkale.service;
 
+import java.io.Serializable;
 import java.util.*;
 import org.redkale.convert.json.*;
 
@@ -29,7 +30,7 @@ public class RetResult<T> {
 
     protected T result;
 
-    protected Map<String, String> attach;
+    protected Map<String, Serializable> attach;
 
     public RetResult() {
     }
@@ -109,7 +110,7 @@ public class RetResult<T> {
      *
      * @return RetResult
      */
-    public RetResult<T> attach(Map<String, String> attach) {
+    public RetResult<T> attach(Map<String, Serializable> attach) {
         this.attach = attach;
         return this;
     }
@@ -118,14 +119,13 @@ public class RetResult<T> {
      * attach添加元素
      *
      * @param key   String
-     * @param value String
+     * @param value Serializable
      *
      * @return RetResult
      */
-    public RetResult<T> attach(String key, Object value) {
+    public RetResult<T> attach(String key, Serializable value) {
         if (this.attach == null) this.attach = new HashMap<>();
-        boolean canstr = value != null && (value instanceof CharSequence || value.getClass().isPrimitive());
-        this.attach.put(key, value == null ? null : (canstr ? String.valueOf(value) : JsonConvert.root().convertTo(value)));
+        this.attach.put(key, value);
         return this;
     }
 
@@ -183,7 +183,7 @@ public class RetResult<T> {
      *
      * @return 结果附件
      */
-    public Map<String, String> getAttach() {
+    public Map<String, Serializable> getAttach() {
         return attach;
     }
 
@@ -192,7 +192,7 @@ public class RetResult<T> {
      *
      * @param attach Map
      */
-    public void setAttach(Map<String, String> attach) {
+    public void setAttach(Map<String, Serializable> attach) {
         this.attach = attach;
     }