From 2fcf0bb6441657cb51dfe02226d81789f8eaa6f3 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Sun, 23 Apr 2017 21:03:08 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/RestHttpServlet.java |  4 +++-
 src/org/redkale/net/http/RestOutput.java      | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/org/redkale/net/http/RestHttpServlet.java b/src/org/redkale/net/http/RestHttpServlet.java
index 128f2cb29..5bb239b54 100644
--- a/src/org/redkale/net/http/RestHttpServlet.java
+++ b/src/org/redkale/net/http/RestHttpServlet.java
@@ -47,11 +47,13 @@ public abstract class RestHttpServlet<T> extends HttpBaseServlet {
         if (output.getContentType() != null) response.setContentType(output.getContentType());
         response.addHeader(output.getHeaders());
         response.addCookie(output.getCookies());
-
+        response.setStatus(output.getStatus() < 1 ? 200 : output.getStatus());
         if (output.getResult() instanceof File) {
             response.finish((File) output.getResult());
         } else if (output.getResult() instanceof String) {
             response.finish((String) output.getResult());
+        } else if (output.getResult() == null) {
+            response.finish(output.getMessage());
         } else {
             response.finishJson(output.getResult());
         }
diff --git a/src/org/redkale/net/http/RestOutput.java b/src/org/redkale/net/http/RestOutput.java
index a9f39635b..8855c8c40 100644
--- a/src/org/redkale/net/http/RestOutput.java
+++ b/src/org/redkale/net/http/RestOutput.java
@@ -27,6 +27,10 @@ public class RestOutput<T> {
 
     private T result;
 
+    private int status = 0; //不设置则为 200
+
+    private String message;
+
     public RestOutput() {
     }
 
@@ -78,4 +82,20 @@ public class RestOutput<T> {
         this.result = result;
     }
 
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
 }