From 00b69109863330ffcce89c600e8d47b30d79d735 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Tue, 12 Jul 2016 14:08:14 +0800
Subject: [PATCH]

---
 src/META-INF/application-template.xml             |  3 ++-
 src/org/redkale/net/http/HttpResourceServlet.java | 13 ++++++++++---
 src/org/redkale/net/http/HttpServer.java          |  1 -
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index d3fa7c0db..714315e48 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -156,8 +156,9 @@
             <!-- 
                当Server为HTTP协议时，ResourceServlet才有效. 默认存在一个有默认属性的resource-servlet节点
                webroot: web资源的根目录, 默认取server节点中的root值
+               index : 启始页，默认值：index.html
             -->
-            <resource-servlet webroot="root">
+            <resource-servlet webroot="root" index="index.html">
                 <!--
                     资源缓存的配置, 默认存在一个含默认属性的caches节点
                     limit:  资源缓存最大容量， 默认: 0, 为0表示不缓存， 单位可以是B、K、M、G，不区分大小写
diff --git a/src/org/redkale/net/http/HttpResourceServlet.java b/src/org/redkale/net/http/HttpResourceServlet.java
index 2539e890c..38c0c4584 100644
--- a/src/org/redkale/net/http/HttpResourceServlet.java
+++ b/src/org/redkale/net/http/HttpResourceServlet.java
@@ -90,6 +90,8 @@ public final class HttpResourceServlet extends HttpServlet {
 
     protected File root = new File("./root/");
 
+    protected String indexHtml = "index.html";
+
     protected final ConcurrentHashMap<String, FileEntry> files = new ConcurrentHashMap<>();
 
     protected final ConcurrentHashMap<WatchKey, Path> keymaps = new ConcurrentHashMap<>();
@@ -104,6 +106,7 @@ public final class HttpResourceServlet extends HttpServlet {
     public void init(HttpContext context, AnyValue config) {
         if (config != null) {
             String rootstr = config.getValue("webroot", "root");
+            this.indexHtml = config.getValue("index", "index.html");
             if (rootstr.indexOf(':') < 0 && rootstr.indexOf('/') != 0 && System.getProperty("APP_HOME") != null) {
                 rootstr = new File(System.getProperty("APP_HOME"), rootstr).getPath();
             }
@@ -178,7 +181,9 @@ public final class HttpResourceServlet extends HttpServlet {
                 }
             }
         }
-        if (uri.length() == 0 || uri.equals("/")) uri = "/index.html";
+        if (uri.length() == 0 || uri.equals("/")) {
+            uri = this.indexHtml.indexOf('/') == 0 ? this.indexHtml : ("/" + this.indexHtml);
+        }
         //System.out.println(request);
         FileEntry entry;
         if (watchThread == null) {
@@ -195,8 +200,10 @@ public final class HttpResourceServlet extends HttpServlet {
     }
 
     private FileEntry createFileEntry(String uri) {
-        File file = new File(root, uri);
-        if (file.isDirectory()) file = new File(file, "index.html");
+        File rfile = new File(root, uri);
+        File file = rfile;
+        if (file.isDirectory()) file = new File(rfile, this.indexHtml);
+        if (file.isDirectory()) file = new File(rfile, "index.html");
         if (!file.isFile() || !file.canRead()) return null;
         FileEntry en = new FileEntry(this, file);
         if (watchThread == null) return en;
diff --git a/src/org/redkale/net/http/HttpServer.java b/src/org/redkale/net/http/HttpServer.java
index 0adb8b61f..18f83b257 100644
--- a/src/org/redkale/net/http/HttpServer.java
+++ b/src/org/redkale/net/http/HttpServer.java
@@ -33,7 +33,6 @@ public final class HttpServer extends Server<String, HttpContext, HttpRequest, H
     @Override
     public void init(AnyValue config) throws Exception {
         super.init(config);
-        AnyValue conf = config == null ? null : config.getAnyValue("servlets");
     }
 
     public void addHttpServlet(HttpServlet servlet, final String prefix, AnyValue conf, String... mappings) {