From d0cf3614e38dabc0938b6dac31694508a7cb2e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=93=81?= <shaojin.wensj@alibaba-inc.com>
Date: Sun, 28 Feb 2016 21:51:29 +0800
Subject: [PATCH 1/3] fixed bug for monitor web set contentType

---
 .../java/com/alibaba/druid/support/http/ResourceServlet.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java
index b8551dbfb2..cbe2cde756 100644
--- a/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java
+++ b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java
@@ -155,6 +155,10 @@ public abstract class ResourceServlet extends HttpServlet {
                                                                                                 IOException {
 
         String filePath = getFilePath(fileName);
+        
+        if (filePath.endsWith(".html")) {
+            response.setContentType("text/html; charset=utf-8");
+        }
         if (fileName.endsWith(".jpg")) {
             byte[] bytes = Utils.readByteArrayFromResource(filePath);
             if (bytes != null) {

From 1b024246f08ed9809509bf009e27fb1b28d36335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=93=81?= <shaojin.wensj@alibaba-inc.com>
Date: Sun, 28 Feb 2016 21:52:09 +0800
Subject: [PATCH 2/3] change version to 1.0.18

---
 src/main/java/com/alibaba/druid/VERSION.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java
index d6b9875a1c..1ef4e7d5d8 100644
--- a/src/main/java/com/alibaba/druid/VERSION.java
+++ b/src/main/java/com/alibaba/druid/VERSION.java
@@ -19,7 +19,7 @@ public final class VERSION {
 
     public final static int MajorVersion    = 1;
     public final static int MinorVersion    = 0;
-    public final static int RevisionVersion = 17;
+    public final static int RevisionVersion = 18;
 
     public static String getVersionNumber() {
         return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion;

From 33b48f7e4cdec34a35667959f0f7e2abe5492255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=93=81?= <shaojin.wensj@alibaba-inc.com>
Date: Sun, 28 Feb 2016 21:52:54 +0800
Subject: [PATCH 3/3] WallFilter support direct config tenantColumn

---
 .../java/com/alibaba/druid/wall/WallFilter.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java
index f34a39bcc8..e71dc6779e 100644
--- a/src/main/java/com/alibaba/druid/wall/WallFilter.java
+++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java
@@ -98,6 +98,12 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean {
                 this.throwException = value;
             }
         }
+        {
+            String tenantColumn = properties.getProperty("druid.wall.tenantColumn");
+            if (tenantColumn != null) {
+                this.config.setTenantColumn(tenantColumn);
+            }
+        }
     }
 
     @Override
@@ -210,6 +216,14 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean {
     public void setConfig(WallConfig config) {
         this.config = config;
     }
+    
+    public void setTenantColumn(String tenantColumn) {
+        this.config.setTenantColumn(tenantColumn);
+    }
+    
+    public String getTenantColumn() {
+        return this.config.getTenantColumn();
+    }
 
     public boolean isInited() {
         return inited;