This commit is contained in:
Redkale
2017-03-17 20:18:18 +08:00
parent 62f9882314
commit 13f2fbf7d6
3 changed files with 7 additions and 24 deletions

View File

@@ -16,7 +16,7 @@ import org.redkale.util.*;
/** /**
* API接口文档生成类作用生成Application实例中所有HttpServer的可用HttpServlet的API接口方法 <br> * API接口文档生成类作用生成Application实例中所有HttpServer的可用HttpServlet的API接口方法 <br>
继承 HttpBaseServlet 是为了获取 WebMapping 信息 * 继承 HttpBaseServlet 是为了获取 WebMapping 信息
* *
* <p> * <p>
* 详情见: https://redkale.org * 详情见: https://redkale.org
@@ -205,7 +205,7 @@ public class ApiDocs extends HttpBaseServlet {
} }
@Override @Override
public boolean authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response) throws IOException { public void authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response, HttpServlet next) throws IOException {
return true; next.execute(request, response);
} }
} }

View File

@@ -22,8 +22,8 @@ public class DefaultRestServlet extends RestHttpServlet<Object> {
} }
@Override @Override
public boolean authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response) throws IOException { public void authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response, HttpServlet next) throws IOException {
return true; next.execute(request, response);
} }
} }

View File

@@ -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 { 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 @Override
@@ -282,9 +267,7 @@ public abstract class HttpBaseServlet extends HttpServlet {
return true; return true;
} }
public void authenticate(int moduleid, int actionid, HttpRequest request, HttpResponse response, final HttpServlet next) throws IOException { public abstract 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);
}
protected void setHeader(HttpRequest request, String name, Serializable value) { protected void setHeader(HttpRequest request, String name, Serializable value) {
request.header.setValue(name, String.valueOf(value)); request.header.setValue(name, String.valueOf(value));