From 13f2fbf7d6bbf768c9e8c33adbd86bfbc8c9b6bc Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Fri, 17 Mar 2017 20:18:18 +0800
Subject: [PATCH]

---
 src/org/redkale/boot/ApiDocs.java             |  6 +++---
 .../redkale/net/http/DefaultRestServlet.java  |  4 ++--
 src/org/redkale/net/http/HttpBaseServlet.java | 21 ++-----------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/org/redkale/boot/ApiDocs.java b/src/org/redkale/boot/ApiDocs.java
index 425c76e02..af69dfa68 100644
--- a/src/org/redkale/boot/ApiDocs.java
+++ b/src/org/redkale/boot/ApiDocs.java
@@ -16,7 +16,7 @@ import org.redkale.util.*;
 
 /**
  * API接口文档生成类，作用：生成Application实例中所有HttpServer的可用HttpServlet的API接口方法   <br>
- 继承 HttpBaseServlet 是为了获取 WebMapping 信息
+ * 继承 HttpBaseServlet 是为了获取 WebMapping 信息
  *
  * <p>
  * 详情见: https://redkale.org
@@ -205,7 +205,7 @@ public class ApiDocs extends HttpBaseServlet {
     }
 
     @Override
-    public boolean authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response) throws IOException {
-        return true;
+    public void authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response, HttpServlet next) throws IOException {
+        next.execute(request, response);
     }
 }
diff --git a/src/org/redkale/net/http/DefaultRestServlet.java b/src/org/redkale/net/http/DefaultRestServlet.java
index b9e1b61f9..3c579698b 100644
--- a/src/org/redkale/net/http/DefaultRestServlet.java
+++ b/src/org/redkale/net/http/DefaultRestServlet.java
@@ -22,8 +22,8 @@ public class DefaultRestServlet extends RestHttpServlet<Object> {
     }
 
     @Override
-    public boolean authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response) throws IOException {
-        return true;
+    public void authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response, HttpServlet next) throws IOException {
+        next.execute(request, response);
     }
 
 }
diff --git a/src/org/redkale/net/http/HttpBaseServlet.java b/src/org/redkale/net/http/HttpBaseServlet.java
index c5ccae5dc..908d5ddd9 100644
--- a/src/org/redkale/net/http/HttpBaseServlet.java
+++ b/src/org/redkale/net/http/HttpBaseServlet.java
@@ -224,23 +224,8 @@ public abstract class HttpBaseServlet extends HttpServlet {
         }
     };
 
-    /**
-     * 使用 public void preExecute(HttpRequest request, HttpResponse response, final HttpServlet next) throws IOException 方法代替
-     *
-     * @param request  HttpRequest
-     * @param response HttpResponse
-     *
-     * @return boolean
-     * @throws IOException IOException
-     * @deprecated
-     */
-    @Deprecated
-    public boolean preExecute(HttpRequest request, HttpResponse response) throws IOException {
-        return true;
-    }
-
     public void preExecute(HttpRequest request, HttpResponse response, final HttpServlet next) throws IOException {
-        if (preExecute(request, response)) next.execute(request, response);
+        next.execute(request, response);
     }
 
     @Override
@@ -282,9 +267,7 @@ public abstract class HttpBaseServlet extends HttpServlet {
         return true;
     }
 
-    public void authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response, final HttpServlet next) throws IOException {
-        if (authenticate(moduleid, actionid, request, response)) next.execute(request, response);
-    }
+    public abstract void authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response, final HttpServlet next) throws IOException;
 
     protected void setHeader(HttpRequest request, String name, Serializable value) {
         request.header.setValue(name, String.valueOf(value));