From 4c071b0a1da229fe172b1b71e9243ec88c4ece5b Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Thu, 11 May 2017 13:49:52 +0800 Subject: [PATCH] --- .../boot/{ApiDocs.java => ApiDocsService.java} | 11 ++++------- src/org/redkale/boot/Application.java | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) rename src/org/redkale/boot/{ApiDocs.java => ApiDocsService.java} (95%) diff --git a/src/org/redkale/boot/ApiDocs.java b/src/org/redkale/boot/ApiDocsService.java similarity index 95% rename from src/org/redkale/boot/ApiDocs.java rename to src/org/redkale/boot/ApiDocsService.java index ea799ff97..6bd4b247f 100644 --- a/src/org/redkale/boot/ApiDocs.java +++ b/src/org/redkale/boot/ApiDocsService.java @@ -11,6 +11,7 @@ import java.util.*; import javax.persistence.*; import org.redkale.convert.json.JsonConvert; import org.redkale.net.http.*; +import org.redkale.service.Service; import org.redkale.source.*; import org.redkale.util.*; @@ -23,11 +24,11 @@ import org.redkale.util.*; * * @author zhangjx */ -public class ApiDocs extends HttpBaseServlet { +public class ApiDocsService extends DefaultRestServlet implements Service { private final Application app; //Application全局对象 - public ApiDocs(Application app) { + public ApiDocsService(Application app) { this.app = app; } @@ -196,7 +197,7 @@ public class ApiDocs extends HttpBaseServlet { if (doctemplate.isFile() && doctemplate.canRead()) { in = new FileInputStream(doctemplate); } - if (in == null) in = ApiDocs.class.getResourceAsStream("apidoc-template.html"); + if (in == null) in = ApiDocsService.class.getResourceAsStream("apidoc-template.html"); String content = Utility.read(in).replace("'${content}'", json); in.close(); FileOutputStream outhtml = new FileOutputStream(new File(app.getHome(), "apidoc.html")); @@ -204,8 +205,4 @@ public class ApiDocs extends HttpBaseServlet { outhtml.close(); } - @Override - 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/boot/Application.java b/src/org/redkale/boot/Application.java index 2d77b37d5..4208c381c 100644 --- a/src/org/redkale/boot/Application.java +++ b/src/org/redkale/boot/Application.java @@ -431,7 +431,7 @@ public final class Application { } } else if ("APIDOC".equalsIgnoreCase(new String(bytes))) { try { - new ApiDocs(application).run(); + new ApiDocsService(application).run(); buffer.clear(); buffer.put("APIDOC OK".getBytes()); buffer.flip(); @@ -476,7 +476,7 @@ public final class Application { final Application application = Application.create(true); application.init(); application.start(); - new ApiDocs(application).run(); + new ApiDocsService(application).run(); logger.info("APIDOC OK"); return; }